diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-21 21:08:21 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-21 21:09:32 +0200 |
| commit | 4683c374fa5b859341db19550d308ea73730f166 (patch) | |
| tree | 5b85193e1d17cfd26fa303d61888f4a2a37e89bc /pkgs/os-specific | |
| parent | e9c1f640482f7028dfd192b6e8b3bf39eed7333b (diff) | |
| parent | 1ae204d2fab96b2aebc59c232f78a116db2b640b (diff) | |
| download | nixpkgs-4683c374fa5b859341db19550d308ea73730f166.tar nixpkgs-4683c374fa5b859341db19550d308ea73730f166.tar.gz nixpkgs-4683c374fa5b859341db19550d308ea73730f166.tar.bz2 nixpkgs-4683c374fa5b859341db19550d308ea73730f166.tar.lz nixpkgs-4683c374fa5b859341db19550d308ea73730f166.tar.xz nixpkgs-4683c374fa5b859341db19550d308ea73730f166.tar.zst nixpkgs-4683c374fa5b859341db19550d308ea73730f166.zip | |
Merge branch 'master' into staging
A couple thousand rebuilds again.
Diffstat (limited to 'pkgs/os-specific')
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix index 640534aa2a6..bff0f5db953 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12.13"; + version = "4.12.14"; extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18sxw7mw4fya7381mkah70s3di6b8xxfigjhrhb7zcczrffb4vl9"; + sha256 = "09zxmknh6awhqmj8dyq95bdlwcasryy35hkjxjlzixdgn52kzaw6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 1d51b033dc1..d1c4d8ba8e7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.2"; + version = "4.13.3"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lgwgw9yp5ywbylnmahsmqzs98yfq53mvvqqdgp7ljiqg8bxqjh6"; + sha256 = "1ayai3i0jakxzszpijhknjiwwi055wa74bpmnr0n7dh2l5s2rlh3"; }; } // (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 5f4686a5ec6..5033bb88f79 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, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.50"; + version = "4.9.51"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0dhm5w7qa1hyqp254r41b4nhf10a8w7sv1mhd16f61inpb41829c"; + sha256 = "12mag09scyzi5a352y39y4b6rjh89qqca53hhmjc396q09hsdyl3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index 3b9357ae35e..a2bf0564783 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.2"; + version = "4.13.3"; revision = "a"; - sha256 = "1srglf014a2ra4sgzwrf53wdc3rrr5lx8dcx57xm4lpvrc4r66y6"; + sha256 = "1w1waqrzji17f7zmnkr7afbd2yz0xqf6m3g8dz2bkd2kzv07vzx5"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); |