diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:16:36 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-07 10:17:42 +0200 |
commit | ef41fc7f5140a6d980faf7ed2a865ec2f092253b (patch) | |
tree | 81bcfcc47155b56618dd73934ba41d8d8c7fc309 /pkgs/os-specific/linux | |
parent | 656a0089f68495cd42d3164ed85d22ceec630d82 (diff) | |
parent | 893df17c5a37e14616a24e66d96f3fd5e0344bce (diff) | |
download | nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.gz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.bz2 nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.lz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.xz nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.tar.zst nixlib-ef41fc7f5140a6d980faf7ed2a865ec2f092253b.zip |
Merge branch 'master' into staging
Hydra: ?compare=1399476
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index c45afd1cbeb1..043a39ec95a4 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.4"; + version = "4.13.5"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "087lv2laf4wx28z9zqg9s275nzygica0hc1g8vn5ql6yb7mrb7m0"; + sha256 = "1qi5zxby5qwdv0485gia2jz38dly4ncn10zi3grcckwxc3d5ms59"; }; } // (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 6531323c1d57..e9b9fb54bfc8 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.52"; + version = "4.9.53"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12h4w6x0zcl8kpia2y7myv7w7i0dihw4g8v638fs8bzk3d7h7pgz"; + sha256 = "095k7kpzic0c2vhwnfm5vcp9j60lyf4qyx2pj9vkp68bpcrmm49j"; }; } // (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 d0d5466ff0ff..d141d7f4211c 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.4"; + version = "4.13.5"; revision = "a"; - sha256 = "0l6xg06w0qicb64h8f6ldic947kn9a68wnad8pjwm89vy8vy4zqm"; + sha256 = "139qa6iyyjwn81v6z66ry1sifdvkbnql45m740djc0gv37il7mzv"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index cd0c283edbb2..75fbacfb90ef 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -63,8 +63,8 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.7.1"; - sha256 = "0m8qhbdd8n40lbd91s30q4lrw8g169sha0410c8rwk2d5qfaxv9n"; + version = "0.7.2"; + sha256 = "10rq0npjlp09xjdgn9lc3wm310dqc71j0wgxwj92ncf9r61zf445"; }; splUnstable = common { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 2cd3381933b5..dfcb3896244a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -139,9 +139,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.1"; + version = "0.7.2"; - sha256 = "0czal6lpl8igrhwmqh5jcgx07rlcgnrfg6ywzf681vsyh3gaxj9n"; + sha256 = "1dl6i4sg7z0k4p1dmfcm9arx62x30lqsr9hycvhhs3pf58ks8z2v"; extraPatches = [ (fetchpatch { |