Merge pull request #44832 from bhipple/u/waf

waf: 2.0.6 -> 2.0.10
This commit is contained in:
Frederik Rietdijk 2018-08-10 08:31:09 +02:00 committed by GitHub
commit 7d09b2912b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions

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 ];

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 { };