diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-13 16:42:48 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-13 16:42:55 +0200 |
| commit | 1a06373c0a9572791df7cbec9773aa79c620e2a5 (patch) | |
| tree | 10a02dd501b12a43a4824eb7d20ef714514b9ce4 /pkgs/development/libraries/libclc | |
| parent | eb862c48ddc288243c5447e8decc623b10ef165c (diff) | |
| parent | 68052b56195715185efed7ccb91733cb4ae5d5f2 (diff) | |
| download | nixpkgs-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar nixpkgs-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.gz nixpkgs-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.bz2 nixpkgs-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.lz nixpkgs-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.xz nixpkgs-1a06373c0a9572791df7cbec9773aa79c620e2a5.tar.zst nixpkgs-1a06373c0a9572791df7cbec9773aa79c620e2a5.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/development/libraries/libclc/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/libclc')
| -rw-r--r-- | pkgs/development/libraries/libclc/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 7a278b4904f..a83a3c672c0 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchFromGitHub, python, llvm, clang }: +{ stdenv, fetchFromGitHub, python, llvmPackages }: + +let + llvm = llvmPackages.llvm; + clang = llvmPackages.clang; +in stdenv.mkDerivation { - name = "libclc-2017-02-25"; + name = "libclc-2017-11-29"; src = fetchFromGitHub { owner = "llvm-mirror"; repo = "libclc"; - rev = "17648cd846390e294feafef21c32c7106eac1e24"; - sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s"; + rev = "d6384415ab854c68777dd77451aa2bc0d959da99"; + sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh"; }; nativeBuildInputs = [ python ]; - buildInputs = [ llvm ]; + buildInputs = [ llvm clang ]; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py |