Skip to content

Commit

Permalink
llvm7: update hashes, they did change after all.
Browse files Browse the repository at this point in the history
Pretty sure they did last time too :).
  • Loading branch information
dtzWill committed Sep 23, 2018
1 parent fca31e1 commit 0920652
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/clang/default.nix
Expand Up @@ -9,7 +9,7 @@ let
name = "clang-${version}";

unpackPhase = ''
unpackFile ${fetch "cfe" "18aapi26lp25g38j1kwmzviagy9l59ach5kzvf80x5dvs2rmhcpc"}
unpackFile ${fetch "cfe" "0mdsbgj3p7mayhzm8hclzl3i46r2lwa8fr1cz399f9km3iqi40jm"}
mv cfe-${version}* clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/compiler-rt.nix
Expand Up @@ -3,7 +3,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "compiler-rt-${version}";
inherit version;
src = fetch "compiler-rt" "0r4hg8hi60kdjl4arp3s51dbwbwz11s8qvccdkx9v52vc27p2241";
src = fetch "compiler-rt" "1mkhqvs8cxbfmprkzwyq7lmnzr1sv45znzf0arbgb19crzipzv5x";

nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/compilers/llvm/7/default.nix
Expand Up @@ -9,12 +9,11 @@ let
version = release_version; # differentiating these is important for rc's

fetch = name: sha256: fetchurl {
name = "${name}-${release_version}.src.tar.xz"; # Hopefully yields same hash with final release
url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
inherit sha256;
};

clang-tools-extra_src = fetch "clang-tools-extra" "0rhvlz4g2nd10zrwx37yi5if8wqirh8845pwbgg62r9l2pb6j7n7";
clang-tools-extra_src = fetch "clang-tools-extra" "1glxl7bnr4k3j16s8xy8r9cl0llyg524f50591g1ig23ij65lz4k";

tools = stdenv.lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/libc++/default.nix
Expand Up @@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "libc++-${version}";

src = fetch "libcxx" "1ylw8sdiy7b9siajm88frw95y8ii1kng3xbsqhn8nmhy0yxwd1p5";
src = fetch "libcxx" "1w1l472p03csgz76p70pn9yk7h0nw5hj1av44ysnakigp8jjcd4v";

postUnpack = ''
unpackFile ${libcxxabi.src}
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/libc++abi.nix
Expand Up @@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libc++abi-${version}";

src = fetch "libcxxabi" "1ry0v4sd91gg06kqkhqcnbwbd5v1yknbpm0gj39lq8y3d7lwn7np";
src = fetch "libcxxabi" "0pr4xfx61r5mwmvhg4j9pb6df6vvha1gyf6rwkm14x9rzxcwficv";

nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/lld.nix
Expand Up @@ -9,7 +9,7 @@
stdenv.mkDerivation {
name = "lld-${version}";

src = fetch "lld" "10p8yqikpsx1hvs524dj6fk7hg267bhs6860xngk33130s9s05id";
src = fetch "lld" "173z50vx5mlsaiqmbz7asxy2297z4xivrfxrdfncvx23wp2lgkzv";

nativeBuildInputs = [ cmake ];
buildInputs = [ llvm libxml2 ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/lldb.nix
Expand Up @@ -17,7 +17,7 @@
stdenv.mkDerivation {
name = "lldb-${version}";

src = fetch "lldb" "1s2jiaq85nzbab3nj4msfw3zxkdwinq71p1d7h70z26q3caddngp";
src = fetch "lldb" "0cmah36ybyfws0z2ikq9fqn5k4kvjci7vgk97ddx4xwrwkzdixkz";

postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/llvm.nix
Expand Up @@ -16,7 +16,7 @@
}:

let
src = fetch "llvm" "0r28srr8i0qcx8csblzg1g59wv4q8qc9c9msdm2xfsfggj2sknqa";
src = fetch "llvm" "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb";

# Used when creating a version-suffixed symlink of libLLVM.dylib
shortVersion = with stdenv.lib;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/7/openmp.nix
Expand Up @@ -9,7 +9,7 @@
stdenv.mkDerivation {
name = "openmp-${version}";

src = fetch "openmp" "198iljq5hhm5rxfzslzbi73sq80jlwfr24a3khdk32lghdj2skdw";
src = fetch "openmp" "1zrqlaxr954sp8lcr7g8m0z0pr8xyq4i6p11x6gcamjm5xijnrih";

nativeBuildInputs = [ cmake perl ];
buildInputs = [ llvm ];
Expand Down

0 comments on commit 0920652

Please sign in to comment.