public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Tuomas Tynkkynen
2018-02-13 16:42:55 +02:00
parent eb862c48dd 68052b5619
commit 1a06373c0a
208 changed files with 3533 additions and 3234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libclc/default.nix
+10 -5
View File
@@ -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