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

waf: 2.0.6 -> 2.0.10

Browse Source 
This commit also swaps the build tool to use python3 internally (which waf fully
supports and prefers) and swaps the src to be downloaded from gitlab. The waf.io
site only keeps source tarballs of the latest version, so once a new waf comes
out we can no longer reproduce older versions.

We need the ensureNewerSources hook to avoid this error, in both `python2` and `python3`:

    ValueError: ZIP does not support timestamps before 1980
This commit is contained in:
Benjamin Hipple 2018-08-09 18:31:26 +00:00
parent 03709a06a9
commit 32b11f423d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/build-managers/waf/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchurl, python2 }: { stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "waf-${version}"; name = "waf-${version}";
version = "2.0.6"; version = "2.0.10";
src = fetchurl { src = fetchFromGitLab {
url = "https://waf.io/waf-${version}.tar.bz2"; owner = "ita1024";
sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q"; repo = "waf";
rev = name;
sha256 = "12p5myq72r5qg7wp2gwbnyvh6lzzcrwp9h3dw194x38g52m0prc7";
}; };
buildInputs = [ python2 ]; buildInputs = [ python ensureNewerSourcesForZipFilesHook ];
configurePhase = '' configurePhase = ''
python waf-light configure python waf-light configure
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Meta build system"; description = "Meta build system";
homepage = "https://waf.io/"; homepage = https://waf.io;
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ vrthra ]; maintainers = with maintainers; [ vrthra ];

2
pkgs/top-level/all-packages.nix
View File

@ -5937,7 +5937,7 @@ with pkgs;
volumeicon = callPackage ../tools/audio/volumeicon { }; volumeicon = callPackage ../tools/audio/volumeicon { };
waf = callPackage ../development/tools/build-managers/waf { }; waf = callPackage ../development/tools/build-managers/waf { python = python3; };
wakelan = callPackage ../tools/networking/wakelan { }; wakelan = callPackage ../tools/networking/wakelan { };