Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf20713a633a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e7e61f33411
Choose a head ref
  • 3 commits
  • 9 files changed
  • 2 contributors

Commits on Mar 4, 2019

  1. llvmPackages_8: rc2 -> rc3

    dtzWill committed Mar 4, 2019
    Copy the full SHA
    145f213 View commit details

Commits on Mar 12, 2019

  1. llvmPackages_8: rc3 -> rc5

    dtzWill committed Mar 12, 2019
    Copy the full SHA
    91b1806 View commit details

Commits on Mar 14, 2019

  1. Merge pull request #57543 from dtzWill/update/llvm8-rc5

    llvmPackages_8: rc2 -> rc5
    dtzWill authored Mar 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3e7e61f View commit details
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/8/clang/default.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ let
name = "clang-${version}";

unpackPhase = ''
unpackFile ${fetch "cfe" "0z5si83w0i3l445c7624204mxsv82naps96icnv7v20s6njbsbsi"}
unpackFile ${fetch "cfe" "07k6vcxnf9n8x21mala3rfvf450iqy24wcsqw4yc8b8lp1fwii6p"}
mv cfe-${version}* clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/8/compiler-rt.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "compiler-rt-${version}";
inherit version;
src = fetch "compiler-rt" "1rxa1rcn7r3yfn9cj0sx5gd90kslbd13q080rdyqb6jr9a9i1avb";
src = fetch "compiler-rt" "16la7ksxwfs6wk3y7w8hh3c1svp095m7j4qfrdgv65lnfwp6rwf9";

nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/8/default.nix
Original file line number Diff line number Diff line change
@@ -6,14 +6,14 @@

let
release_version = "8.0.0";
version = release_version + "rc2"; # differentiating these is important for rc's
version = release_version + "rc5"; # differentiating these is important for rc's

fetch = name: sha256: fetchurl {
url = "https://prereleases.llvm.org/${release_version}/rc2/${name}-${version}.src.tar.xz";
url = "https://prereleases.llvm.org/${release_version}/rc5/${name}-${version}.src.tar.xz";
inherit sha256;
};

clang-tools-extra_src = fetch "clang-tools-extra" "1ypzbk7lf9dzkqh4p37dlr1bggjdrixr5gwb71jk9gh98grr2m5g";
clang-tools-extra_src = fetch "clang-tools-extra" "0705xl8ysjc9pdrggyc51zjq3kwcrckhz4cf4z8wbgi7x2li1djd";

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

src = fetch "libcxx" "1c8idvlqm4ik62q0llsndk9449yrgkj8hv5lz411hnbqjs09q9qq";
src = fetch "libcxx" "1hdhr4nnynwf1m1581sjl8pdh3gdxsz1rdzdryig7ll9v2lp0rkc";

postUnpack = ''
unpackFile ${libcxxabi.src}
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/8/libc++abi.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libc++abi-${version}";

src = fetch "libcxxabi" "0hdg7xw8vazw85i675qld7i6wqx502srny84cp0w6wi6pk44xiqr";
src = fetch "libcxxabi" "1s65sb5vv5l532fmcwvxd3apxm1jjc64yb5qn30f0zzdx9g3rx69";

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

src = fetch "lld" "14nganpwr5y111zhwws95p6ikp8kfiybfdr2yfz5cmhb3zkcgk4h";
src = fetch "lld" "1w0f3s5rzv90yiv4k9wdvkpc89k3g9crbwf1sh8xbi5jsjnz4539";

nativeBuildInputs = [ cmake ];
buildInputs = [ llvm libxml2 ];
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/8/lldb.nix
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
stdenv.mkDerivation {
name = "lldb-${version}";

src = fetch "lldb" "0r364w49m0l0808wm06g777qd14gwxnz0z267dbnwqkw6zc361lc";
src = fetch "lldb" "1i3hy37qmwqblxpac88ing7mg3jyp2hh08rfv3xhlxj9wddz7nyd";

postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place
4 changes: 2 additions & 2 deletions pkgs/development/compilers/llvm/8/llvm.nix
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@
let
inherit (stdenv.lib) optional optionals optionalString;

src = fetch "llvm" "1h9zqgf968si0nzdmsa9rz634zrmz6mprvz2ifw6ky0h7va5rcvq";
polly_src = fetch "polly" "1wwnn0cxnrmiqb6kg577myz6kb8sm18jwc020lf0b1k5as7aw2kq";
src = fetch "llvm" "1hb5if7vmgkb52dpj9lyvn986mnk2jbpryng2r1rc5vy25wxw759";
polly_src = fetch "polly" "07l3y20j8124x24yqiq0qmz9rhkfh3c48q6vnpgldj2scr3vgyb2";

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

src = fetch "openmp" "1xxxclzizcrfh0k870n4n3hh0khw14sv5i7s2kbdwl099k8b96cv";
src = fetch "openmp" "1nad9ihnaa4xpr77lp9y6zzqqi90d5p280zwv260z9mifkl4dlhm";

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