From f036df0321e729f4bc7351f15e9c330ff7c83af6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 1 Dec 2017 00:00:00 +0000 Subject: [PATCH] libclc: 2017-02-25 -> 2017-11-29 --- pkgs/development/libraries/libclc/default.nix | 15 ++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index c5ba65e7b6d..bd9130e3f50 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchFromGitHub, python2, llvm_4, clang }: +{ stdenv, fetchFromGitHub, python2, 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"; }; - buildInputs = [ python2 llvm_4 clang ]; + buildInputs = [ python2 llvm clang ]; postPatch = '' sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfb968c4f8b..e1f8cbc6e16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9329,7 +9329,9 @@ with pkgs; libchop = callPackage ../development/libraries/libchop { }; - libclc = callPackage ../development/libraries/libclc { }; + libclc = callPackage ../development/libraries/libclc { + llvmPackages = llvmPackages_5; + }; libcli = callPackage ../development/libraries/libcli { };