Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ef74cafd3e59
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c3da680b1146
Choose a head ref
  • 3 commits
  • 8 files changed
  • 1 contributor

Commits on May 8, 2018

  1. Merge branch 'release-18.03' into staging-18.03

    @vcunat
    vcunat committed May 8, 2018
    Copy the full SHA
    f981e95 View commit details

  2. Re-revert "Merge #39979: llvm5: 5.0.1 -> 5.0.2" 

    This reverts commit 08aea7c.
    @vcunat
    vcunat committed May 8, 2018
    Copy the full SHA
    7dde651 View commit details

Commits on May 12, 2018

  1. Merge branch 'staging-18.03' into release-18.03

    @vcunat
    vcunat committed May 12, 2018
    Copy the full SHA
    c3da680 View commit details
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/5/clang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ let
name = "clang-${version}";

unpackPhase = ''
unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"}
unpackFile ${fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"}
mv cfe-${version}* clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}
6 changes: 3 additions & 3 deletions pkgs/development/compilers/llvm/5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,16 +6,16 @@
let
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });

release_version = "5.0.1";
release_version = "5.0.2";
version = release_version; # differentiating these is important for rc's

fetch = name: sha256: fetchurl {
url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz";
inherit sha256;
};

compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf";
clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs";
compiler-rt_src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";

# Add man output without introducing extra dependencies.
overrideManOutput = drv:
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/5/libc++/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "libc++-${version}";

src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs";
src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";

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

src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as";
src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";

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

src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym";
src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6";

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

src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp";
src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq";

postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/5/llvm.nix
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
}:

let
src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz";
src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";

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

src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd";
src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir";

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