Eelco Dolstra
01f19f54e0
Merge remote-tracking branch 'origin/master' into systemd-219
...
Conflicts:
pkgs/os-specific/linux/systemd/fixes.patch
pkgs/os-specific/linux/upower/0.99.nix
pkgs/top-level/all-packages.nix
2015-09-21 12:57:30 +02:00
Charles Strahan
f08fb6e6c7
broadcom-sta: fix build on kernel >= 4.2 ( close #9953 )
...
Also cherry-pick a licensing fix from torvalds/linux@7d3e2eb178
necessary for building broadcom-sta on kernel 4.2.
For more details, see:
https://github.com/longsleep/bcmwl-ubuntu/issues/6
Fixes #9948 .
2015-09-20 08:01:37 +02:00
William A. Kennington III
d9fd037e88
zfs + zfs_git: 0.6.5 -> 0.6.5.1
2015-09-19 15:02:59 -07:00
William A. Kennington III
4a672c87cd
zfs: Add a patch to fix discard data corruption
2015-09-18 14:55:36 -07:00
William A. Kennington III
ee867799b0
cgmanager: 0.37 -> 0.39
2015-09-18 14:52:51 -07:00
William A. Kennington III
24dabdfb98
iproute: 4.1.1 -> 4.2.0
2015-09-18 14:52:50 -07:00
Tobias Geerinckx-Rice
1e593edbf1
autofs: 5.0.8 -> 5.1.1
2015-09-18 05:02:02 +02:00
William A. Kennington III
2d5dd06fbb
audit: 2.4.2 -> 2.4.4
2015-09-17 14:12:38 -07:00
William A. Kennington III
dec8e299f5
nftables: 0.4 -> 0.5
2015-09-17 14:12:38 -07:00
Vladimír Čunát
f2d03ee0d0
Merge #8897 : AppArmor updates
2015-09-17 21:21:44 +02:00
aszlig
389e654e03
systemd: Backport fix for detecting VirtualBox.
...
This is a backport of systemd/systemd@e32886e .
As noted by @ts468 in #9876 , systemd-detect-virt will report KVM if
we're running inside VirtualBox 5.x. Instead of just disabling the
check, this essentially fixes systemd to be able to detect VirtualBox
again.
Tested this against nixos/tests/simple.nix (just to make sure systemd is
still working) and nixos/tests/virtualbox.nix (all tests succeed).
Thanks a lot to @ts468 for catching this and also to @domenkozar for
testing various things concerning that bug.
Fixes #9876 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
William A. Kennington III
84505bd36a
grsecurity: Update patches
2015-09-16 13:35:41 -07:00
William A. Kennington III
871baf2278
kernel: 4.1.6 -> 4.1.7
2015-09-16 12:55:36 -07:00
William A. Kennington III
5975687f98
kernel: 3.14.51 -> 3.14.52
2015-09-16 12:55:36 -07:00
William A. Kennington III
72d22e3f4d
kernel: 3.10.87 -> 3.10.88
2015-09-16 12:55:36 -07:00
William A. Kennington III
773b4deb7c
Merge commit 'a6f6c0e' into master.upstream
...
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Tobias Geerinckx-Rice
193319ce03
"Parallel Tools" -> Parallels Tools
2015-09-15 08:51:02 +02:00
Mathnerd314
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
Tobias Geerinckx-Rice
133a31f71f
mcelog: 125 -> 126
...
Adds --is-cpu-supported command line option.
2015-09-15 00:17:18 +02:00
Tobias Geerinckx-Rice
cb363c1033
dstat: add python-wifi dependency for --wifi
...
This is limited to kernels with the (legacy) Wireless Extensions,
and supported wireless cards. Also add myself as a maintainer.
CC maintainer @jgeerds
2015-09-14 23:53:21 +02:00
Tomasz Kontusz
135fc6a769
lttng-modules: 2.6.2-1-g7a88f8b -> 2.6.3
...
This also drops the assertion about kernel.version - we don't have
anything older than 3.4 in nixpkgs anyway.
2015-09-14 21:45:37 +02:00
William A. Kennington III
70b6b6a735
dmidecode: 2.12 -> 3.0
2015-09-13 15:55:49 -07:00
Mathnerd314
87012187b2
kmod-debian-aliases: init at 21-1
2015-09-13 10:55:44 +02:00
Jude Taylor
b3b2928ca6
Revert "libsecurity_generic: add El Capitan impure-deps"
...
This reverts commit 557fa59042
.
2015-09-12 11:59:08 -07:00
Jude Taylor
f7cb16ff9b
Revert "apple-sdk: add El Capitan impure-deps"
...
This reverts commit 3bf5d87f9e
.
2015-09-12 11:58:59 -07:00
Domen Kožar
54e430a689
blcr: drop support for kernel 3.12
2015-09-12 13:17:01 +02:00
William A. Kennington III
6727f76739
zfs: Update to 0.6.5
2015-09-11 17:45:38 -07:00
William A. Kennington III
9cb93e7966
spl: Update to 0.6.5
2015-09-11 17:45:38 -07:00
Tobias Geerinckx-Rice
5d50acceeb
htop: also touch headers in subdirectories
2015-09-11 05:12:06 +02:00
Tobias Geerinckx-Rice
eb6b290ab3
conntrack_tools: 1.4.2 -> 1.4.3; maintain
2015-09-10 23:01:30 +02:00
Tobias Geerinckx-Rice
c5bd6fff36
mcelog: 124 -> 125
2015-09-10 00:59:07 +02:00
Tobias Geerinckx-Rice
9eca1376b8
htop: fix version suffix
...
It may be an improvement, but it's still a downgrade.
2015-09-09 18:46:41 +02:00
Eelco Dolstra
af82c983fc
upower: Update to 0.99.3
2015-09-09 11:44:14 +02:00
Eelco Dolstra
a6a73a1429
upower: Remove unused dependencies
2015-09-09 11:44:14 +02:00
Eelco Dolstra
2a2cb8354e
Remove upower-old
2015-09-09 11:44:14 +02:00
William A. Kennington III
4f00183685
htop: 8f07868f -> 229d0058
...
This fixes sopme of the strange rendering issues as well as some
intermittent crashes.
2015-09-08 22:33:20 -07:00
Eelco Dolstra
2a8e86bb05
upower: Use libgudev
2015-09-08 20:19:37 +02:00
Eelco Dolstra
a6de3feb97
systemd: Update to 226
2015-09-08 18:18:52 +02:00
Eelco Dolstra
023c12bc9a
udisks2: Propagated inputs considered harmful
2015-09-08 14:53:14 +02:00
Eelco Dolstra
5dde1a9752
udisks2: Add libgudev dependency
...
http://hydra.nixos.org/build/25640910
2015-09-08 14:51:14 +02:00
Eelco Dolstra
c34953ed24
systemd: Backport some journalctl performance improvements
...
Before:
$ time journalctl > /dev/null
real 6m12.470s
user 5m51.439s
sys 0m19.265s
After:
real 0m40.067s
user 0m37.717s
sys 0m2.383s
Before:
$ time journalctl --since '2015-08-01' _TRANSPORT=kernel
real 1m9.817s
user 0m13.318s
sys 0m56.626s
After:
real 0m0.689s
user 0m0.521s
sys 0m0.221s
2015-09-08 14:25:55 +02:00
Eelco Dolstra
d242e59fc4
systemd: Apply sbin patch
2015-09-08 14:07:05 +02:00
Eelco Dolstra
3609007b7c
systemd: Use our systemd repo directly
...
Since upstream no longer provides an autoconfed tarball, we may as
well use our own repo and drop the patch.
2015-09-08 13:08:41 +02:00
William A. Kennington III
d51d63fcf1
linux-firmware: 2015-07-23 -> 2015-09-07
2015-09-07 23:10:53 -07:00
Eelco Dolstra
ecbe04b4c6
systemd: Update to 225
2015-09-08 00:02:26 +02:00
Eelco Dolstra
3ebe5f802b
Remove references to /root/test-firmware
...
This is no longer supported by systemd.
2015-09-07 22:55:16 +02:00
Eelco Dolstra
916793cf13
Merge branch 'master' into systemd-219
...
Conflicts:
nixos/modules/system/boot/systemd.nix
pkgs/applications/networking/p2p/transmission/default.nix
pkgs/development/libraries/libseccomp/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/top-level/all-packages.nix
2015-09-07 21:28:33 +02:00
Tobias Geerinckx-Rice
1102018a00
htop: touch all headers
...
Fix the following build failure:
```
config.status: executing libtool commands
building
make flags: SHELL=/nix/store/548wfw1i43glkx8lkyjmbg59h6127qky-bash-4.3-p39/bin/bash
./scripts/MakeHeader.py ColumnsPanel.c
/usr/bin/env: python: No such file or directory
Makefile:2164: recipe for target 'ColumnsPanel.h' failed
make: *** [ColumnsPanel.h] Error 127
builder for ‘/nix/store/6rai1vs6jsw8y5z5jff98f0f8jzfa12n-htop-1.0.3-584-8f07868f.drv’ failed with exit code 2
```
2015-09-07 02:09:48 +02:00
William A. Kennington III
c6f689f951
Merge branch 'master.upstream' into staging.upstream
2015-09-04 12:05:11 -07:00
William A. Kennington III
0754a213c1
Merge pull request #9643 from dezgeg/pr-perf
...
linuxPackages_*.perf: Fix build after kernel 4.1
2015-09-03 20:24:11 -07:00