public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv-darwin: bump to use LLVM 4.0 & new bootstrap tools

Browse Source
This commit is contained in:
Dan Peebles 2017-03-18 16:48:27 -04:00
parent 57e25171a5
commit b9e558597d
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/4/default.nix
View File

@ -1,6 +1,6 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: { newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
let let
callPackage = newScope (self // { inherit stdenv isl release_version version fetch; }); callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
release_version = "4.0.0"; release_version = "4.0.0";
version = release_version; # differentiating these is important for rc's version = release_version; # differentiating these is important for rc's

18
pkgs/stdenv/darwin/default.nix
View File

@ -4,15 +4,15 @@
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
, bootstrapFiles ? let , bootstrapFiles ? let
fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> { fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/33f59c9d11b8d5014dfd18cc11a425f6393c884a/${file}"; url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c4effbe806be9a0a3727fdbbc9a5e28149347532/${file}";
inherit (localSystem) system; inherit (localSystem) system;
inherit sha256 executable; inherit sha256 executable;
}; in { }; in {
sh = fetch { file = "sh"; sha256 = "1rx4kg6358xdj05z0m139a0zn4f4zfmq4n4vimlmnwyfiyn4x7wk"; }; sh = fetch { file = "sh"; sha256 = "1b9r3dksj907bpxp589yhc4217cas73vni8sng4r57f04ydjcinr"; };
bzip2 = fetch { file = "bzip2"; sha256 = "104qnhzk79vkbp2yi0kci6lszgfppvrwk3rgxhry842ly1xz2r7l"; }; bzip2 = fetch { file = "bzip2"; sha256 = "1wm28jgap4cbr8hf4ambg6h9flr2b4mcbh7fw20i0l51v6n8igky"; };
mkdir = fetch { file = "mkdir"; sha256 = "0d91c19xjzmqisncvldv79d7ddzai9l7vcmajhwlwwv74g6da5yl"; }; mkdir = fetch { file = "mkdir"; sha256 = "0jc32mzx2whhx2xh70grvvgz4jj26118p9yxmhjqcysagc0k7y66"; };
cpio = fetch { file = "cpio"; sha256 = "0lw057bmcqls96j0gv1n3mgl66q31mba7i413cbkkaf0rfzz3dxj"; }; cpio = fetch { file = "cpio"; sha256 = "0x5dcczkzn0g8yb4pah449jmgy3nmpzrqy4s480grcx05b6v6hkp"; };
tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "13ihbj002pis3fgy1d9c4fi7flca21z9brjsjkklm82h5b4nlwxl"; executable = false; }; tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0ifdc8bwxdhmpbhx2vd3lwjg71gqm6pi5mfm0fkcsbqavl8hd8hz"; executable = false; };
} }
}: }:
@ -301,7 +301,7 @@ in rec {
allowedRequisites = (with pkgs; [ allowedRequisites = (with pkgs; [
xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
bzip2.bin llvmPackages.llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
binutils-raw.dev binutils gettext binutils-raw.dev binutils gettext
@ -309,8 +309,10 @@ in rec {
dyld Libsystem CF cctools libiconv locale dyld Libsystem CF cctools libiconv locale
]); ]);
overrides = self: super: persistent4 prevStage self super // { overrides = self: super:
let persistent = persistent4 prevStage self super; in persistent // {
clang = cc; clang = cc;
llvmPackages = persistent.llvmPackages // { clang = cc; };
inherit cc; inherit cc;
}; };
}; };

18
pkgs/top-level/all-packages.nix
View File

@ -5421,7 +5421,7 @@ with pkgs;
llvm_34 = llvmPackages_34.llvm; llvm_34 = llvmPackages_34.llvm;
llvmPackages = recurseIntoAttrs llvmPackages = recurseIntoAttrs
(if stdenv.isDarwin then llvmPackages_37 else llvmPackages_39); (if stdenv.isDarwin then llvmPackages_4 else llvmPackages_39);
llvmPackagesSelf = llvmPackages_34.override { llvmPackagesSelf = llvmPackages_34.override {
stdenv = libcxxStdenv; stdenv = libcxxStdenv;
@ -5435,13 +5435,9 @@ with pkgs;
isl = isl_0_14; isl = isl_0_14;
}; };
llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
} // stdenv.lib.optionalAttrs stdenv.isDarwin { };
cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; };
libxml2 = libxml2.override { pythonSupport = false; };
python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
});
llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 { llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 {
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
@ -5451,9 +5447,13 @@ with pkgs;
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
}; };
llvmPackages_4 = callPackage ../development/compilers/llvm/4 { llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
}; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; };
libxml2 = libxml2.override { pythonSupport = false; };
python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
});
manticore = callPackage ../development/compilers/manticore { }; manticore = callPackage ../development/compilers/manticore { };