diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 12:04:17 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 12:04:17 -0400 |
| commit | 42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7 (patch) | |
| tree | cab0fe05c485a9a8cfb51ac63a5260bc8eeee5a6 /pkgs/os-specific | |
| parent | ad838f6f91fcc89a2c9b1a6b85e7551181c30f95 (diff) | |
| parent | 28b2f48ba9c04bfe8cebffd6b3ea47a78a5e18e6 (diff) | |
| download | nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.gz nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.bz2 nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.lz nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.xz nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.zst nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.16.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index f798a3a85e59..f1e0bf82cec7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.39"; + version = "4.14.40"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gdpq4w6srz2fpyi8bqpgz0p5wm3mrk7ir967c6f2285mdvcb7r6"; + sha256 = "03nh71nqgifkamkb0gn12jny5h3lbn5kmpdy0ff886wyrl34sw6l"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index acafd0bd89f7..40d7d5d865fe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.7"; + version = "4.16.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0f81mxc5b3zf5m29bwc3afv07k60661zl18098cjjqv6qpvbwynq"; + sha256 = "1z4q7khag48wildvq4hf4vwaipkfbh9yywm2m9zfj43vk1ysvyp4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index b09a58c6eb79..c6a94b194b68 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.98"; + version = "4.9.99"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vqh33wdiqf3j4xfakxndhb8x6yr5ppwv9asx7kldjfvb8sr1k8j"; + sha256 = "1pqk88h8wyqz2ijp0pav1b35m2hs9d9is1kcir649jlbj66fphrx"; }; } // (args.argsOverride or {})) |