diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-22 13:20:37 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-22 13:20:37 +0200 |
| commit | 48110c12956cdccc9aab638a489d2c96511fc41a (patch) | |
| tree | 74e47861fc508c9f3ec7012c3fe5268572d5f6f2 /pkgs/os-specific | |
| parent | 93a277ca60c024453982a0393f227e35f1374faf (diff) | |
| parent | db0da282c374e0cf7ec9309cbb36bf7b5b5d8e54 (diff) | |
| download | nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.gz nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.bz2 nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.lz nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.xz nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.tar.zst nixlib-48110c12956cdccc9aab638a489d2c96511fc41a.zip | |
Merge staging into master
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/xcode/default.nix | 4 | ||||
| -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 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 46f6f03b90a7..d153ef16c14e 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -40,9 +40,11 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); -in { +in rec { xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; + xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; + xcode = xcode_9_4; } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d469867ecb49..4f0308d14922 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.50"; + version = "4.14.51"; # 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 = "1b529qp5cixvp47h8jhincnc40n7l27qawkgjf6l5p157c0qsfkh"; + sha256 = "0awpvyigj28j8ibjm5362xnlcaiqcn7lwd9wkf7k8i14m8ml1cns"; }; } // (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 120639814da1..61eb394f6ee0 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.16"; + version = "4.16.17"; # 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 = "0wcinqf5m1zzj747k86yxvm3acpa50vbzbjhd4hikl1jfidss31h"; + sha256 = "1302pjxrwpdvmnpisgsgv41brj52y3ppkwi0cyd4c1q8mc5qsgf9"; }; } // (args.argsOverride or {})) |