cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

waf: 2.0.18 -> 2.0.19

Browse source 
The patch for sorting files in `tar` is no longer needed, as it has been fixed
upstream: https://gitlab.com/ita1024/waf/-/merge_requests/2227
This commit is contained in:
Benjamin Hipple 2020-02-02 13:41:47 -05:00 committed by Frederik Rietdijk
parent e4c28f78e7
commit e73fa05f30
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/tools/build-managers/waf/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, fetchpatch, python, ensureNewerSourcesForZipFilesHook { stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook
# optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]`
, withTools ? null , withTools ? null
}: }:
@ -8,22 +8,15 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "waf"; pname = "waf";
version = "2.0.18"; version = "2.0.19";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ita1024"; owner = "ita1024";
repo = "waf"; repo = "waf";
rev = "${pname}-${version}"; rev = "${pname}-${version}";
sha256 = "1ifcanm2x2i8qwgfkwgdxwaqcdwsx5jg8bd1d6sqjps3pz7s5qxx"; sha256 = "1ydmx20blr776qnmnqp0whyiy81a3glln49m9fva2cmampmandpb";
}; };
patches = [
(fetchpatch {
url = "https://gitlab.com/grahamc/waf/commit/fc1c98f1fb575fb26b867a61cbca79aa894db2ea.patch";
sha256 = "0kzfrr6nh1ay8nyk0i69nhkkrq7hskn7yw1qyjxrda1y3wxj6jp8";
})
];
buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; buildInputs = [ python ensureNewerSourcesForZipFilesHook ];
configurePhase = '' configurePhase = ''