diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-18 19:27:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 19:27:05 +0100 |
| commit | ad250c18f7b84b1dd08c471d7424f79cfaf5dea0 (patch) | |
| tree | 57a286b8f200be671f9b72ca8d24c2589ee6cf1e /pkgs | |
| parent | 84890ac196019aa78d8daba18738d03d1075b178 (diff) | |
| parent | fc69a394fa0b7c3358c8bb4d81a340693f15d39e (diff) | |
| download | nixlib-ad250c18f7b84b1dd08c471d7424f79cfaf5dea0.tar nixlib-ad250c18f7b84b1dd08c471d7424f79cfaf5dea0.tar.gz nixlib-ad250c18f7b84b1dd08c471d7424f79cfaf5dea0.tar.bz2 nixlib-ad250c18f7b84b1dd08c471d7424f79cfaf5dea0.tar.lz nixlib-ad250c18f7b84b1dd08c471d7424f79cfaf5dea0.tar.xz nixlib-ad250c18f7b84b1dd08c471d7424f79cfaf5dea0.tar.zst nixlib-ad250c18f7b84b1dd08c471d7424f79cfaf5dea0.zip | |
Merge pull request #48580 from dtzWill/update/cquery-llvm7
cquery: 2018-08-08 -> 2018-10-14 (llvm6 -> llvm7)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/cquery/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index d6c8f1f33eec..f032a85173a5 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -5,8 +5,8 @@ let src = fetchFromGitHub { owner = "cquery-project"; repo = "cquery"; - rev = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea"; - sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1"; + rev = "a95a6503d68a85baa25465ce147b7fc20f4a552e"; + sha256 = "0rxbdln7dqkdw4q8rhclssgwypq16g9flkwmaabsr8knckbszxrx"; fetchSubmodules = true; }; @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { name = "cquery-${version}"; - version = "2018-08-08"; + version = "2018-10-14"; inherit src; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postFixup = '' # We need to tell cquery where to find the standard library headers. - standard_library_includes="\\\"-isystem\\\", \\\"${if (stdenv.hostPlatform.libc == "glibc") then stdenv.cc.libc.dev else stdenv.cc.libc}/include\\\"" + standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\"" standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" export standard_library_includes diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0dd2c40cdc4..45026dc889ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8280,7 +8280,7 @@ with pkgs; cpplint = callPackage ../development/tools/analysis/cpplint { }; cquery = callPackage ../development/tools/misc/cquery { - llvmPackages = llvmPackages_6; + llvmPackages = llvmPackages_7; }; creduce = callPackage ../development/tools/misc/creduce { |