From cfc4f6347f58f357dfd6b9dbb824cda934c15416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Dec 2020 10:23:19 +0100 Subject: [PATCH 1/8] wafHook: Don't wrap python2 --- nixos/doc/manual/release-notes/rl-2103.xml | 6 ++++++ pkgs/development/tools/build-managers/wafHook/default.nix | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 2b0144a69c2..2cc96ea86a5 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -287,6 +287,12 @@ This avoids that the password gets exposed in the nix store. + + + The wafHook hook does not wrap Python anymore. + Packages depending on wafHook need to include any Python into their nativeBuildInputs. + + diff --git a/pkgs/development/tools/build-managers/wafHook/default.nix b/pkgs/development/tools/build-managers/wafHook/default.nix index 4184bd5fe8c..2131caede3c 100644 --- a/pkgs/development/tools/build-managers/wafHook/default.nix +++ b/pkgs/development/tools/build-managers/wafHook/default.nix @@ -1,7 +1,6 @@ -{ lib, stdenv, pkgs, python, makeSetupHook, waf }: +{ lib, stdenv, pkgs, makeSetupHook, waf }: makeSetupHook { - deps = [ python ]; substitutions = { inherit waf; crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) From c71fd1848b22269bd8b38de6e84e8fc853311a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Dec 2020 10:37:06 +0100 Subject: [PATCH 2/8] simutrans: Fix hash --- pkgs/games/simutrans/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index b75b67e0528..5d33ae99149 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -52,7 +52,7 @@ let "pak128.german" = { url = "mirror://sourceforge/simutrans/PAK128.german/" + "pak128.german_1.2_for_ST_121.0/PAK128.german_1.2_for_ST_121-0.zip"; - sha256 = "1jxjckz4b02yv1mv1zc3pmajpq740dfnlvhr0x762lbrybymvagi"; + sha256 = "1cv1rzl1a3i5dvk476zq094wawk9hhdh2f0y4xrdny5gn17mb2xi"; }; /* This release contains accented filenames that prevent unzipping. From 125502298eac0e9c8fc46764c0ab1872bbc46e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Dec 2020 10:37:49 +0100 Subject: [PATCH 3/8] gaia: Add Python 2 for wafHook --- pkgs/development/libraries/gaia/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix index b154f80c1dd..46ed3626d2a 100644 --- a/pkgs/development/libraries/gaia/default.nix +++ b/pkgs/development/libraries/gaia/default.nix @@ -5,6 +5,7 @@ , swig , eigen , pkgconfig +, python2 , wafHook , makeWrapper , qt4 @@ -38,9 +39,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - wafHook pkgconfig + python2 # For wafHook swig + wafHook ] # The gaiafusion binary inside $out/bin needs a shebangs patch, and # wrapping with the appropriate $PYTHONPATH From a903f8f111186bfa8e1e468da7d8f0d110db8518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Dec 2020 10:56:02 +0100 Subject: [PATCH 4/8] mda_lv2: Add Python 3 for wafHook --- pkgs/applications/audio/mda-lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 2464abb6585..6e96bf45294 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }: +{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with stdenv.lib; { From 2d505c9051fc6d2cb16f0b70411f7bff51bfb3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Dec 2020 10:58:44 +0100 Subject: [PATCH 5/8] ams-lv2: Add Python 3 for wafHook --- pkgs/applications/audio/ams-lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 34f5667bfca..a978b67c5dc 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig -, wafHook }: +, wafHook, python3 }: stdenv.mkDerivation rec { pname = "ams-lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with stdenv.lib; { From c1baf6549f2e360cdf05075131833dc9666df9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Dec 2020 12:17:51 +0100 Subject: [PATCH 6/8] ntdb: Add Python 2 for wafHook --- pkgs/development/libraries/ntdb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index de0db887d4b..d0a9a2e5b49 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, python2 , python3 , pkg-config , readline @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 wafHook + python2 # For wafHook ]; buildInputs = [ From 0e7903738a3828be54b42ca63daf31bb4a85db5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 10 Dec 2020 14:09:03 +0100 Subject: [PATCH 7/8] saldl: Add Python3 for wafHook --- pkgs/tools/networking/saldl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index d51e5515bd6..9c2b4915bf1 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , pkgconfig , wafHook +, python3 , asciidoc , docbook_xml_dtd_45 , docbook_xsl @@ -25,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wafHook + python3 asciidoc docbook_xml_dtd_45 docbook_xsl From 279c5943fe4b664cea610d5703cc9c2cbd941f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 12 Dec 2020 19:23:45 +0100 Subject: [PATCH 8/8] talloc: Remove python from wafHook's inputs --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af3acb1dea8..998bccd751b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16203,9 +16203,7 @@ in taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; - talloc = callPackage ../development/libraries/talloc { - wafHook = wafHook.override { python = python3; }; - }; + talloc = callPackage ../development/libraries/talloc { }; tclap = callPackage ../development/libraries/tclap {};