Tuomas Tynkkynen
48f3036e87
Merge remote-tracking branch 'upstream/master' into staging
2018-02-11 02:10:02 +02: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
Tuomas Tynkkynen
685ceb999e
kernel: Fix missing config options from platform
...
common-config.nix has:
${kernelPlatform.kernelExtraConfig or ""}
and indeed kernelExtraConfig is in hostPlatform.platform, and not in
hostPlatform. (Ugh.).
2018-02-06 22:13:57 +02:00
John Ericson
63b8175281
Merge pull request #34351 from teto/kernel_wip
...
[RDY] buildLinux: Add more overrides
2018-02-06 12:08:12 -05:00
Matthieu Coudron
f620b1b693
kernel: buildLinux replaces import ./generic.nix
...
- defined buildLinux as generic.nix instead of manual-config.nix. This
makes kernel derivations a tad more similar to your typical derivations.
- moved $buildRoot to within the source folder, this way it doesn't have to be created before the unpackPhase
and make it easier to work on kernel source without running the unpackPhase
2018-02-07 10:07:13 +09:00
Tuomas Tynkkynen
9548028a22
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/os-specific/linux/cpupower/default.nix
2018-02-06 04:11:23 +02:00
Will Dietz
6ec60e8c44
busybox-sandbox-shell: extract basic shell to new attribute
...
Nix will use this shell if the attribute is present,
avoiding duplicating changes in the future.
2018-02-05 11:26:01 -06:00
Varun Patro
6626349a03
Create default.nix
2018-02-06 00:35:55 +08:00
Jason A. Donenfeld
ca78dc1704
wireguard: 0.0.20180118 -> 0.0.20180202
2018-02-05 13:09:12 +01:00
Robin Gloster
39172792c6
linuxPackages.cpupower: clean up
...
fixes the build on 17.09
2018-02-05 12:51:42 +01:00
John Ericson
de243f244f
Merge pull request #34312 from lopsided98/cpupower-pciutils-cross
...
cpupower, pciutils: enable cross compiling
2018-02-04 11:51:48 -05:00
Frederik Rietdijk
2dcb7573d9
Merge pull request #34579 from DarkScythe97/hwdata
...
hwdata: 0.300 -> 0.308
2018-02-04 12:33:56 +00:00
Tuomas Tynkkynen
b8dfab93cb
cifs-utils: 6.6 -> 6.7
2018-02-04 12:46:02 +02:00
Tuomas Tynkkynen
34b7ea6d45
Merge remote-tracking branch 'upstream/master' into staging
2018-02-04 12:22:39 +02:00
DarkScythe97
2fa14f3d5c
hwdata: 0.300 -> 0.308
2018-02-04 17:50:54 +10:30
Tim Steinbach
8c280d3ad5
linux: 4.15 -> 4.15.1
2018-02-03 20:38:25 -05:00
Tim Steinbach
4069faad7f
linux-copperhead: 4.15.a -> 4.15.1.a
2018-02-03 20:36:14 -05:00
Tim Steinbach
fcbb7da942
linux: 4.4.114 -> 4.4.115
2018-02-03 20:31:52 -05:00
Tim Steinbach
e5ffae3966
linux: 4.14.16 -> 4.14.17
2018-02-03 20:29:23 -05:00
Tim Steinbach
d6d4ef6580
linux: 4.9.79 -> 4.9.80
2018-02-03 20:27:04 -05:00
Tuomas Tynkkynen
d8571b5795
iproute: 4.14.1 -> 4.15.0
2018-02-04 02:47:21 +02:00
Tuomas Tynkkynen
f0d5bf8ce5
iptables: 1.6.1 -> 1.6.2
2018-02-04 02:47:19 +02:00
Michael Weiss
88c16a63c6
nvme-cli: 1.4 -> 1.5
2018-02-03 23:04:30 +01:00
Jörg Thalheim
27cdf62937
Merge pull request #34555 from womfoo/bump/fnotify-fork-power-smem-stat
...
bump {fnotify,fork,power,smem}stat to latest upstream
2018-02-03 12:17:54 +00:00
Kranium Gikos Mendoza
27045bc019
smemstat: 0.01.17 -> 0.01.18
2018-02-03 23:08:26 +11:00
Kranium Gikos Mendoza
33be552211
powerstat: 0.02.12 -> 0.02.15
2018-02-03 23:08:26 +11:00
Kranium Gikos Mendoza
7db36df4fe
fnotifystat: 0.01.17 -> 0.02.00
2018-02-03 23:08:26 +11:00
Kranium Gikos Mendoza
2b2254637b
forkstat: 0.02.00 -> 0.02.02
2018-02-03 23:08:26 +11:00
Tuomas Tynkkynen
10c8e6d0c5
Merge remote-tracking branch 'upstream/master' into staging
2018-02-03 02:50:21 +02:00
Austin Seipp
d8ba530e64
nvidia-x11: stable 387.34 -> 390.25
...
390.x is Nvidia's latest "Long Lived Branch version" according to
https://www.nvidia.com/object/unix.html so this upgrades the stable version
from 387.xx.
390.x also also has support for kernel 4.15 and later (due to removal of the
old init_timer APIs, among other things), meaning that
linuxPackages_4_15.nvidia_x11 now builds correctly.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-02 13:01:38 -06:00