nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

llvm6: rc1, hashes, top-level

Browse Source
This commit is contained in:
Will Dietz 2018-01-31 08:09:43 -06:00
parent 4463de6ec7
commit 42c3a74a2a
9 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/6/clang/default.nix
View File

@ -9,7 +9,7 @@ let
name = "clang-${version}"; name = "clang-${version}";
unpackPhase = '' unpackPhase = ''
unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"} unpackFile ${fetch "cfe" "1mrj0ig9x5dxvglmkyw6i8yb9hvznywqn2g6lqaw7a5fhjjdq0x2"}
mv cfe-${version}* clang mv cfe-${version}* clang
sourceRoot=$PWD/clang sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src} unpackFile ${clang-tools-extra_src}

10
pkgs/development/compilers/llvm/6/default.nix
View File

@ -6,16 +6,16 @@
let let
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
release_version = "5.0.1"; release_version = "6.0.0";
version = release_version; # differentiating these is important for rc's version = "6.0.0rc1"; # differentiating these is important for rc's
fetch = name: sha256: fetchurl { fetch = name: sha256: fetchurl {
url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz"; url = "http://prereleases.llvm.org/${release_version}/rc1/${name}-${version}.src.tar.xz";
inherit sha256; inherit sha256;
}; };
compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf"; compiler-rt_src = fetch "compiler-rt" "08dwlax5sfmpzwfbzdwig9hbmrqzlq2332rb5yh0l5xrp0y5869z";
clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs"; clang-tools-extra_src = fetch "clang-tools-extra" "1rj4b6cqn05s2b3qiw7iadc8a1hrn4vs6g06nwxmqwpx3790dqyn";
# Add man output without introducing extra dependencies. # Add man output without introducing extra dependencies.
overrideManOutput = drv: overrideManOutput = drv:

2
pkgs/development/compilers/llvm/6/libc++/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libc++-${version}"; name = "libc++-${version}";
src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs"; src = fetch "libcxx" "0l026xx364a6zbx8sbd3280wbag0pkmj342v8zh1lg0661w52l8d";
postUnpack = '' postUnpack = ''
unpackFile ${libcxxabi.src} unpackFile ${libcxxabi.src}

2
pkgs/development/compilers/llvm/6/libc++abi.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libc++abi-${version}"; name = "libc++abi-${version}";
src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as"; src = fetch "libcxxabi" "0kmfmxm3iph9l1ndj2z7gj52n8bmy0rnnxzidfbliays2qzbwrsk";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;

2
pkgs/development/compilers/llvm/6/lld.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lld-${version}"; name = "lld-${version}";
src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym"; src = fetch "lld" "1yzq762bh375sskjgkcr0vqlhlii2br86z8wi2jbxmml0pj0xn99";
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ llvm ]; buildInputs = [ llvm ];

2
pkgs/development/compilers/llvm/6/lldb.nix
View File

@ -17,7 +17,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lldb-${version}"; name = "lldb-${version}";
src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp"; src = fetch "lldb" "1a0bmk0p4rclk0wvfg2ga4wkqp8lm6l3wx6g4g4dgiavd4bgsgl4";
postPatch = '' postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place # Fix up various paths that assume llvm and clang are installed in the same place

2
pkgs/development/compilers/llvm/6/llvm.nix
View File

@ -22,7 +22,7 @@
}: }:
let let
src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz"; src = fetch "llvm" "0dsik1l6jshd617fh4qs1373s6dfkq4gsjhyf6zq2qb6kyisy2vd";
# Used when creating a version-suffixed symlink of libLLVM.dylib # Used when creating a version-suffixed symlink of libLLVM.dylib
shortVersion = with stdenv.lib; shortVersion = with stdenv.lib;

2
pkgs/development/compilers/llvm/6/openmp.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "openmp-${version}"; name = "openmp-${version}";
src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd"; src = fetch "openmp" "0infci57hr89nxgs3v34z87kaqdw9pdkr6apyywkb8av032rhhpf";
nativeBuildInputs = [ cmake perl ]; nativeBuildInputs = [ cmake perl ];
buildInputs = [ llvm ]; buildInputs = [ llvm ];

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

@ -5780,6 +5780,7 @@ with pkgs;
}; };
}; };
clang_6 = llvmPackages_6.clang;
clang_5 = llvmPackages_5.clang; clang_5 = llvmPackages_5.clang;
clang_4 = llvmPackages_4.clang; clang_4 = llvmPackages_4.clang;
clang_39 = llvmPackages_39.clang; clang_39 = llvmPackages_39.clang;
@ -6465,13 +6466,16 @@ with pkgs;
lld = llvmPackages.lld; lld = llvmPackages.lld;
lld_4 = llvmPackages_4.lld; lld_4 = llvmPackages_4.lld;
lld_5 = llvmPackages_5.lld; lld_5 = llvmPackages_5.lld;
lld_6 = llvmPackages_6.lld;
lldb = llvmPackages.lldb; lldb = llvmPackages.lldb;
lldb_4 = llvmPackages_4.lldb; lldb_4 = llvmPackages_4.lldb;
lldb_5 = llvmPackages_5.lldb; lldb_5 = llvmPackages_5.lldb;
lldb_6 = llvmPackages_6.lldb;
llvm = llvmPackages.llvm; llvm = llvmPackages.llvm;
llvm_6 = llvmPackages_6.llvm;
llvm_5 = llvmPackages_5.llvm; llvm_5 = llvmPackages_5.llvm;
llvm_4 = llvmPackages_4.llvm; llvm_4 = llvmPackages_4.llvm;
llvm_39 = llvmPackages_39.llvm; llvm_39 = llvmPackages_39.llvm;
@ -6535,6 +6539,9 @@ with pkgs;
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
}); });
llvmPackages_6 = callPackage ../development/compilers/llvm/6 {
inherit (stdenvAdapters) overrideCC;
};
manticore = callPackage ../development/compilers/manticore { }; manticore = callPackage ../development/compilers/manticore { };
mentorToolchains = recurseIntoAttrs ( mentorToolchains = recurseIntoAttrs (