Commit graph

7981 commits

Author SHA1 Message Date
Ryan Mulligan 9fe963ddb5 sysstat: 11.2.5 -> 11.7.2
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/sar --help` got 0 exit code
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/sar -V` and found version 11.7.2
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/sar --help` and found version 11.7.2
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/sadf -V` and found version 11.7.2
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/iostat -h` got 0 exit code
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/iostat help` got 0 exit code
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/iostat -V` and found version 11.7.2
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/tapestat -V` and found version 11.7.2
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/mpstat -V` and found version 11.7.2
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/pidstat -h` got 0 exit code
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/pidstat -V` and found version 11.7.2
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/cifsiostat -h` got 0 exit code
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/cifsiostat help` got 0 exit code
- ran `/nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2/bin/cifsiostat -V` and found version 11.7.2
- found 11.7.2 with grep in /nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2
- found 11.7.2 in filename of file in /nix/store/m8nm4ifgh3j31wnlz6ixn737d29sv3dx-sysstat-11.7.2

cc "@eelco"
2018-02-28 07:09:55 +00:00
adisbladis c1d408e36b
Merge pull request #35921 from ryantm/auto-update/nftables-0.8-to-0.8.2
nftables: 0.8 -> 0.8.2
2018-02-28 10:20:49 +08:00
georgewhewell 890c0dbe47
rtlwifi: 2017-07-18 -> 2018-02-17 2018-02-28 00:31:36 +00:00
Tuomas Tynkkynen 822526f09e kernel config: Enable CGROUP_BPF
Avoids the following warning:

File /.../systemd-journald.service:35 configures an IP firewall (IPAddressDeny=any), but the local system does not support BPF/cgroup based firewalling.
Proceeding WITHOUT firewalling in effect! (This warning is only shown for the first loaded unit using IP firewalling.)
2018-02-28 01:12:54 +02:00
John Ericson dfc5d7835d
Merge pull request #35247 from telent/mips32
lib, treewide: Add missing MIPS arches, and fix existing usage
2018-02-27 14:01:15 -05:00
Nadrieril 006d62f59f usbguard: 0.7.0 -> 0.7.2 2018-02-27 18:34:01 +00:00
Ryan Mulligan 83a93d4e19 nftables: 0.8 -> 0.8.2
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/ahcr1zyg4sp38rwch6vvvziwm9afj2ja-nftables-0.8.2/bin/nft -h` got 0 exit code
- ran `/nix/store/ahcr1zyg4sp38rwch6vvvziwm9afj2ja-nftables-0.8.2/bin/nft --help` got 0 exit code
- ran `/nix/store/ahcr1zyg4sp38rwch6vvvziwm9afj2ja-nftables-0.8.2/bin/nft -v` and found version 0.8.2
- ran `/nix/store/ahcr1zyg4sp38rwch6vvvziwm9afj2ja-nftables-0.8.2/bin/nft --version` and found version 0.8.2
- ran `/nix/store/ahcr1zyg4sp38rwch6vvvziwm9afj2ja-nftables-0.8.2/bin/nft -h` and found version 0.8.2
- ran `/nix/store/ahcr1zyg4sp38rwch6vvvziwm9afj2ja-nftables-0.8.2/bin/nft --help` and found version 0.8.2
- found 0.8.2 with grep in /nix/store/ahcr1zyg4sp38rwch6vvvziwm9afj2ja-nftables-0.8.2
- found 0.8.2 in filename of file in /nix/store/ahcr1zyg4sp38rwch6vvvziwm9afj2ja-nftables-0.8.2

cc "@wkennington"
2018-02-27 08:04:12 -08:00
adisbladis 84249c7fb8
Merge pull request #35873 from ryantm/auto-update/mcelog-153-to-154
mcelog: 153 -> 154
2018-02-27 23:27:50 +08:00
Frederik Rietdijk d10c201252 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 16:22:37 +01:00
Ryan Mulligan ef27d3e139 mcelog: 153 -> 154
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/17fxzl242z1bjng82m4aqlbsjhdnxjb0-mcelog-154/bin/mcelog --help` got 0 exit code
- ran `/nix/store/17fxzl242z1bjng82m4aqlbsjhdnxjb0-mcelog-154/bin/mcelog --version` and found version 154
- ran `/nix/store/17fxzl242z1bjng82m4aqlbsjhdnxjb0-mcelog-154/bin/mcelog --help` and found version 154
- found 154 with grep in /nix/store/17fxzl242z1bjng82m4aqlbsjhdnxjb0-mcelog-154
- found 154 in filename of file in /nix/store/17fxzl242z1bjng82m4aqlbsjhdnxjb0-mcelog-154
2018-02-27 06:02:14 -08:00
Ryan Mulligan e01ecc288a mbpfan: 2.0.1 -> 2.0.2
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/pn2g5kbmbjdi9z60cn2fwzpbcidvz7ks-mbpfan-2.0.2/bin/mbpfan -h` got 0 exit code
- ran `/nix/store/pn2g5kbmbjdi9z60cn2fwzpbcidvz7ks-mbpfan-2.0.2/bin/mbpfan --help` got 0 exit code
- ran `/nix/store/pn2g5kbmbjdi9z60cn2fwzpbcidvz7ks-mbpfan-2.0.2/bin/mbpfan -V` and found version 2.0.2
- ran `/nix/store/pn2g5kbmbjdi9z60cn2fwzpbcidvz7ks-mbpfan-2.0.2/bin/mbpfan --version` and found version 2.0.2
- ran `/nix/store/pn2g5kbmbjdi9z60cn2fwzpbcidvz7ks-mbpfan-2.0.2/bin/mbpfan -h` and found version 2.0.2
- ran `/nix/store/pn2g5kbmbjdi9z60cn2fwzpbcidvz7ks-mbpfan-2.0.2/bin/mbpfan --help` and found version 2.0.2
- found 2.0.2 in filename of file in /nix/store/pn2g5kbmbjdi9z60cn2fwzpbcidvz7ks-mbpfan-2.0.2

cc "@cstrahan"
2018-02-27 06:00:12 -08:00
Peter Hoeg 5be7d41c97
Merge pull request #35718 from ryantm/auto-update/iio-sensor-proxy-2.2-to-2.4
iio-sensor-proxy: 2.2 -> 2.4
2018-02-27 17:12:29 +08:00
Frederik Rietdijk ad5127c417 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 09:18:49 +01:00
Frederik Rietdijk d185f8bbc2
Merge pull request #35696 from ryantm/auto-update/hal-flash-0.3.0-to-0.3.3
hal-flash: 0.3.0 -> 0.3.3
2018-02-27 08:13:54 +00:00
Frederik Rietdijk 93b8df9688
Merge pull request #35722 from ryantm/auto-update/ipset-6.34-to-6.35
ipset: 6.34 -> 6.35
2018-02-27 08:10:49 +00:00
Ryan Mulligan 6df5a0fd21 ipset: 6.34 -> 6.35
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset -h` got 0 exit code
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset --help` got 0 exit code
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset help` got 0 exit code
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset -V` and found version 6.35
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset -v` and found version 6.35
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset --version` and found version 6.35
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset version` and found version 6.35
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset -h` and found version 6.35
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset --help` and found version 6.35
- ran `/nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35/bin/ipset help` and found version 6.35
- found 6.35 with grep in /nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35
- found 6.35 in filename of file in /nix/store/paz6j5dhl2i8wd8r1hvf2i9w594fl52x-ipset-6.35

cc "@wkennington"
2018-02-26 19:20:31 -08:00
Ryan Mulligan 202e0a195f iio-sensor-proxy: 2.2 -> 2.4
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/w1kd60p20ps8v5pjicl3z9s6y4fmkgy0-iio-sensor-proxy-2.4/bin/iio-sensor-proxy -h` got 0 exit code
- ran `/nix/store/w1kd60p20ps8v5pjicl3z9s6y4fmkgy0-iio-sensor-proxy-2.4/bin/iio-sensor-proxy --help` got 0 exit code
- ran `/nix/store/w1kd60p20ps8v5pjicl3z9s6y4fmkgy0-iio-sensor-proxy-2.4/bin/iio-sensor-proxy help` got 0 exit code
- found 2.4 with grep in /nix/store/w1kd60p20ps8v5pjicl3z9s6y4fmkgy0-iio-sensor-proxy-2.4
- found 2.4 in filename of file in /nix/store/w1kd60p20ps8v5pjicl3z9s6y4fmkgy0-iio-sensor-proxy-2.4

cc "@peterhoeg"
2018-02-26 19:13:30 -08:00
Ryan Mulligan ba1e24c749 hwdata: 0.308 -> 0.309
Semi-automatic update. These checks were performed:

- built on NixOS
- found 0.309 with grep in /nix/store/jid52565zlg8jhgqarln207dcj5g9njn-hwdata-0.309
- found 0.309 in filename of file in /nix/store/jid52565zlg8jhgqarln207dcj5g9njn-hwdata-0.309
2018-02-26 18:56:09 -08:00
Ryan Mulligan 9153893b84 hal-flash: 0.3.0 -> 0.3.3
Semi-automatic update. These checks were performed:

- built on NixOS
- found 0.3.3 with grep in /nix/store/88qd4dw0rxmxgqprqc0dg8jp7w3zcmzk-hal-flash-0.3.3
- found 0.3.3 in filename of file in /nix/store/88qd4dw0rxmxgqprqc0dg8jp7w3zcmzk-hal-flash-0.3.3

cc "@malyn"
2018-02-26 18:13:46 -08:00
Markus Kowalewski 0269c9c0c1 rdma-core: 16.1 -> 17 2018-02-26 16:54:03 -08:00
Tuomas Tynkkynen bc2c0b297a trinity: Fix build by upgrading
Probably broken by the linuxHeaders upgrade.

https://hydra.nixos.org/build/70176539
2018-02-27 02:34:29 +02:00
Nikolay Amiantov 1acf9f360d linuxPackages.evdi: mark as broken on Linux 4.15 2018-02-27 03:26:31 +03:00
Nikolay Amiantov 4db787b1b1 displaylink: 1.3.52 -> 4.1.9
Closes #34194.
2018-02-27 03:18:21 +03:00
Nikolay Amiantov f5b04628f0 linuxPackages.evdi: disable fortify hardening
Also fix version (this revision is actually tagged).
2018-02-27 03:17:57 +03:00
Jörg Thalheim a9d7f03051 pipework: 2015-07-30 -> 2017-08-22 2018-02-26 23:13:24 +00:00
Vladimír Čunát 6168c2e45f
Merge master into staging
This is to cleanup the (re-)revert of merge to master.
2018-02-26 22:55:11 +01:00
Shea Levy 044c65bd06
Merge branch 'systemd-cross' into staging 2018-02-26 07:42:21 -05:00
Shea Levy 9d2af8d61c
systemd: Fix cross-compiling 2018-02-26 06:38:42 -05:00
adisbladis b5f50db01e
Merge pull request #35637 from ryantm/auto-update/eventstat-0.03.04-to-0.04.03
eventstat: 0.03.04 -> 0.04.03
2018-02-26 18:01:54 +08:00
adisbladis 4ebe51e24f
Merge pull request #35616 from ryantm/auto-update/dmtcp-2.5.1-to-2.5.2
dmtcp: 2.5.1 -> 2.5.2
2018-02-26 14:05:36 +08:00
Ryan Mulligan 20246dc450 eventstat: 0.03.04 -> 0.04.03
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/2zp45hxwi8mnlsaf2hwfdbd0hkzrfcvz-eventstat-0.04.03/bin/eventstat -h` got 0 exit code
- ran `/nix/store/2zp45hxwi8mnlsaf2hwfdbd0hkzrfcvz-eventstat-0.04.03/bin/eventstat -h` and found version 0.04.03
- found 0.04.03 with grep in /nix/store/2zp45hxwi8mnlsaf2hwfdbd0hkzrfcvz-eventstat-0.04.03
- found 0.04.03 in filename of file in /nix/store/2zp45hxwi8mnlsaf2hwfdbd0hkzrfcvz-eventstat-0.04.03
2018-02-25 20:52:22 -08:00
Ryan Mulligan 09da2074dd dmtcp: 2.5.1 -> 2.5.2
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_discover_rm -h` got 0 exit code
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_discover_rm --help` got 0 exit code
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_discover_rm -V` and found version 2.5.2
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_discover_rm -v` and found version 2.5.2
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_discover_rm --version` and found version 2.5.2
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_discover_rm -h` and found version 2.5.2
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_discover_rm --help` and found version 2.5.2
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_rm_loclaunch -h` got 0 exit code
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_rm_loclaunch --help` got 0 exit code
- ran `/nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2/bin/dmtcp_rm_loclaunch help` got 0 exit code
- found 2.5.2 with grep in /nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2
- found 2.5.2 in filename of file in /nix/store/dpqcx4vr2nzam3c504xg5qc0rmmf1c4k-dmtcp-2.5.2
2018-02-25 20:07:55 -08:00
adisbladis c718b057d4
Merge pull request #35561 from ryantm/auto-update/blktrace-1.1.0-to-1.2.0
blktrace: 1.1.0 -> 1.2.0
2018-02-26 10:23:28 +08:00
adisbladis 28d811a324
Merge pull request #35577 from ryantm/auto-update/cachefilesd-0.10.9-to-0.10.10
cachefilesd: 0.10.9 -> 0.10.10
2018-02-26 09:38:13 +08:00
Ryan Mulligan de69fe70ca cachefilesd: 0.10.9 -> 0.10.10
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/x64h5av7wnk88kjcs1rk3cv5lv1rqhcv-cachefilesd-0.10.10/bin/cachefilesd -v` and found version 0.10.10
- ran `/nix/store/x64h5av7wnk88kjcs1rk3cv5lv1rqhcv-cachefilesd-0.10.10/bin/cachefilesd --version` and found version 0.10.10
- found 0.10.10 with grep in /nix/store/x64h5av7wnk88kjcs1rk3cv5lv1rqhcv-cachefilesd-0.10.10
- found 0.10.10 in filename of file in /nix/store/x64h5av7wnk88kjcs1rk3cv5lv1rqhcv-cachefilesd-0.10.10
2018-02-25 11:38:37 -08:00
Nikolay Amiantov cc1363aec5 android-udev-rules: 20171113 -> 20180112 2018-02-25 22:24:09 +03:00
Ryan Mulligan 1e615dd657 blktrace: 1.1.0 -> 1.2.0
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/blkparse -V` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/blkparse --version` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/blktrace -V` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/blktrace -v` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/blktrace --version` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/blkiomon -V` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/blkiomon --version` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btrace help` got 0 exit code
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btt -h` got 0 exit code
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btt --help` got 0 exit code
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btt -V` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btt --version` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btt -h` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btt --help` and found version 1.2.0
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btrecord -h` got 0 exit code
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btrecord --help` got 0 exit code
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btreplay -h` got 0 exit code
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/btreplay --help` got 0 exit code
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/bno_plot.py -h` got 0 exit code
- ran `/nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0/bin/bno_plot.py --help` got 0 exit code
- found 1.2.0 with grep in /nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0
- found 1.2.0 in filename of file in /nix/store/11v1yxf5d2xiw62d99bbbsv5qhwyjair-blktrace-1.2.0
2018-02-25 09:26:11 -08:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Tim Steinbach f9fc80604d
linux-copperhead: 4.15.5.a -> 4.15.6.a 2018-02-25 11:10:07 -05:00
Tim Steinbach 2ba3f3a51a
linux: 4.15.5 -> 4.15.6 2018-02-25 11:06:08 -05:00
Tim Steinbach bee495e7b1
linux: 4.14.21 -> 4.14.22 2018-02-25 11:05:55 -05:00
Tim Steinbach 8d3098482e
linux: 4.9.83 -> 4.9.84 2018-02-25 11:05:40 -05:00
Tim Steinbach f22a5f3b1e
linux: 4.4.117 -> 4.4.118 2018-02-25 11:03:58 -05:00
Shea Levy e21300a6ae
libapparmor: Fix cross-compilation. 2018-02-25 09:38:55 -05:00
Shea Levy 42c8776571
systemd: Take python3 from buildPackages. 2018-02-25 09:07:14 -05:00
Johannes Frankenau 2cc5ac2299
udisks2: add gobjectIntrospection to nativeBuildInputs 2018-02-25 12:40:46 +01:00
Shea Levy 87270fb306
gnu-efi: Only build on efi-enabled systems 2018-02-24 21:49:31 -05:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev 1bc1909e5b treewide: transition from mesa_glu to libGLU 2018-02-24 17:05:43 +02:00
Alexander V. Nikolaev 8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Jörg Thalheim e115dac5fc rtl8814au: nitpicks 2018-02-24 14:00:00 +00:00
lassulus 0ab8bf61af rtl8814au: init at 4.3.21 2018-02-24 14:34:34 +01:00
Daniel Barlow 9c50ae6898 lib, treewide: Add missing MIPS arches, and fix existing usage
Existing "mips64el" should be "mipsel".

This is just the barest minimum so that nixpkgs can recognize them as
systems - although required for building individual derivations onto
MIPS boards, it is not sufficient if you want to actually build nixos on
those targets
2018-02-23 20:43:42 -05:00
xeji 1c3b6d509d wireguard: 0.0.20180202 -> 0.0.20180218 2018-02-23 17:59:20 +01:00
Jan Tojnar 3b512ca185
Merge pull request #35065 from jtojnar/fwupd-1.0.5
fwupd: 1.0.5 update & cleanups
2018-02-23 17:22:47 +01:00
Tim Steinbach 27dd924b49
linux-copperhead: 4.15.4.a -> 4.15.5.a 2018-02-23 08:35:23 -05:00
Shea Levy cb025f2285
linux_riscv: Move patches to my Linux fork.
All patches there are also submitted upstream and will be removed if
rejected.

Also includes some fixes to get module loading working.
2018-02-23 05:53:31 -05:00
Tim Steinbach 472dd33ea4
linux: 4.15.4 -> 4.15.5 2018-02-22 20:35:59 -05:00
Tim Steinbach 371595432b
linux: 4.14.20 -> 4.14.21 2018-02-22 20:35:43 -05:00
Tim Steinbach 9b55ac28c9
linux: 4.9.82 -> 4.9.83 2018-02-22 20:35:24 -05:00
Tim Steinbach 23ea377a7b
linux: 4.4.116 -> 4.4.117 2018-02-22 20:34:30 -05:00
Franz Pletz 512fb52ed4
Merge pull request #35356 from troydm/master
rtl8192eu: init at 4.4.1
2018-02-22 23:46:35 +00:00
Will Dietz 9261c17ad0 busybox: 1.28.0 -> 1.28.1 2018-02-22 14:51:33 -06:00
Will Dietz 381ace583c musl: 1.1.18 -> 1.1.19
Remove patch, no longer needed.
2018-02-22 13:57:36 -06:00
troydm 89d660f7f1 rtl8192eu: init at 4.4.1 2018-02-22 21:18:01 +02:00
Jan Tojnar 30cc156c8c
nixos/fwupd: use manual list of etc files
Closes: #32142
2018-02-22 13:18:23 +01:00
Jan Tojnar 892740fe2f
libsmbios: 2.3.3 → 2.4.1 2018-02-22 13:18:22 +01:00
Jan Tojnar 73f2f644bc
fwupd: 1.0.4 → 1.0.5 2018-02-22 13:18:21 +01:00
Jan Tojnar 41e85ef889
fwupdate: 8 → 10 2018-02-22 13:18:21 +01:00
Peter Hoeg 1c67ee4ff6
Merge pull request #35325 from peterhoeg/u/dbusb
dbus-broker: 9 -> 11
2018-02-22 17:42:18 +08:00
Peter Hoeg eb5ad9bb0c dbus-broker: 9 -> 11 2018-02-22 17:32:27 +08:00
Peter Hoeg 41ef8a13b5 Revert "dbus-broker: 9 -> 11"
This reverts commit 89343b4d43.

Breaks master.
2018-02-22 12:48:22 +08:00
Peter Hoeg 89343b4d43 dbus-broker: 9 -> 11 2018-02-22 11:52:14 +08:00
Vladimír Čunát 3e6c5a25f3
Merge branch 'staging'
In particular, this upgrades the default gcc: 6 -> 7.
Fixes #27794, /cc #31747.
2018-02-22 00:32:46 +01:00
Tim Steinbach 09cc8872ef
Merge pull request #35043 from NeQuissimus/cfs_bandwidth
linux-common: Add CFS_BANDWIDTH
2018-02-21 23:18:44 +00:00
Frederik Rietdijk b5391b2451 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-21 20:43:10 +01:00
Austin Seipp 2fa6cd257d perf: separateDebugInfo = true
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-20 22:17:24 -06:00
Austin Seipp cbf6fa3cc7 perf: fix some hardcoded paths with newer, more exciting hardcoded NixOS paths!
In the long run it looks like we may actually need a small set of patches to
Perf if that's more maintainable, in which case we would much rather check
NIX_DEBUG_INFO_DIRS.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-20 22:17:12 -06:00
Austin Seipp 4166691813 bcc: add systemtap dep, and fix build revision
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-20 14:02:04 -06:00
Vladimír Čunát 1d15dadbec
Merge branch 'master' into staging
Larger rebuilds from master.
2018-02-20 20:33:40 +01:00
Shea Levy 39ff498418
kernelPatches: Add pointer to ml threads for riscv patches. 2018-02-20 11:26:44 -05:00
Pascal Bach d351cd9f69 systemd-cryptsetup-generator: fix compilation with systemd 237
Closes #35097
2018-02-20 16:34:30 +02:00
Shea Levy f8b5b93b88
linux_riscv: Add patches for initrd support 2018-02-20 09:18:17 -05:00
Austin Seipp f0fe7bae99 linuxPackages.perf: fix tips.txt lookup, few extra deps
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-20 07:00:21 -06:00
Shea Levy bd7d5b3657
linux: Don't try to install firmware on newer kernels.
This was disabled in torvalds/linux@5620a0d1aa
2018-02-19 17:08:24 -05:00
Shea Levy 7ce1f0b8ae
linuxManualConfig: Fix build on non-modular kernels 2018-02-19 15:16:29 -05:00
Shea Levy 6173f2f945
linux_riscv: Add 4.16-rc1.
Fixes #35148.
2018-02-19 12:14:22 -05:00
Vladimír Čunát be8062d34b
Merge branch 'staging' into gcc-7 2018-02-19 16:21:55 +01:00
Profpatsch 2a6c7aebcd powertop: split man page into "man" output 2018-02-19 12:16:18 +01:00
Shea Levy c7439b435c
Merge branch 'kernel-gcc7-cross' of git://github.com/lopsided98/nixpkgs 2018-02-18 18:18:00 -05:00
Shea Levy fd0f15f11c
linuxHeaders: Bump default to 4.15. 2018-02-18 16:59:29 -05:00
Shea Levy 32ce7012f0
Merge branch 'master' into gcc-7 2018-02-18 16:27:22 -05:00
Shea Levy a96886863a
Merge branch 'riscv-initial-cross-support' of git://github.com/shlevy/nixpkgs 2018-02-18 16:16:48 -05:00
Tim Steinbach 246359e855
linux: 4.15.3 -> 4.15.4 2018-02-18 09:55:54 -05:00
Tim Steinbach 9d55ab2c4b
linux: 4.14.19 -> 4.14.20 2018-02-18 09:55:21 -05:00
Tim Steinbach e3dd76f76c
linux: 4.9.81 -> 4.9.82 2018-02-18 09:54:56 -05:00
Tim Steinbach 07e7a67f7b
linux: 4.4.115 -> 4.4.116 2018-02-18 09:54:31 -05:00
Tim Steinbach 734f40a0a5
linux-copperhead: 4.15.3.a -> 4.15.4.a 2018-02-18 09:53:59 -05:00
Shea Levy a933aa9a8d
busybox-sandbox-shell: Fix build on RISC-V 2018-02-18 09:02:10 -05:00
Vladimír Čunát 088d7c9f3b
libffado: 2.3.0 -> 2.4.0 (maintenance)
http://ffado.org/?q=node/3379
This fixes build with gcc7.  The removed patches are inside now.
2018-02-18 13:35:50 +01:00
Ben Wolsieffer 643ba8254d kernel: fix cross compilation with gcc 7 2018-02-17 22:09:56 -05:00
Vladimír Čunát 7d19d7ee18
Revert "linux-*: build with gcc7, but allow overriding it"
This reverts commit ae040525d8.
gcc7 is the default now.
2018-02-17 16:30:26 +01:00
Vladimír Čunát 7a1462c04a
Merge branch 'master' into gcc-7
A few thousand rebuilds.
Hydra: ?compare=1433915
2018-02-17 10:27:21 +01:00
Tim Steinbach bbbd9de9d7
linux-common: Add CFS_BANDWIDTH
The option is needed to limit CPU usage of processes.
It seems to have no negative impact if left unused.

See https://lwn.net/Articles/428230/
2018-02-16 10:00:08 -05:00
Vladimír Čunát b5aaaf87a7
Merge staging and PR #35021
It's the last staging commit (mostly) built on Hydra,
and a minimal fix for Darwin regression in pysqlite.
2018-02-16 09:13:12 +01:00
adisbladis dafdaa98a5
Merge pull request #34994 from jokogr/u/openvswitch-2.5.4
openvswitch: 2.5.2 -> 2.5.4
2018-02-16 12:43:24 +08:00
adisbladis 91d89abc5a
Merge pull request #35007 from layus/update-conky
conky: 1.10.7 -> 1.10.8
2018-02-16 12:42:50 +08:00
Tuomas Tynkkynen b98a3f247a linux_testing: 4.15-rc9 -> 4.16-rc1 2018-02-16 01:13:30 +02:00
Tuomas Tynkkynen 64fa0d5b97 kernel: Add deps for building 4.16 2018-02-16 01:13:30 +02:00
Tuomas Tynkkynen 7a7e8a8004 kernel config: Disable USB_SERIAL_* on 4.16 and above
They got removed:

commit 003948c54e5b5034a9bbb4923336f5aba125eae6
Author: Benjamin Gilbert <benjamin.gilbert@coreos.com>
Date:   Tue Jan 23 18:06:30 2018 -0800

    USB: serial: keyspan: Drop firmware Kconfig options

    The USB_SERIAL_KEYSPAN_* firmware options no longer do anything.
2018-02-16 01:13:30 +02:00
Tuomas Tynkkynen db38e0c7e7 kernel config: Cleanup self-test module disabling
No reason to have complex version-dependent conditionals when the
question mark already handles this just as well.

Also add RUNTIME_TESTING_MENU setting which nicely disables all of this
on >= 4.16.
2018-02-16 01:13:30 +02:00
Guillaume Maudoux 71f72219fc conky: 1.10.7 -> 1.10.8 2018-02-15 16:43:17 +01:00
Tuomas Tynkkynen b1916b45a3 Merge remote-tracking branch 'upstream/staging' into gcc-7
Conflicts:
	pkgs/development/libraries/libidn/default.nix
	pkgs/top-level/all-packages.nix
2018-02-15 15:45:37 +02:00
Jörg Thalheim a956c646fb
Merge pull request #34827 from danielfullmer/rtl8812-5.2.20
rtl8812au: 4.3.20 -> 5.2.20_25672.20171213
2018-02-15 08:13:10 +00:00
Herwig Hochleitner 3027b80f1d linuxPackages.kernel: add feature.debug flag for enabling DEBUG_INFO 2018-02-15 09:10:32 +01:00
Herwig Hochleitner 66080ae4d8 programs.criu: add nixos option for installing criu + kernel flags 2018-02-15 09:10:32 +01:00
Ioannis Koutras 98c91fb9d6 openvswitch: 2.5.2 -> 2.5.4 2018-02-15 09:59:52 +02:00
Jan Tojnar 200a08e649
fwupd: add manpage 2018-02-15 01:11:14 +01:00
Jan Tojnar a5e46588ab
fwupd: add devdoc 2018-02-15 01:11:14 +01:00
Jan Tojnar 201cc158cb
nixos/fwupd: add test 2018-02-15 01:11:13 +01:00
Jan Tojnar be54e4b07e
fwupd: enable tests 2018-02-15 01:11:13 +01:00
Jan Tojnar 2ea6f25ebc
fwupd: use correct libelf 2018-02-15 01:11:12 +01:00
Will Dietz 8340cc5c6a
fwupd: shared_mime_info is needed! 2018-02-15 01:11:12 +01:00
Jan Tojnar fb29a093f1
fwupd: 1.0.1 → 1.0.4 2018-02-15 01:11:11 +01:00
Jan Tojnar f94a17387c
efivar: 30 → 34 2018-02-15 01:11:10 +01:00
Frederik Rietdijk 672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
Michael Weiss 92d2043d0f fscrypt: 0.2.2 -> 0.2.3 2018-02-14 13:31:24 +01:00
Michael Weiss bf01a11ac1 fscryptctl: 2017-09-12 -> 2017-10-23 2018-02-14 13:31:24 +01:00
Tuomas Tynkkynen 8e643320c0 linuxHeaders: Drop usage of kernelHeadersBaseConfig
It's not actually needed, and AFAICT has never been. Or at least
Buildroot can build kernel headers as old as 3.2 without running the
config phase.

While at it, set ARCH unconditionally.
2018-02-14 01:47:28 +02:00
Will Dietz b0c4138a3b iproute: patchshebangs to work on 'hostPlatform' (not build) 2018-02-13 13:55:43 -06:00
Will Dietz d3b59f864a define top-level attrs for getent, getconf
Note that currently getent is explicitly taken from "glibc.bin",
regardless of build configuration which this preserves for now.
(on non-musl anyway)
2018-02-13 11:47:16 -06:00
Tim Steinbach 45e9b7b1c1
linux: 4.9.80 -> 4.9.81 2018-02-13 12:44:43 -05:00
Tim Steinbach 3b9f6874d8
linux: 4.14.18 -> 4.14.19 2018-02-13 12:40:34 -05:00
Will Dietz 82dfab87fa systemd: add getent-bin to nativeBuildInputs, meson searches for getent 2018-02-13 09:45:05 -06:00
Will Dietz 8323123e95 systemd: use musl-getent on musl instead of glibc.bin's getent 2018-02-13 09:45:05 -06:00
Will Dietz 22a5393041 pam: depsBuildBuild for buildPackages.stdenv.cc 2018-02-13 09:45:02 -06:00
Will Dietz 7522d6b02f busybox: don't force gcc 2018-02-13 09:45:02 -06:00
Will Dietz b281cb20d5 iputils: drop glibc assert 2018-02-13 09:45:01 -06:00
Will Dietz d9b8f17341 shadow: fix attempt to access 'stdenv.glibc' 2018-02-13 09:45:01 -06:00
Ben Gamari ef5d3d1c9f kexectools: Fix cross compilation 2018-02-13 09:45:00 -06:00
Ben Gamari f33a75a658 kexectools: Add dependency on build CC
Seems to allow cross-compilation.
2018-02-13 09:45:00 -06:00
Will Dietz ad09de4d13 numactl: fix use of deprecated macros, patch to fix w/musl 2018-02-13 09:45:00 -06:00
Will Dietz d8b15f8b05 numactl: 2.0.10 -> 2.0.11
grab release from github, old homepage seems defunct?
2018-02-13 09:44:59 -06:00
Will Dietz 7fbb42eabb Similarly, use 4.15 kernel headers instead of patching 4.14 w/uapi fixes 2018-02-13 09:44:59 -06:00
Will Dietz cea0765a29 libcap: depsBuildBuild, don't set CC/BUILD_CC 2018-02-13 09:44:57 -06:00
Ben Gamari db9f302cf3 libcap: Fix cross-compilation 2018-02-13 09:44:57 -06:00
Will Dietz 5aed799ae0 iputils: only use libidn on non-musl 2018-02-13 09:44:55 -06:00
Will Dietz e606e4d6a9 lvm2: musl patches from alpine 2018-02-13 09:44:55 -06:00
Will Dietz f29bbd779c musl: add patch to make full use of new guards in kernel headers 2018-02-13 09:44:53 -06:00
Will Dietz bc76f767f6 linuxHeaders: allow multiple versions, use newest + patches w/musl
Hash unchanged for non-musl case.
2018-02-13 09:44:53 -06:00
Will Dietz e2ef21d9b5 lm_sensors: add musl patch from alpine.
Doesn't fix build yet due to use of unconventional
object file extensions (which shouldn't matter but do).
2018-02-13 09:44:50 -06:00
Will Dietz 3b5e1131a7 libapparmor: Add musl patches from Alpine
(update: drop patches no longer needed on updated version)
2018-02-13 09:44:49 -06:00
Will Dietz 54b3967edc libnl: use patch from gentoo-musl, fixes! \o/ 2018-02-13 09:44:47 -06:00
Will Dietz 32b472dd9d audit: tweaks to make musl compat 2018-02-13 09:44:46 -06:00
Will Dietz 4aca016313 changes some targetPlatform to hostPlatform checks 2018-02-13 09:44:42 -06:00
Will Dietz cb521f75a6 linux-pam: fix build w/musl 2018-02-13 09:44:36 -06:00
Will Dietz d4a2e336b4 busybox: fixup after musl multiple outputs 2018-02-13 09:44:34 -06:00
Will Dietz b12a7c9225 add getconf, getent from Alpine for use w/musl 2018-02-13 09:44:34 -06:00
Will Dietz 9df72c0290 Add musl-fts for bits that need it. 2018-02-13 09:44:34 -06:00
Will Dietz af6b756d98 muslCross: init 2018-02-13 09:44:34 -06:00
Will Dietz 1d538d51c3 musl: linux headers, bsd compat headers, and ldd 2018-02-13 09:44:33 -06:00
Will Dietz 290c62e749 musl: multiple outputs 2018-02-13 09:44:33 -06:00
Will Dietz b9b57dada7 shadow: disable nscd on non-glibc (musl) 2018-02-13 09:44:28 -06:00
Ben Gamari 46c2e619e8 linux-pam: Add necessary build dependencies for cross-compilation
Ensure that we use the correct `ar` and add explicit dependency on the build CC.

(cherry picked from commit 5efb768011f6bce870f4ce814295a399d5a89c10)
2018-02-13 09:44:27 -06:00
Will Dietz e120c42ccf iproute: don't use host BASH for scripts, fix for cross
Doesn't eliminate glibc dep, somehow
a dependency on host's "db" leaks,
but it's a start.

Also don't attempt to build unused 'netem' tools,
avoiding need to use HOSTCC.
2018-02-13 09:44:27 -06:00
Tuomas Tynkkynen 1a06373c0a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
2018-02-13 16:42:55 +02:00
Franz Pletz eb862c48dd
systemd: 234 -> 237
Co-Authored-By: Florian Klink <flokli@flokli.de>
Co-Authored-By: Andreas Rammhold <andreas@rammhold.de>
2018-02-13 01:24:24 +01:00
Vladimír Čunát 5e62091c45
Merge #34882: linux: use absolute paths for compilers
This is needed to really build linux with gcc7 after ae040525d.
2018-02-12 22:20:31 +01:00
Vladimír Čunát 3d24c5eecc linux: use absolute paths for compilers
HOSTCC was taking precedence before stdenv's normal CC,
at least in case of non-cross build.
2018-02-12 14:00:51 -05:00
Tim Steinbach 8a60770f6b
linux-copperhead: 4.15.2.a -> 4.15.3.a 2018-02-12 07:56:21 -05:00
Tim Steinbach 71a2ffaa63
linux: 4.15.2 -> 4.15.3 2018-02-12 07:53:22 -05:00
Vladimír Čunát 169216fe14
linuxPackages: build by kernel's stdenv 2018-02-11 18:55:21 +01:00
Vladimír Čunát ae040525d8
linux-*: build with gcc7, but allow overriding it
I expect we will revert this after general upgrade to gcc7.
See https://github.com/NixOS/nixpkgs/issues/34383
2018-02-11 18:55:18 +01:00
Daiderd Jordan 69779a5f7e
Merge pull request #33374 from dtzWill/update/llvm-5-default
Update LLVM default 4 -> 5
2018-02-11 18:29:26 +01:00
Frederik Rietdijk 06a7281d0f Merge master into staging 2018-02-11 08:55:28 +01:00
Frederik Rietdijk 9d69ebe5a8 Merge staging at '256ba86' into master 2018-02-11 08:54:49 +01:00
Daniel Fullmer 59c43d60ad rtl8812au: 4.3.20 -> 5.2.20_25672.20171213 2018-02-10 21:05:39 -05:00
Tuomas Tynkkynen 48f3036e87 Merge remote-tracking branch 'upstream/master' into staging 2018-02-11 02:10:02 +02:00
Léo Gaspard 97ee203a22
eudev: 3.2.4 -> 3.2.5 2018-02-10 23:28:30 +01:00
Tuomas Tynkkynen 6d8c1fe01c linux: Use concatStringsSep 2018-02-11 00:17:47 +02:00
Jörg Thalheim c69686e645
Merge pull request #34207 from dtzWill/fix/busybox-misc
busybox: bump copybuf, disable utmp/wtmp when not supported (musl)
2018-02-10 13:38:43 +00:00
Jörg Thalheim 3b8bb02f68
Merge pull request #34792 from dywedir/bcachefs
linux_testing_bcachefs: 4.11.2017.08.23 -> 4.15.2018.02.09
2018-02-10 08:20:35 +00:00
dywedir bad837fd3b linux_testing_bcachefs: 4.11.2017.08.23 -> 4.15.2018.02.09 2018-02-10 00:41:04 +02:00
Jan Malakhovski 3a2ee6e5c3 linuxPackages: introduce hardenedLinuxPackagesFor and cleanup some expressions using it 2018-02-09 19:50:04 +00:00
Jörg Thalheim 5b247f741d
Merge pull request #34677 from dtzWill/feature/busybox-sandbox-shell
busybox-sandbox-shell: extract basic shell to new attribute
2018-02-09 09:32:55 +00:00
Dan Peebles dfd300c81d treewide: s/pkgs.fedoraproject.org/src.fedoraproject.org/
Upstream killed the pkgs server but src continues to serve up the exact
same content, so we can just point there and all hashes should be unchanged.
2018-02-08 16:38:08 -05:00
Vladimír Čunát 55bbcd4e48
linuxPackages.nvidia_x11_beta: alias to stable
It doesn't seem much sense to have "beta" with version lower than "stable".
2018-02-08 19:55:28 +01:00
Andreas Rammhold 7a833cfcb8 nvidia_x11_beta: 381.22 -> 390.12
This change is done for completness in regards to [1] since we already
support a newer "stable" version.

nvidia_x11_beta now compiles on both 4.14 and 4.15.

[1] https://github.com/NixOS/nixpkgs/issues/31640
2018-02-08 12:55:45 +01:00
Michael Raskin a600b621c8 linux_4_15: fix a partial version downgrade on staging merge 2018-02-08 12:43:08 +01:00
Frederik Rietdijk 50a9d51a09 Merge commit '30d031b5d8d05422586043c3f105f4d9110e4f59' into HEAD 2018-02-08 12:14:07 +01:00
adisbladis e860b651d6
Merge pull request #34713 from dtzWill/update/zfs-spl-0.7.6
zfs, spl: 0.7.5 -> 0.7.6
2018-02-08 13:54:43 +08:00
Will Dietz 5da8924333 zfs, spl: 0.7.5 -> 0.7.6
Fixes compat with 4.15
(cc #34459)
2018-02-07 18:49:26 -06:00
Tim Steinbach c46a833e6c
linux-copperhead: 4.15.1.a -> 4.15.2.a 2018-02-07 19:47:20 -05:00
Tim Steinbach 9f3d57a31f
linux: 4.15.1 -> 4.15.2 2018-02-07 19:36:35 -05:00
Tim Steinbach 0b43d5a9cf
linux: 4.14.17 -> 4.14.18 2018-02-07 19:36:21 -05:00
sjau 0d65e2e0e5 zfs: add migration path for new crypto format
fixes #34559
2018-02-07 20:46:16 +00:00
Daiderd Jordan c0aa8f5fb8
Merge pull request #34630 from varunpatro/lsusb
lsusb for OSX
2018-02-07 18:34:41 +01:00
Tuomas Tynkkynen 1b6e95e1eb hdparm: 9.53 -> 9.54 2018-02-07 18:48:04 +02:00
Varun Patro e8f480fb6c
Add 'varunpatro' as a maintainer. 2018-02-07 13:59:34 +08:00
Tuomas Tynkkynen 4c6c919a31 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/os-specific/linux/kernel/generic.nix
2018-02-07 03:41:24 +02:00