diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-08-04 15:17:42 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-08-04 15:17:42 +0300 |
| commit | 008fd5fcf5f45c6478ccd3d52ec923052eccb932 (patch) | |
| tree | 14d454f88bd0f02fe550ba5b68d987573e8820fc /pkgs/os-specific | |
| parent | 7a337cde318020a0f91702bfefee85a7b31be06f (diff) | |
| parent | 20f1388c3fb7c1c56367fd96fd21cfd316f465b7 (diff) | |
| download | nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.gz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.bz2 nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.lz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.xz nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.tar.zst nixlib-008fd5fcf5f45c6478ccd3d52ec923052eccb932.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.17.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 c5a53555d20f..d8040fbf3bf3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.59"; + version = "4.14.60"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16ribg80jk830wyk4k7v86jysmnkj59v62rlkqil3advc7337iky"; + sha256 = "15djfcl4m388vm3wkfa6yx0sglyp8zh04s7m7xa1ybmsiwjl7qbc"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 71984ec5c779..6004577fad68 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.11"; + version = "4.17.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "133jyd75a0gq71m783s3ydjkpnzw5xxn4wrk1zal6fr19znq87nv"; + sha256 = "18xmkj1bmfrmvx6p8cl5l7pyv0zk5y3mxhyfnlzqwkxnvkjf5660"; }; } // (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 d89d0151d9b9..231e24be9116 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.116"; + version = "4.9.117"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07gzjfv24jrn76aga7c8f1y5xsz5if6xbdli1cpfzg60ps8q57lr"; + sha256 = "1c3r0a4fchg358zff2ww8kw789kah3bhr750p9qlsy65d8rflcl2"; }; } // (args.argsOverride or {})) |