[wip] wafHook: don’t depend directly on python #69310

matthewbauer · 2019-09-23T17:48:46Z

Uses python as fallback when it is not in the environment.

Motivation for this change

Things done

Notify maintainers

cc @

veprbl · 2019-09-23T18:24:21Z

pkgs/development/tools/build-managers/wafHook/default.nix

@@ -1,9 +1,9 @@
-{ lib, stdenv, pkgs, python, makeSetupHook, waf }:
+{ lib, stdenv, pkgs, python3, makeSetupHook, waf }:


Should this go to the callPackage?

I too tend to agree with this approach - perhaps we should have 2 different wafHooks - one that's called with default python and the other with { python = python3 }.

FRidh · 2019-09-23T18:59:13Z

What is the motivation? What issue does it solve?

FRidh · 2019-09-23T19:00:05Z

motivation #69305 (comment)

teto · 2019-09-24T11:30:22Z

pkgs/development/tools/build-managers/wafHook/setup-hook.sh

@@ -10,6 +10,11 @@ wafConfigurePhase() {
        wafConfigureFlags="${prefixKey:---prefix=}$prefix $wafConfigureFlags"
    fi

+    if ! command -v python >/dev/null 2>&1; then
+	echo "Adding python to path"


NB: it would be cool to have a nix bash library for this kind of situation. I had added nix_debug / nix_info in pkgs/development/interpreters/lua-5/setup-hook.sh for instance (that act conditionnaly on NIX_DEBUG).

the indentation seems off.

Suggested change

echo "Adding python to path"

echo "Adding python to path"

veprbl · 2019-09-24T15:55:58Z

Why not move wafHook to pythonPackages as proposed in #69305?

FRidh · 2019-09-24T16:42:36Z

@veprbl python-packages.nix is for libraries, not for anything for which we happen to want to have a version per interpreter.

veprbl · 2019-09-24T19:11:36Z

@FRidh As far as I am concerned, waf is a library that allows you to create your own build system. Yes, you have to use their executable as an entry point and don't do explicit imports in most of the cases, but it still acts as a library.

teto · 2019-10-11T11:18:13Z

what's the status of this ? I would like to convince ns-3 folks to try nix (they have lots of problem with the different dependency interactions that could be solved with nix) and this is kinda blocking.

doronbehar · 2019-11-14T12:14:44Z

pkgs/development/tools/build-managers/wafHook/default.nix

  substitutions = {
    inherit waf;
+    python = python3;


Suggested change

python = python3;

inherit python;

doronbehar

I too would like this to be merged - seems impactfull on closure size etc.

jtojnar

I would argue for removing the fallback Python altogether. This kind of backwards incompatibility is trivial to fix and it will simplify the packaging.

teto · 2020-02-14T14:31:59Z

@FRidh As far as I am concerned, waf is a library that allows you to create your own build system. Yes, you have to use their executable as an entry point and don't do explicit imports in most of the cases, but it still acts as a library.

Either that or removing the python fallback which feels hackish.
Either way we need to choose before 20.03. it's a simple problem.

xbreak · 2020-02-22T13:00:34Z

@matthewbauer: Slightly off topic but since the change anyways require mass rebuild: Have you considered also making wafHook optionally dependent on waf itself as well? The recommendation from the author is for waf to be shipped with the project so I guess that's the case for most packages. If that's indeed the case in Nixpkgs the default wafHook could be provided without waf. This would then reduce the impact of future wafpackage updates.

veprbl · 2020-02-23T02:24:52Z

@xbreak There is no need to piggyback things just because there is a mass rebuild. If you think that you need a certain change and you can implement it yourself, then do it and just submit it as a separate PR.

teto · 2020-02-24T15:13:36Z

@xbreak has a point here, all waf project I know embed their own waf. If we don't consider waf as a library, making it optional from the hook forces the user to set a python version. It's a convolutad way of doing the equivalent of python3Packages.wafHook but less hackish than the current one.

FRidh · 2020-08-29T10:31:00Z

If that's indeed the case in Nixpkgs the default wafHook could be provided without waf. This would then reduce the impact of future wafpackage updates.

It is slightly different than how we work with hooks typically, but to me this seems like the best solution proposed thus far.

veprbl · 2020-08-29T17:05:35Z

If that's indeed the case in Nixpkgs the default wafHook could be provided without waf. This would then reduce the impact of future wafpackage updates.

I'm not sure I understand what is being proposed here. Do I understand correctly, that this will result in the following two options:

nativeBuildInputs = [ wafHook waf ]; for when we use waf from nixpkgs

nativeBuildInputs = [ wafHook python ];
wafPath = "./waf";

?

And then a more explicitly coupled way could look like:

nativeBuildInputs = [ wafHook ];
nativeBuildInputs = [ (wafHook.override { waf = "./waf"; }) ];

FRidh · 2020-08-29T17:56:04Z

@veprbl right that's how I see it.

eyJhb · 2020-10-28T14:36:38Z

Any status on this, ns-3 really needs an update and relies on this (being something) getting merged.

veprbl · 2020-10-28T14:55:28Z

@eyJhb Would you like to finish this?

eyJhb · 2020-10-28T14:59:59Z

If I had the competences to do so, I really would! :)

FRidh · 2020-12-17T07:06:42Z

Closing in favor of #106533.

wafHook: don’t depend directly on python

2adb73a

ofborg bot added 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 501-1000 labels Sep 23, 2019

veprbl reviewed Sep 23, 2019

View reviewed changes

teto reviewed Sep 24, 2019

View reviewed changes

teto approved these changes Sep 24, 2019

View reviewed changes

FRidh added this to Needs review in Staging Nov 12, 2019

FRidh self-assigned this Nov 14, 2019

doronbehar reviewed Nov 14, 2019

View reviewed changes

Staging automation moved this from Needs review to Ready Nov 14, 2019

doronbehar approved these changes Nov 14, 2019

View reviewed changes

doronbehar mentioned this pull request Nov 15, 2019

essentia: init at 2.1_beta5 #70389

Closed

10 tasks

veprbl moved this from Ready to WIP in Staging Dec 28, 2019

jtojnar requested changes Feb 14, 2020

View reviewed changes

This comment has been minimized.

Sign in to view

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 22, 2020

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Aug 29, 2020

ryantm marked this pull request as draft October 23, 2020 03:05

eyJhb mentioned this pull request Oct 28, 2020

ns-3: 3.30 -> 3.32 #101943

Merged

10 tasks

veprbl mentioned this pull request Nov 23, 2020

wafHook: use python3 #104701

Closed

10 tasks

ajs124 mentioned this pull request Nov 30, 2020

wafHook: use python3 #105406

Closed

10 tasks

dasJ mentioned this pull request Dec 10, 2020

[staging] wafHook: Don't wrap Python 2 #106533

Merged

10 tasks

FRidh closed this Dec 17, 2020

Staging automation moved this from WIP to Done Dec 17, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wip] wafHook: don’t depend directly on python #69310

[wip] wafHook: don’t depend directly on python #69310

matthewbauer commented Sep 23, 2019

veprbl Sep 23, 2019

doronbehar Nov 14, 2019

FRidh commented Sep 23, 2019

FRidh commented Sep 23, 2019

teto Sep 24, 2019

doronbehar Nov 14, 2019 •

edited

veprbl commented Sep 24, 2019

FRidh commented Sep 24, 2019

veprbl commented Sep 24, 2019

teto commented Oct 11, 2019

doronbehar Nov 14, 2019 •

edited

doronbehar left a comment

jtojnar left a comment

teto commented Feb 14, 2020

xbreak commented Feb 22, 2020

veprbl commented Feb 23, 2020 •

edited

teto commented Feb 24, 2020

This comment has been minimized.

FRidh commented Aug 29, 2020 •

edited

veprbl commented Aug 29, 2020

FRidh commented Aug 29, 2020

eyJhb commented Oct 28, 2020

veprbl commented Oct 28, 2020

eyJhb commented Oct 28, 2020

FRidh commented Dec 17, 2020

		@@ -1,9 +1,9 @@
		{ lib, stdenv, pkgs, python, makeSetupHook, waf }:
		{ lib, stdenv, pkgs, python3, makeSetupHook, waf }:

[wip] wafHook: don’t depend directly on python #69310

[wip] wafHook: don’t depend directly on python #69310

Conversation

matthewbauer commented Sep 23, 2019

Motivation for this change

Things done

Notify maintainers

veprbl Sep 23, 2019

Choose a reason for hiding this comment

doronbehar Nov 14, 2019

Choose a reason for hiding this comment

FRidh commented Sep 23, 2019

FRidh commented Sep 23, 2019

teto Sep 24, 2019

Choose a reason for hiding this comment

doronbehar Nov 14, 2019 • edited

Choose a reason for hiding this comment

veprbl commented Sep 24, 2019

FRidh commented Sep 24, 2019

veprbl commented Sep 24, 2019

teto commented Oct 11, 2019

doronbehar Nov 14, 2019 • edited

Choose a reason for hiding this comment

doronbehar left a comment

Choose a reason for hiding this comment

jtojnar left a comment

Choose a reason for hiding this comment

teto commented Feb 14, 2020

xbreak commented Feb 22, 2020

veprbl commented Feb 23, 2020 • edited

teto commented Feb 24, 2020

This comment has been minimized.

FRidh commented Aug 29, 2020 • edited

veprbl commented Aug 29, 2020

FRidh commented Aug 29, 2020

eyJhb commented Oct 28, 2020

veprbl commented Oct 28, 2020

eyJhb commented Oct 28, 2020

FRidh commented Dec 17, 2020

doronbehar Nov 14, 2019 •

edited

doronbehar Nov 14, 2019 •

edited

veprbl commented Feb 23, 2020 •

edited

FRidh commented Aug 29, 2020 •

edited