Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
33373d939a
Merge: staging with systemd
2015-10-02 10:24:41 +02:00
William A. Kennington III
98172435f7
Merge branch 'master.upstream' into staging.upstream
2015-10-01 10:43:44 -07:00
Thomas Strobel
c720f06f7c
linux kernel common config: re-enable NFC support
...
As test, Linux kernels were build successfully with NFC support for 3.18.x and
for 4.1.x.
2015-10-01 17:53:51 +02:00
Eelco Dolstra
b23038dd80
Merge remote-tracking branch 'origin/master' into systemd-219
2015-10-01 14:17:46 +02:00
William A. Kennington III
e7bb9e1023
Merge branch 'master.upstream' into staging.upstream
2015-09-30 13:26:04 -07:00
William A. Kennington III
647671bc53
bluez5: 5.33 -> 5.35
2015-09-30 13:23:18 -07:00
William A. Kennington III
e45e777c37
kernel: Remove uneeded patch for 4.2
2015-09-29 17:47:18 -07:00
Tobias Geerinckx-Rice
7e3bd2e86d
mcelog: build in parallel
2015-09-30 02:29:51 +02:00
Tobias Geerinckx-Rice
fc381c5e0c
mcelog: 127 -> 128
...
Fix spurious assertion when parsing sysfs.
2015-09-30 02:29:51 +02:00
William A. Kennington III
05fd70b4be
kernel: 4.2.1 -> 4.2.2
2015-09-29 15:57:30 -07:00
William A. Kennington III
40773c7605
kernel: 4.1.8 -> 4.1.9
2015-09-29 15:57:29 -07:00
William A. Kennington III
271972de0a
Merge branch 'master.upstream' into staging.upstream
2015-09-29 15:54:33 -07:00
Charles Strahan
597d191844
eventstat: init at 0.02.02
2015-09-29 15:45:09 -04:00
Eelco Dolstra
0e3c1e31b1
Remove zfs-git and spl-git
...
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343 .
2015-09-29 14:54:12 +02:00
Tobias Geerinckx-Rice
87989f0e2f
mcelog: fix --version
output ("unknown" -> "127")
2015-09-29 03:35:55 +02:00
Tobias Geerinckx-Rice
d53cb31426
mcelog: 126 -> 127
2015-09-29 03:28:54 +02:00
Eelco Dolstra
506463e06c
sysstat: Update to 11.0.7
2015-09-28 15:46:24 +02:00
Lengyel Balázs
c67efeb616
wpa_supplicant: 2.4 -> 2.5
2015-09-28 13:29:01 +02:00
Paul Colomiets
84c0098117
Unprivileged overlayfs mounts kernel patch from ubuntu
...
This allows to create overlayfs mounts by unprivileged containers (i.e.
in user and mount namespace). It's super-useful for containers.
The patch is trivial as I understand from the patch description it's
does not have security implications (on top of what user namespaces
already have). And it's enabled in ubuntu long time ago. Here is a proof:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1357025
2015-09-26 00:42:16 +03:00
William A. Kennington III
de514ea334
llvm2: 2.02.128 -> 2.02.132
2015-09-24 16:15:31 -07:00
William A. Kennington III
2dc9cb1120
libcap-ng: 0.7.3 -> 0.7.7
...
Also support swig + python bindings
2015-09-23 20:49:19 -07:00
William A. Kennington III
40396584eb
kernel: 4.2 -> 4.2.1
2015-09-23 12:29:59 -07:00
William A. Kennington III
d5c7b265f7
kernel: 4.1.7 -> 4.1.8
2015-09-23 12:29:59 -07:00
William A. Kennington III
97200b7808
kernel: 3.14.52 -> 3.14.53
2015-09-23 12:29:59 -07:00
William A. Kennington III
397f806453
kernel: 3.12.47 -> 3.12.48
2015-09-23 12:29:59 -07:00
William A. Kennington III
284ea9295e
kernel: 3.10.88 -> 3.10.89
2015-09-23 12:29:59 -07:00
Arseniy Seroka
c405f22266
Merge pull request #10016 from cleverca22/master
...
open-iscsi: 2.0-871 -> 2.0-873
2015-09-23 19:56:31 +03:00
michael bishop
efa5b92bfc
open-iscsi: 2.0-871 -> 2.0-873
...
remove the kernel patch, since the package no longer builds the module, its already in the kernel
move it from the kernel function to the main all-packages list
2015-09-23 12:31:41 -03:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
William A. Kennington III
b3075b3087
pam_u2f: 0.0.1 -> 1.0.1
2015-09-22 23:25:55 -07:00
William A. Kennington III
9fbbbd5b68
linux-testing: Update to 4.3.0-rc2
2015-09-21 14:38:49 -07:00
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
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a
x11: replace its usage by xlibsWrapper directly
...
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Tobias Geerinckx-Rice
193319ce03
"Parallel Tools" -> Parallels Tools
2015-09-15 08:51:02 +02:00