Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Joachim Fasting
192a1ada24
apparmor: cleanups
...
- Move build tools to nativeBuildInputs
- capability.h should come from linuxHeaders not glibc
- Delete v2.9
2016-04-18 02:21:12 +02:00
Tobias Geerinckx-Rice
d99df88efe
mcelog: 135 -> 136
...
Adds support to decode MSCOD values for Skylake server.
2016-04-17 01:14:57 +02:00
Tim Steinbach
ccc3080857
kernel: 4.4.6 -> 4.4.7 ( #14690 )
2016-04-14 16:30:20 +02:00
Tim Steinbach
af4d84544f
kernel: 4.5 -> 4.5.1 ( #14691 )
2016-04-14 15:57:18 +02:00
Vladimír Čunát
ddb4051bf7
xorg-sys-opengl: fix with multiple outputs
...
Fixes #14669 .
2016-04-14 13:43:08 +02:00
Tuomas Tynkkynen
794f07d4e4
treewide: Mass replace 'binutils}/bin' to refer to the correct outputs
2016-04-14 08:32:20 +03:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Octavian Cerna
1e37217b80
raspberrypi-firmware: 20150506 -> 1.20160315 ( #14300 )
...
Cleanup the meta section, add viric and myself as maintainers.
2016-04-13 20:02:57 +01:00
Herwig Hochleitner
e3d0fe898b
criu: 1.3-rc2 -> 2.0 ( #14666 )
2016-04-13 19:56:52 +01:00
Michael Raskin
74f7916a9a
iptables: add 1.6 branch (init 1.6.0). Not making it the default this time.
2016-04-13 14:47:04 +02:00
Michael Raskin
80db55610c
firejail: 0.9.38 -> 0.9.40
2016-04-13 14:47:04 +02:00
Michael Raskin
cb3368fcbe
conspy: 1.13 -> 1.14
2016-04-13 14:47:04 +02:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
obadz
4788ec1372
linux kernel 4.4: fix race during build
...
Patch drivers/crypto/qat/qat_common/Makefile so that qat_asym_algs.o
explicitly depends on headers qat_rsaprivkey-asn1.h and qat_rsapubkey-asn1.h
Hopefully fixes #14595
2016-04-12 22:45:57 +01:00
Franz Pletz
7d9d876140
lxc: 1.1.5 -> 2.0.0
2016-04-12 15:49:54 +02:00
Franz Pletz
42e5be8f55
cgmanager: 0.39 -> 0.41
2016-04-12 15:49:54 +02:00
Eelco Dolstra
dddb62d3e3
Merge pull request #14178 from the-kenny/systemd-cryptsetup-external-generator
...
Systemd: Allow specifying external generators
2016-04-12 11:26:22 +02:00
Markus Hauck
f51f993be2
sysdig: 0.8.0 -> 0.9.0
2016-04-11 21:51:09 +02:00
Tim Steinbach
5e5ef22d73
linux_testing: 4.6-rc2 -> 4.6-rc3 ( #14592 )
2016-04-11 13:44:34 +01:00
Charles Strahan
ad7b1e24c2
fan-networking: updated patches from Ubuntu
...
This pulls in updated Fan Networking patches from Ubuntu.
(https://wiki.ubuntu.com/FanNetworking )
closes #14328
2016-04-10 16:07:03 -04:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Moritz Ulrich
5c770c4c0b
systemd-cryptsetup-generator: Cleaner install phase.
2016-04-08 14:50:20 +02:00
Moritz Ulrich
7503ee71fc
Revert "systemd: Try adding cryptsetup to buildInputs."
...
This reverts commit eda8d21d8b0a69e4b7a3bc215e2215ffc6526495.
2016-04-08 14:50:20 +02:00
Moritz Ulrich
faa79e60cc
systemd-cryptsetup-generator: Also build systemd-cryptsetup
2016-04-08 14:50:20 +02:00
Moritz Ulrich
47e5fd9f57
systemd-cryptsetup-generator: Init
2016-04-08 14:50:20 +02:00
Moritz Ulrich
215b5f6282
systemd: Try adding cryptsetup to buildInputs.
2016-04-08 14:50:20 +02:00
Robin Gloster
3e68106afd
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-07 21:52:26 +00:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Domen Kožar
5f028082cc
Revert "kernelHeaders: fix build with libmpc"
...
This reverts commit b0adde8f8a5f22cf45f32df64bba149f326dec85.
Doesn't fix the issue for grsec kernels.
(cherry picked from commit 22bd9c12fec43bf914cdbec4c3a11cd0d964912a)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-04-07 11:35:22 +01:00
Eelco Dolstra
4907fc9e8d
Merge pull request #14509 from ragnard/bpf-tracing-kernel-config
...
linux: kernel config for extended BPF support
2016-04-07 11:01:34 +02:00
Ragnar Dahlén
961d1e847c
linux: kernel config for extended BPF support
...
- Enable BPF_SYSCALL and BPF_EVENTS
- Build modules for NET_CLS_BPF and NET_ACT_BPF
With these config options we can leverage the full potential of BPF for
tracing and instrumenting Linux systems, for example using
libraries/tools like those provided by the bcc project.
2016-04-07 08:14:41 +01:00
Tuomas Tynkkynen
b95274cc90
kernel: Don't patchELF manually
...
AFAICT this is done by stdenv nowadays:
bde82098b8/pkgs/development/tools/misc/patchelf/setup-hook.sh (L5)
bde82098b8/pkgs/stdenv/generic/setup.sh (L737)
Might help /be somehow related to these mysterious errors that seem to
occur sometimes (?):
http://hydra.nixos.org/build/34131589/nixlog/1/raw
2016-04-06 17:19:43 +03:00
Robin Gloster
5ca99ae7a7
kernel.i686-linux: disable bindnow hardening
2016-04-06 14:16:42 +00:00
Eelco Dolstra
59ef7d25c3
nvidia-x11: 358.16 -> 361.42
...
This fixes the segfault reported in #13942 caused by missing
libEGL.so.0 and libEGL_nvidia.so.0 symlinks.
2016-04-06 15:53:14 +02:00
Domen Kožar
c850203487
linuxHeaders: add platforms
2016-04-06 12:42:45 +01:00
Domen Kožar
e9842ea8d7
kernelHeaders: fix build with libmpc
2016-04-06 12:42:35 +01:00
Domen Kožar
b95a1c4f77
kernel: fix build of 3.10 and 3.12 on i686
...
(cherry picked from commit 23730413fef4be7fe365f452fcaef16c5f4e4b1b)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-04-06 10:36:04 +01:00
Robin Gloster
bbbaccfa68
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-04 15:24:52 +00:00
Tim Steinbach
5ef5e59c56
linux_testing: 4.6-rc1 -> 4.6-rc2
2016-04-03 19:14:31 +00:00
Robin Gloster
5978109194
syslinux: disable fortify hardening
2016-04-03 12:51:54 +00:00
Robin Gloster
fbb8067aa1
dietlibc.i686-linux: disable pic
2016-04-03 12:49:18 +00:00
Robin Gloster
696d85a62d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-03 11:01:57 +00:00
Patrick Mahoney
e0c225857f
update skarnet.org packages
...
skalibs: 2.4.7.0 -> 2.3.9.0
execline: 2.1.4.0 -> 2.1.4.5
s6: 2.2.1.0 -> 2.2.4.3
s6-rc: 0.0.1.0 -> 0.0.2.1
s6-portable-utils: 2.0.5.2 -> 2.0.5.3
s6-linux-utils: 2.0.2.0 -> 2.0.2.3
s6-dns: 2.0.0.4 -> 2.0.0.7
s6-networking: 2.1.0.1 -> 2.1.0.4
2016-04-01 10:38:58 -05:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Franz Pletz
2e08d8234e
Merge remote-tracking branch 'origin/master'
2016-03-31 10:06:30 +02:00
Ricardo M. Correia
b4fd221f74
Merge pull request #14296 from kragniz/zfs-0.6.5.6
...
zfs 0.6.5.6
2016-03-30 12:17:38 +02:00
Julien Dehos
70af93f0ca
fswebcam: init 20140113
2016-03-30 09:48:11 +02:00
Louis Taylor
259eb36205
zfs: 0.6.5.5 -> 0.6.5.6
2016-03-29 13:28:35 +01:00
Louis Taylor
307c073fa3
spl: 0.6.5.5 -> 0.6.5.6
2016-03-29 13:28:20 +01:00