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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-10-20 09:40:09 +02:00
parent 4c774f24ac ceb0ce849f
commit ca6ee8f519
168 changed files with 3431 additions and 2526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/awf/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "awf-${version}";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "valr";
repo = "awf";
rev = "v${version}";
sha256 = "18dqa2269cwr0hrn67vp0ifwbv8vc2xn6mg145pbnc038hicql8m";
sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
};
nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];

8
pkgs/development/tools/misc/cquery/default.nix
View File

@@ -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