diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2018-08-09 18:31:26 +0000 |
|---|---|---|
| committer | Benjamin Hipple <bhipple@protonmail.com> | 2018-08-09 14:51:28 -0400 |
| commit | 32b11f423d0be647f16a8c0fda5fd254698223eb (patch) | |
| tree | c4d8d3204eeeef6759e609c1a17a0bb1717157f7 | |
| parent | pcre: fetch from HTTPS instead of FTP (#44828) (diff) | |
| download | nixpkgs-32b11f423d0be647f16a8c0fda5fd254698223eb.tar.gz | |
waf: 2.0.6 -> 2.0.10
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
| -rw-r--r-- | pkgs/development/tools/build-managers/waf/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index e86d61cf6c9a..5c6283b00a15 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, python2 }: +{ stdenv, fetchFromGitLab, python, ensureNewerSourcesForZipFilesHook }: stdenv.mkDerivation rec { name = "waf-${version}"; - version = "2.0.6"; + version = "2.0.10"; - src = fetchurl { - url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q"; + src = fetchFromGitLab { + owner = "ita1024"; + repo = "waf"; + rev = name; + sha256 = "12p5myq72r5qg7wp2gwbnyvh6lzzcrwp9h3dw194x38g52m0prc7"; }; - buildInputs = [ python2 ]; + buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; configurePhase = '' python waf-light configure @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Meta build system"; - homepage = "https://waf.io/"; + homepage = https://waf.io; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fca205f120d8..657e1edae7a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5937,7 +5937,7 @@ with pkgs; 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 { }; |