Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: edfef94249f1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 21574b22b3bd
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 29, 2019

  1. python.pkgs.wrapPython: get rid of warning 

    When `makeWrapperArgs` variable is not set, `declare -p makeWrapperArgs`
will return with 1 and print an error message to stderr.

I did not handle the non-existence case in b063340
because I thought `mk-python-derivation` will always define `makeWrapperArgs`
but `wrapProgram` can be called independently. And even with `mk-python-derivation`,
`makeWrappers` will not be set unless explicitly declared in the derivation
because of NixOS/nix#1461.

I was lead to believe that because the builds were succeeding and I confirmed
that the mechanism fails when the variable is not defined and `-o nounset` is enabled.
It appears that `wrapPython` setup hook is not running under `-o nounset`, though,
invaldating the assumption.

Now we are checking that the variable exists before checking its type, which
will get rid of the warning and also prevent future error when `-o nounset`
is enabled in the setup hook.

For more information, see the discussion at
a6bb2ed
    @jtojnar
    jtojnar committed Dec 29, 2019
    Copy the full SHA
    21574b2 View commit details
    Browse the repository at this point in the history