diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-20 03:22:24 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-20 03:22:24 +0100 |
| commit | ca8903c3c2b96bef02f04168e4322b81d0a02e2f (patch) | |
| tree | e84e3d1413ba482767e4f4833cecc849099042fa | |
| parent | 986f446674271385baaf28313555c8686a60ab7b (diff) | |
| download | nixlib-ca8903c3c2b96bef02f04168e4322b81d0a02e2f.tar nixlib-ca8903c3c2b96bef02f04168e4322b81d0a02e2f.tar.gz nixlib-ca8903c3c2b96bef02f04168e4322b81d0a02e2f.tar.bz2 nixlib-ca8903c3c2b96bef02f04168e4322b81d0a02e2f.tar.lz nixlib-ca8903c3c2b96bef02f04168e4322b81d0a02e2f.tar.xz nixlib-ca8903c3c2b96bef02f04168e4322b81d0a02e2f.tar.zst nixlib-ca8903c3c2b96bef02f04168e4322b81d0a02e2f.zip | |
include-what-you-use: use unversioned llvm attribute
...in the expression itself, while hard-coding the officially supported version in all-packages.nix for sanity's sake (mine).
| -rw-r--r-- | pkgs/development/tools/analysis/include-what-you-use/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 4ad8b3f8380b..75e4dba003bb 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,9 +1,8 @@ -{ stdenv, fetchurl, cmake, llvmPackages_37 }: +{ stdenv, fetchurl, cmake, llvmPackages }: -let - version = "0.5"; - llvmPackages = llvmPackages_37; -in stdenv.mkDerivation rec { +# Also bump llvmPackages in all-packages.nix to the supported version! +let version = "0.5"; in +stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 305ed0a4735b..9cd7dfafdc0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5746,7 +5746,9 @@ let inherit (perlPackages) XMLSimple; }; - include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { }; + include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { + llvmPackages = llvmPackages_37; + }; indent = callPackage ../development/tools/misc/indent { }; |