Daiderd Jordan
ff1253200b
darwin-ICU: init at 531.48
2017-05-27 23:19:42 +02:00
Armijn Hemel
0786bb00d2
cifs-utils: 6.5 -> 6.6
2017-05-26 20:56:48 +02:00
Vladimír Čunát
00672dec8a
Merge older staging
...
This still causes some uncached rebuilds, but master(!) and staging
move too fast forward rebuild-wise, so Hydra might never catch up.
(There are also other occasional problems.)
Therefore I merge at this point where the rebuild isn't that bad.
2017-05-26 15:45:43 +02:00
Tim Steinbach
690a83091b
linux: FS_ENCRYPTION only for >= 4.9 kernels
2017-05-25 18:25:08 -04:00
Tim Steinbach
8f0ca4f44a
linux: 4.4.69 -> 4.4.70
2017-05-25 18:21:54 -04:00
Tim Steinbach
446c57fdb2
linux: 4.9.29 -> 4.9.30
2017-05-25 18:19:16 -04:00
Tim Steinbach
f618a6caa1
linux: 4.11.2 -> 4.11.3
2017-05-25 18:16:57 -04:00
Joachim Fasting
f0c08e3cd4
autofs5: 5.1.2 -> 5.1.3
2017-05-25 23:53:34 +02:00
Eelco Dolstra
8a07319e7f
ixgbevf: 4.0.3 -> 4.1.2
...
This fixes
error: assertion failed at /home/eelco/Dev/nixpkgs-stable/pkgs/os-specific/linux/ixgbevf/default.nix:3:1
(use ‘--show-trace’ to show detailed location information)
deploying a >=4.10 kernel to EC2. (We could probably also drop the
ixgbevf package with recent kernels, since the ixgbevf module included
in the kernel source tree is recent enough according to Amazon's
recommendation.)
2017-05-24 14:51:39 +02:00
Vladimír Čunát
8004e79415
Merge branch 'master' into staging
2017-05-24 03:24:06 +02:00
Robin Gloster
f8b0a25983
acpid: 2.0.27 -> 2.0.28
2017-05-23 02:32:39 +02:00
John Ericson
0d88299019
Merge pull request #25976 from obsidiansystems/no-stdenv-is
...
Add `*Platform.is*` predicates and alias `stdenv.is*` to `hostPlatform`'s
2017-05-22 13:30:20 -04:00
Arseniy Seroka
c734781158
Merge pull request #25958 from Mic92/iwd
...
iwd: init at unstable-2017-04-21
2017-05-22 20:04:04 +03:00
Tim Steinbach
aa73b7df30
linux: 4.12-rc1 -> 4.12-rc2
2017-05-22 11:40:04 -04:00
Frederik Rietdijk
99cfab07b9
Merge remote-tracking branch 'upstream/master' into HEAD
2017-05-22 09:21:40 +02:00
John Ericson
2e7ec6fb70
lib: Make platform predicates more ergonomic to use
...
`hostPlatform.isDarwin` instead of `lib.system.parse.isDarwin
hostPlatform.parsed`
2017-05-22 00:25:02 -04:00
Joachim Fasting
881385dbcb
linuxPackages.phc-intel: remove use of features.grsecurity
...
I believe this is the final reference to features.grsecurity.
See also e6c65ecb12
2017-05-21 18:08:07 +02:00
Jörg Thalheim
a527a47cd3
iwd: init at unstable-2017-04-21
2017-05-21 11:05:35 +01:00
Tim Steinbach
a42c54057f
linux: 4.11.1 -> 4.11.2
2017-05-20 17:17:35 -04:00
Tim Steinbach
a551ca61b7
linux: 4.9.28 -> 4.9.29
2017-05-20 17:17:34 -04:00
Tim Steinbach
82852ac60e
linux: 4.4.68 -> 4.4.69
2017-05-20 17:17:33 -04:00
Tuomas Tynkkynen
de263072b5
kernel: 4.10 is end-of-life
...
https://lkml.org/lkml/2017/5/20/75
2017-05-20 19:54:18 +03:00
Jörg Thalheim
0b21bd9dbd
Merge pull request #25748 from armijnhemel/hwdata
...
hwdata: 0.291 -> 0.300
2017-05-20 17:40:31 +01:00
Vladimír Čunát
5aa530f2a8
Merge branch 'master' into staging
...
A few thousand rebuilds from master.
2017-05-19 08:57:59 +02:00
Nikolay Amiantov
030862f63c
linuxPackages.evdi: init at 1.4.1
2017-05-19 02:53:09 +03:00
Nikolay Amiantov
e17744067a
displaylink: 1.1.62 -> 1.3.52
2017-05-19 02:51:45 +03:00
Joachim Fasting
77ed860114
linux_hardened: enable checks on scatter-gather tables
...
Recommended by kspp
2017-05-18 12:33:42 +02:00
Vladimír Čunát
e9aeb55f3b
Merge branch 'master' into staging
2017-05-18 11:24:18 +02:00
Jörg Thalheim
64acaa1e2d
Merge pull request #25646 from zx2c4/wg-psk-change
...
wireguard: 0.0.20170421 -> 0.0.20170517
2017-05-17 23:58:51 +01:00
John Ericson
bec5ffee15
Merge pull request #25232 from obsidiansystems/cross-binutils
...
Cross binutils
2017-05-17 16:34:56 -04:00
John Ericson
7018dfb9f4
binutils and cctools: Prefix derivation names with target for cross
...
We want platform triple prefixes and suffixes on derivation names to
be used consistently. The ideom this commit strives for is
- suffix means build != host, i.e. cross *built* packages. This is
already done.
- prefix means build != target, i.e. cross tools. This matches the
tradition of such binaries themselves being prefixed to disambiguate.]
Binutils and cctools, as build tools, now use the latter
2017-05-17 15:33:05 -04:00
John Ericson
88ea6463a3
binutils on darwin: Clean up the rats nest
...
- No more *Cross duplication for binutils on darwin either.
`cctools_cross` is merged into plain `cctools`, so `buildPackages`
chains alone are used to disambiguate.
- Always use a mashup of cctools and actual GNU Binutils as `binutils`.
Previously, this was only done in the native case as nobody had
bothered to implement the masher in the cross case. Implemented it
basically consisted of extending the wrapper to deal with prefixed
binaries.
2017-05-17 15:33:05 -04:00
Jason A. Donenfeld
ef018d8955
wireguard: 0.0.20170421 - 0.0.20170517
...
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-05-17 20:25:06 +02:00
Tim Steinbach
8eb302d6d7
Merge pull request #25792 from NeQuissimus/linux_4_12_rc1
...
linux-testing: 4.11-rc7 -> 4.12-rc1
2017-05-17 08:30:10 -04:00
Vladimír Čunát
515414ed32
Merge branch 'master' into staging
2017-05-16 18:32:43 +02:00
Vladimír Čunát
65ede052fa
treewide: fixup packages with RPATH problems
2017-05-16 18:30:58 +02:00
Tuomas Tynkkynen
a35ec5dda6
linux_rpi: 1.20170303 -> 1.20170427
2017-05-15 11:14:59 +03:00
Tuomas Tynkkynen
f2e2dde681
raspberrypifw: 1.20170303 -> 1.20170427
2017-05-15 11:14:59 +03:00
Tim Steinbach
336b044dcb
linux-testing: 4.11-rc7 -> 4.12-rc1
2017-05-14 22:03:14 -04:00
Tuomas Tynkkynen
ba585648e7
kernel: 4.9.27 -> 4.9.28
2017-05-15 01:28:01 +03:00
Tuomas Tynkkynen
8de08ff145
kernel: 4.4.67 -> 4.4.68
2017-05-15 01:27:50 +03:00
Tuomas Tynkkynen
c230aee121
kernel: 4.11 -> 4.11.1
2017-05-15 01:27:41 +03:00
Tuomas Tynkkynen
2f1e6c8686
kernel: 4.10.15 -> 4.10.16
2017-05-15 01:27:30 +03:00
Tuomas Tynkkynen
eacfdc38f4
cryptsetup: 1.7.3 -> 1.7.5
2017-05-14 22:37:06 +03:00
Joachim Fasting
e6c65ecb12
tree-wide: remove uses of features.grsecurity
2017-05-14 15:08:51 +02:00
Tuomas Tynkkynen
d22b1d0ba1
hdparm: 9.51 -> 9.52
2017-05-14 13:47:29 +03:00
Armijn Hemel
6b9996f523
hwdata: 0.291 -> 0.300
...
webpage change, since fedorahosted is being shut down
2017-05-12 23:28:36 +02:00
Cray Elliott
4f51a1ef32
nvidia-x11: add dbus as a dependency to settings
...
for the latest beta release, the nvidia-settings binary will not compile
without dbus/dbus.h
2017-05-12 01:30:28 -07:00
Vladimír Čunát
165a6548ad
nvidia_x11_legacy340: fix patch URL to fix #25721
...
Using fixed-commit URLs and fetchpatch is just more robust.
2017-05-12 10:13:26 +02:00
Cray Elliott
11b8cfb506
nvidia_x11_beta: 378.13 -> 381.22
...
also remove nvidia 4.10 kernel patch as it is no longer needed
2017-05-11 17:53:19 -07:00
Linus Heckemann
89ce83688c
nvidia-x11: fix linux 4.10 patch URL
2017-05-11 17:29:57 -07:00
Linus Heckemann
995d41c091
nvidia stable: 375.39 -> 375.66
2017-05-11 17:29:57 -07:00
Tim Steinbach
8584a16922
linux: 4.10.14 -> 4.10.15
2017-05-09 08:43:37 -04:00
Jörg Thalheim
2e2a5af81f
sysdig: 0.15.0 -> 0.16.0
2017-05-09 09:21:44 +01:00
Joachim Fasting
996b65cfba
linux_hardened: enable structleak plugin
...
A port of the PaX structleak plugin. Note that this version of structleak
seems to cover less ground than the PaX original (only marked structs are
zeroed). [1]
[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c61f13eaa1ee17728c41370100d2d45c254ce76f
2017-05-09 01:38:26 +02:00
Joachim Fasting
1816e2b960
linux_hardened: BUG on struct validation failure
2017-05-09 01:38:24 +02:00
Joachim Fasting
a7ecdffc28
linux_hardened: move to 4.11
...
Note that DEBUG_RODATA has been split into STRICT_KERNEL_RWX &
STRICT_MODULE_RWX, which are on by default (non-optional).
2017-05-09 01:38:22 +02:00
Joachim Fasting
42c58cd2e8
linux_hardened: compile with stackprotector-strong
...
Default is regular, which we need to unset for kconfig to accept the new
value.
2017-05-09 01:38:21 +02:00
Eelco Dolstra
e2700861fb
shadow: Fix hash
2017-05-08 16:56:05 +02:00
Tim Steinbach
8c74ff6534
linux: 4.9.26 -> 4.9.27
2017-05-08 09:26:26 -04:00
Tim Steinbach
4e2c67ff76
linux: 4.4.66 -> 4.4.67
2017-05-08 09:23:52 -04:00
Eelco Dolstra
7f6abddcd7
shadow: Fix using default shell in useradd
...
This caused "useradd xyzzy" to produce a user with no shell:
xyzzy❌ 1002💯 :/home/xyzzy:
https://github.com/shadow-maint/shadow/pull/33
2017-05-08 15:10:50 +02:00
Jörg Thalheim
192f8e7699
broadcom-bt-firmware: revert to unfree
...
license was misinterpreted, it is now only conditionally in the all
firmware list included, if `allowUnfree` is set.
fixes #25567
2017-05-08 09:18:11 +01:00
Joachim F
5250d3ec3d
Merge pull request #25561 from joachifm/linux-gcc-plugins
...
linux: support using gcc plugins
2017-05-07 12:31:32 +01:00
Jörg Thalheim
cc75ccbf64
broadcom-bt-firmware: change license to redistributal
...
see also: https://github.com/winterheart/broadcom-bt-firmware/blob/master/LICENSE.broadcom_bcm20702
fixes #25567
2017-05-07 07:33:41 +01:00
Joachim Fasting
a04d8532c2
linux: support using gcc plugins
...
linux 4.8 onwards support gcc plugins. This patch adds build inputs
required to make use of gcc plugins to the generic kernel build
environment.
2017-05-06 19:47:27 +02:00
Jörg Thalheim
7765e5971c
kernelPackages.zfsUnstable: 0.7.0-rc3 -> 0.7.0-rc4
2017-05-06 07:40:42 +01:00
Jörg Thalheim
4ea961ccc3
kernelPackages.splUnstable: 0.7.0-rc3 -> 0.7.0-rc4
2017-05-06 07:40:28 +01:00
Jörg Thalheim
3156ef2dfd
Merge pull request #25478 from zraexy/zraexy-broadcom-bt-firmware
...
broadcom-bt-firmware: init at 12.0.1.1011
2017-05-04 22:33:06 +01:00
Jörg Thalheim
d072ef956d
broadcom-bt-firmware: mention package limitations
2017-05-04 22:32:55 +01:00
Tim Steinbach
2a38ecc055
linux: 4.10.13 -> 4.10.14
2017-05-03 20:46:48 -04:00
Tim Steinbach
6076843be3
linux: 4.9.25 -> 4.9.26
2017-05-03 20:44:09 -04:00
Tim Steinbach
af933bc7d3
linux: 4.4.65 -> 4.4.66
2017-05-03 20:41:46 -04:00
zraexy
d900478e3c
broadcom-bt-firmware: init at 12.0.1.1011
...
broadcom-bt-firmware: init at 12.0.1.1011
2017-05-03 12:51:32 -08:00
zraexy
7845163d6a
bt-fw-converter: init at 2017-02-19
2017-05-03 12:51:24 -08:00
Cray Elliott
cebce78be9
mwprocapture: fix compile on linux 4.11
2017-05-03 00:11:22 -07:00
Victor Calvert
3d27a84a1c
tomb: 2.2 -> 2.4 ( #25465 )
2017-05-03 00:32:51 +01:00
Jörg Thalheim
7be7902990
zfsUnstable: mark as incompatible with 4.11 (since rc3)
2017-05-02 18:15:53 +02:00
Tim Steinbach
b5169fd277
linux: Add cgroups patches for 4.9, 4.10, 4.11
2017-05-02 08:49:39 -04:00
Vladimír Čunát
d7501b986a
luajit: 2.1.0-beta2 -> 2.1.0-beta3
...
The removal of `luaL_reg` alias caused lots of breakage.
Only sysdig and knot-resolver needed (also) other changes.
2017-05-02 14:00:45 +02:00
Shea Levy
207a0af06a
Add linux 4.11
2017-05-01 19:04:45 -04:00
Jörg Thalheim
95f6bece88
wpa_supplicant: upgrade to qt5
...
also inkscape removal patch, as it introduced a bug: #25320
fixes #25320 #25325
2017-05-01 21:23:22 +02:00
Armijn Hemel
5b0dcf95a0
atop: 2.2-3 -> 2.3.0
2017-05-01 14:45:27 +02:00
Michael Raskin
9c39666613
Merge pull request #25107 from armijnhemel/guvcview
...
guvcview: 2.0.4 -> 2.0.5
2017-05-01 14:15:07 +02:00
Michael Raskin
1cce0887ee
Merge branch 'master' into mptcp-v91.3
2017-05-01 00:43:08 +02:00
michael bishop
70863d5326
ioport: init at 1.2
2017-04-30 18:34:17 -03:00
Michael Raskin
763ed66c24
bluez5: install gatttool; reported by @husnoo
2017-04-30 21:12:37 +02:00
Michael Raskin
929eed352b
Merge pull request #22410 from adnelson/upstart_improvements
...
upstart: wrap binaries and patch hard-coded paths
2017-04-30 18:29:33 +02:00
Tim Steinbach
0c4de3c0c9
linux: 4.4.64 -> 4.4.65
2017-04-30 08:58:44 -04:00
Michael Raskin
b5c3586289
Merge pull request #25333 from zraexy/zraexy-nvidia-x11
...
nvidia-x11: switch download urls to https
2017-04-30 12:23:54 +02:00
Joachim Fasting
ab4fa1cce4
tree-wide: prune some dead grsec leaves
...
The beginning of pruning grsecurity/PaX from the tree.
2017-04-30 12:05:41 +02:00
Joachim Fasting
62f2a1c2be
linux_hardened: init
...
The rationale for this is to have a place to enable hardening features
that are either too invasive or that may be speculative/yet proven to be
worthwhile for general-purpose kernels.
2017-04-30 12:05:39 +02:00
zraexy
563fa2c034
nvidia-x11: switch download urls to https
2017-04-29 13:19:04 -08:00
Jörg Thalheim
6af952fac8
rtkit: fix meta attr
2017-04-29 10:49:12 +02:00
Dan Peebles
90b9719f4f
treewide: fix the remaining issues with meta attributes
2017-04-29 04:24:34 +00:00
Joachim Fasting
32b8512e54
grsecurity: discontinue support
...
Upstream has decided to make -testing patches private, effectively ceasing
free support for grsecurity/PaX [1]. Consequently, we can no longer
responsibly support grsecurity on NixOS.
This patch turns the kernel and patch expressions into build errors and
adds a warning to the manual, but retains most of the infrastructure, in
an effort to make the transition smoother. For 17.09 all of it should
probably be pruned.
[1]: https://grsecurity.net/passing_the_baton.php
2017-04-28 12:35:15 +02:00
Tim Steinbach
7f3b857d0d
linux: 4.4.63 -> 4.4.64
2017-04-27 22:12:35 -04:00
Tim Steinbach
08c44a5cac
linux: 4.10.12 -> 4.10.13
2017-04-27 22:10:06 -04:00
Tim Steinbach
903fec9922
linux: 4.9.24 -> 4.9.25
2017-04-27 22:07:34 -04:00
John Ericson
761af14778
Merge pull request #25227 from obsidiansystems/cross-purge-binutilsCross
...
Purge binutilsCross
2017-04-26 09:09:06 -04:00
John Ericson
295315cc87
binutilsCross: Remove and use binutils instead always
...
See previous commit for what was done to `binutils` to make this
possible.
There were some uses of `forcedNativePackages` added. The
combination of overrides with that attribute is highly spooky: it's
often important that if an overridden package comes from it, the
replaced arguments for that package come from it. Long term this
package set and all the spookiness should be gone and irrelevant:
"Move along, nothing to see here!"
No hashes should be changed with this commit
2017-04-25 21:36:19 -04:00
Kranium Gikos Mendoza
e57bcc7106
facetimehd-firmware: disable aarch64-linux builds
2017-04-26 03:09:24 +03:00
Kranium Gikos Mendoza
88be2f7080
facetimehd: disable aarch64-linux builds
2017-04-26 03:09:24 +03:00
Jörg Thalheim
bd47d04294
Merge pull request #25146 from zx2c4/remove-old-chromiumos
...
linux-chromiumos: remove 3.14
2017-04-25 07:32:51 +02:00
Daniel Peebles
3ae7f249da
Merge pull request #25187 from obsidiansystems/remove-stray-kernel-headers
...
linux-headers: Remove stray linux headers 3.18 nix file
2017-04-24 23:07:58 -04:00
John Ericson
af6e4c5b0d
Merge pull request #25190 from obsidiansystems/ios-stdenv-tiny-refactor
...
crossStdenv on iphone: Just get info from `targetPlatform`
2017-04-24 16:57:54 -04:00
John Ericson
db5a921945
crossStdenv on iphone: Just get info from targetPlatform
2017-04-24 16:12:26 -04:00
Vladimír Čunát
d965e119f2
Merge #24749 : amdgpu-pro: 16.60 -> 17.10
2017-04-24 21:53:50 +02:00
John Ericson
d4fb8cfc09
linux-headers: Remove stray linux headers 3.18 nix file
...
In dced724c00dced724c00 (diff-036410e9211b4336186fc613f7200b12L11174)
2017-04-24 15:25:52 -04:00
Jörg Thalheim
7c44277d38
Merge pull request #25127 from zx2c4/patch-3
...
wireguard: 0.0.20170409 -> 0.0.20170421
2017-04-24 19:28:23 +02:00
Tuomas Tynkkynen
84982c28de
Merge remote-tracking branch 'upstream/master' into staging
2017-04-24 15:04:43 +03:00
evujumenuk
aef776836d
zfs: Bump incompatibleKernelVersion to "4.11"
...
https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.9 attests compatibility with kernel versions up to 4.10.x.
2017-04-23 16:05:38 +02:00
Jason A. Donenfeld
b1750d699c
linux-chromiumos: remove 3.14
...
3.14 is no longer supported upstream by kernel.org and thus no longer
receives security patches. The git commit mentioned in this .nix isn't
even available in the linked repository --
https://chromium.googlesource.com/chromiumos/third_party/kernel -- so I
think this .nix might be dead anyway. Finally, it specifies 3.14.0,
which is so ridiculously old (the latest was 3.14.79) that nobody
develops for it.
Fixes : #25145
Supports: #25127
2017-04-23 15:47:46 +02:00
Jörg Thalheim
8deb0e104f
wireguard: do not fail on warning for older kernel
2017-04-23 13:36:02 +02:00
Jörg Thalheim
600a2f2746
wireguard: make myself maintainer
2017-04-23 13:35:52 +02:00
Frederik Rietdijk
4fc9b1852a
Merge remote-tracking branch 'upstream/master' into HEAD
2017-04-23 11:26:47 +02:00
Jason A. Donenfeld
75608e1bb3
wireguard: 0.0.20170409 -> 0.0.20170421
2017-04-22 23:34:38 +02:00
Joachim Fasting
9e6c96f8fc
grsecurity: 4.9.24-201704210851 -> 4.9.24-2201704220732
2017-04-22 16:37:24 +02:00
Armijn Hemel
04a43fdb90
guvcview: 2.0.4 -> 2.0.5
2017-04-22 12:45:35 +02:00
Joachim Fasting
05911da7bb
grsecurity: 4.9.23-201704181901 -> 4.9.24-201704210851
2017-04-21 15:09:32 +02:00
Tim Steinbach
7fb1b54cc1
linux: 4.4.62 -> 4.4.63
2017-04-21 08:03:43 -04:00
Tim Steinbach
1b3282d52d
linux: 4.10.11 -> 4.10.12
2017-04-21 08:01:22 -04:00
Tim Steinbach
4dda88c89d
linux: 4.9.23 -> 4.9.24
2017-04-21 07:58:45 -04:00
Linus Heckemann
7e34a9c397
util-linux: fix path to umount in eject
2017-04-20 15:52:31 +01:00
Jörg Thalheim
b61e9f6d24
linuxPackages.broadcom-sta: patch file was not named correctly
2017-04-20 08:14:01 +02:00
Jörg Thalheim
f0f9cad9f2
linuxPackages.broadcom-sta: add patch to repo
...
fetchPatch was unreliable and the checksum kept breaking all the time
2017-04-20 07:05:50 +02:00
Joachim Fasting
9902d63e84
grsecurity: 4.9.22-201704120836 -> 4.9.23-201704181901
2017-04-20 00:21:41 +02:00
Tim Steinbach
7643c7c8cc
linux: 4.4.61 -> 4.4.62
2017-04-18 08:22:23 -04:00
Tim Steinbach
5283e644ce
linux: 4.10.10 -> 4.10.11
2017-04-18 08:20:40 -04:00
Tim Steinbach
1173fe0b49
linux: 4.9.22 -> 4.9.23
2017-04-18 08:15:48 -04:00
John Ericson
37e5e71fdf
Merge pull request #24974 from Ericson2314/mapNullable
...
Introduce `mapNullable` into lib and use it in a few places
2017-04-17 17:12:14 -04:00
John Ericson
85aa5005af
Introduce mapNullable into lib and use it in a few places
...
Also simply some configure flag logic my grep also alerted me too.
2017-04-17 17:04:04 -04:00
Tobias Pflug
d857b2d2fa
broadcom-sta: fix linux-4.8 patch sha
2017-04-17 17:07:37 +02:00
Tim Steinbach
5a7b029fa9
linux: 4.11-rc6 -> 4.11-rc7
2017-04-17 07:41:19 -04:00
Victor Calvert
71d8ce6f4b
nvidia: 340.101 -> 340.102 ( #24694 )
2017-04-16 22:08:20 +02:00
Vladimír Čunát
9ee2143912
treewide: remove unused buildEnv parameters
2017-04-16 10:29:49 +02:00
John Ericson
3bff114d95
Merge pull request #24871 from elitak/cross-staging
...
Various small crossDrv fixes
2017-04-15 01:27:05 -04:00
Eric Litak
f89504d067
kmod: crossDrv should use native xz
2017-04-14 18:03:49 -07:00
Tuomas Tynkkynen
3ed0d7e2df
kernel-config: Explicitly enable CONFIG_NETFILTER
...
This is needed by the NixOS firewall, but isn't enabled by the ARM
defconfig nor kernelAutoModules (as 'm' doesn't seem to be an option)
2017-04-14 20:43:50 +03:00
Vladimír Čunát
2090aa4f65
Merge: fixup a bad merge
...
For details see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 19:11:17 +02:00
Vladimír Čunát
6617c8bd87
A fixed version of commit eb750f9a7b
...
For detailed explanation see:
https://github.com/NixOS/nixpkgs/commit/24444513fb5#commitcomment-21767916
2017-04-14 18:59:36 +02:00
Vladimír Čunát
24444513fb
Merge branch 'staging'
2017-04-14 10:32:13 +02:00
Marco Maggesi
1dee38f259
BLCR 0.8.5b4 *do* work with Linux 3.10.
2017-04-13 14:15:27 +02:00
Daniel Peebles
f21a6940da
Merge pull request #24838 from matthewbauer/ibtool
...
pinentry_mac: use xcbuild
2017-04-12 22:20:57 -04:00
Joachim Fasting
3fa5605b41
grsecurity: 4.9.21-201704091948 -> 4.9.22-201704120836
2017-04-12 18:58:29 +02:00
Tim Steinbach
5f05792417
linux: 4.4.60 -> 4.4.61
2017-04-12 09:17:53 -04:00
Tim Steinbach
6860eedfd6
linux: 4.10.9 -> 4.10.10
2017-04-12 09:16:08 -04:00
Tim Steinbach
224a8f7358
linux: 4.9.21 -> 4.9.22
2017-04-12 09:13:56 -04:00
Tuomas Tynkkynen
1ccd871fde
procps: 3.3.11 -> 3.3.12
2017-04-11 13:00:56 +03:00
Tuomas Tynkkynen
52797fc600
Merge remote-tracking branch 'upstream/master' into staging
2017-04-11 12:58:43 +03:00
