Frederik Rietdijk
|
b22cc53db1
|
Merge staging into master
|
2018-05-27 17:44:08 +02:00 |
|
Tim Steinbach
|
4605fef14b
|
linux-copperhead: 4.16.10.a -> 4.16.12.a
|
2018-05-26 18:32:07 -04:00 |
|
Tim Steinbach
|
388469e59a
|
linux-copperhead: 4.14.42 -> 4.14.44
|
2018-05-26 18:31:51 -04:00 |
|
Tim Steinbach
|
ae995625d8
|
linux: 4.16.11 -> 4.16.12
|
2018-05-26 12:45:37 -04:00 |
|
Tim Steinbach
|
b4e2fb578e
|
linux: 4.14.43 -> 4.14.44
|
2018-05-26 12:45:30 -04:00 |
|
Tim Steinbach
|
64c4ea0241
|
linux: 4.9.102 -> 4.9.103
|
2018-05-26 12:45:18 -04:00 |
|
Tim Steinbach
|
e49af77735
|
linux: 4.4.132 -> 4.4.133
|
2018-05-26 12:45:08 -04:00 |
|
Jan Malakhovski
|
ad35019501
|
Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
|
2018-05-26 00:20:17 +00:00 |
|
Tim Steinbach
|
69dad57049
|
linux: 4.16.10 -> 4.16.11
|
2018-05-23 17:45:58 -04:00 |
|
Tim Steinbach
|
8758c00160
|
linux: 4.14.42 -> 4.14.43
|
2018-05-23 17:45:38 -04:00 |
|
Tim Steinbach
|
6d31c68e19
|
linux: 4.9.101 -> 4.9.102
|
2018-05-23 17:45:21 -04:00 |
|
John Ericson
|
db4d77779c
|
Merge remote-tracking branch 'upstream/master' into staging
|
2018-05-21 20:21:48 -04:00 |
|
Tim Steinbach
|
d775dc9160
|
linux-copperhead: 4.14.41 -> 4.14.42
|
2018-05-21 14:41:34 -04:00 |
|
Tim Steinbach
|
e8ef471df4
|
linux-copperhead: 4.16.9.a -> 4.16.10.a
|
2018-05-21 14:41:14 -04:00 |
|
Tim Steinbach
|
3995b586a5
|
linux: 4.17-rc5 -> 4.17-rc6
|
2018-05-20 22:45:58 -04:00 |
|
Tim Steinbach
|
950e17fdd9
|
linux: 4.16.9 -> 4.16.10
|
2018-05-20 22:45:58 -04:00 |
|
Tim Steinbach
|
a91a0ce16c
|
linux: 4.14.41 -> 4.14.42
|
2018-05-20 22:45:58 -04:00 |
|
Tim Steinbach
|
b61f83eda6
|
linux: 4.9.100 -> 4.9.101
|
2018-05-20 22:45:58 -04:00 |
|
Tuomas Tynkkynen
|
003473613a
|
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
pkgs/top-level/all-packages.nix
|
2018-05-18 03:54:38 +03:00 |
|
Tim Steinbach
|
1006c8c8d2
|
linux-copperhead: 4.16.7.a -> 4.16.9.a
|
2018-05-16 21:56:50 -04:00 |
|
Tim Steinbach
|
b577dc3bd0
|
linux-copperhead: 4.14.39.a -> 4.14.41.a
|
2018-05-16 21:56:19 -04:00 |
|
John Ericson
|
ddbe9191ef
|
Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
|
2018-05-16 15:16:08 -04:00 |
|
Tim Steinbach
|
f58c4d9a9d
|
linux: 4.16.8 -> 4.16.9
|
2018-05-16 07:24:22 -04:00 |
|
Tim Steinbach
|
8d68eca6d2
|
linux: 4.14.40 -> 4.14.41
|
2018-05-16 07:24:06 -04:00 |
|
Tim Steinbach
|
b8aa95185c
|
linux: 4.9.99 -> 4.9.100
|
2018-05-16 07:23:50 -04:00 |
|
Tim Steinbach
|
56beb9b9fd
|
linux: 4.4.131 -> 4.4.132
|
2018-05-16 07:23:33 -04:00 |
|
Jan Malakhovski
|
5a6d202a43
|
Merge pull request #40419 from oxij/pkgs/fix-linux-debug
linuxPackages.kernel: config: fix DEBUG_INFO setting
|
2018-05-16 00:56:12 -05:00 |
|
Tuomas Tynkkynen
|
6b6a575748
|
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
pkgs/tools/networking/telnet/default.nix
pkgs/top-level/aliases.nix
|
2018-05-16 03:09:33 +03:00 |
|
Yegor Timoshenko
|
97071e5e15
|
Merge pull request #40546 from yorickvP/patch-2
linux: add CONFIG_KEY_DH_OPERATIONS
|
2018-05-15 15:48:36 +03:00 |
|
Yorick
|
c7e8ddc066
|
linux: config: remove prefix on KEY_DH_OPERATIONS
|
2018-05-15 14:33:29 +02:00 |
|
Tim Steinbach
|
9cd3c7a12e
|
linux-testing: 4.17-rc4 -> 4.17-rc5
|
2018-05-15 08:21:34 -04:00 |
|
Yorick
|
f8dc3abbb0
|
linux: add CONFIG_KEY_DH_OPERATIONS
|
2018-05-14 02:03:42 +02:00 |
|
Frederik Rietdijk
|
658b7c3f2e
|
Merge master into staging
|
2018-05-13 12:13:25 +02:00 |
|
Yegor Timoshenko
|
59edce6414
|
kernel: drop tuxOnIce patch (#40411)
Hasn't been updated since 3.14, abandoned by its author, not actually used despite being inside a let binding.
|
2018-05-13 02:16:59 +02:00 |
|
John Ericson
|
ee4b56edd3
|
Merge remote-tracking branch 'upstream/master' into staging
|
2018-05-11 14:36:08 -04:00 |
|
Tuomas Tynkkynen
|
83b3e6d705
|
kernel: Drop bitrotted MIPS patches
Not a single one of these applies to even 4.4 anymore, so these have
clearly bitrotted a long, long time ago.
|
2018-05-11 12:27:31 +03:00 |
|
John Ericson
|
42f6e7c4e4
|
Merge remote-tracking branch 'upstream/master' into staging
|
2018-05-10 12:04:17 -04:00 |
|
Tim Steinbach
|
d21ec84b05
|
linux: 4.16.7 -> 4.16.8
|
2018-05-10 07:58:04 -04:00 |
|
Tim Steinbach
|
6c8aff71c1
|
linux: 4.14.39 -> 4.9.40
|
2018-05-10 07:57:41 -04:00 |
|
Tim Steinbach
|
1bb5a80ab9
|
linux: 4.9.98 -> 4.9.99
|
2018-05-10 07:57:11 -04:00 |
|
Matthew Bauer
|
6748534d83
|
Merge remote-tracking branch 'upstream/master' into staging
|
2018-05-08 09:36:00 -05:00 |
|
Tim Steinbach
|
3510b983c4
|
linux: 4.17-rc3 -> 4.17-rc4
|
2018-05-08 10:02:05 -04:00 |
|
xeji
|
01e6e4c5e9
|
Merge pull request #39541 from teto/mptcp_scheduler
linux-mptcp: enable advanced schedulers
|
2018-05-04 23:39:53 +02:00 |
|
John Ericson
|
cf06e42d1c
|
Merge remote-tracking branch 'upstream/master' into staging
|
2018-05-03 16:35:36 -04:00 |
|
Tim Steinbach
|
f36a3e6836
|
linux-copperhead: 4.16.6.a -> 4.16.7.a
|
2018-05-02 17:28:44 -04:00 |
|
Tim Steinbach
|
14d5bbd67e
|
linux-copperhead: 4.14.38.a -> 4.14.39.a
|
2018-05-02 17:28:44 -04:00 |
|
Matthew Justin Bauer
|
eeb016e8f0
|
Merge branch 'staging' into fix-ncurses-darwin-extensions
|
2018-05-02 15:40:38 -05:00 |
|
Tim Steinbach
|
89e995d215
|
linux: 4.9.97 -> 4.9.98
|
2018-05-02 12:24:46 -04:00 |
|
Tim Steinbach
|
4e3030bbf1
|
Revert "linux: 4.9.97 -> 4.9.98"
This reverts commit c25aeeddb2.
|
2018-05-02 12:24:21 -04:00 |
|
Tim Steinbach
|
d6d9d75942
|
linux: 4.16.6 -> 4.16.7
|
2018-05-02 12:20:28 -04:00 |
|