stdenv: move overriden stdenv in closure by cab404 · Pull Request #147544 · NixOS/nixpkgs

cab404 · 2021-11-26T22:28:31Z

Before that, base stdenv passed non-makeOverridable version of itself
inside. This caused it to be lost on package-name.stdenv.

Motivation for this change

Make package.stdenv.override work again.

Read commit message for more info.

Fixes #136756

Also I think it does not actually change stdenv in hash-breaking way, so it does not require world-rebuild.

Things done

Before that, base stdenv passed non-makeOverridable version of itself inside. This cause it to be lost on package-name.stdenv.

cab404 · 2021-11-26T23:13:23Z

oof, okay, that prompts a lot of buzz.
I just guessed that I've got deep enough in stdenv to be able to review related stuff, so I would like to be a codeowner of that section

r-burns · 2021-11-27T00:53:28Z

Haven't looked at this in depth, but thanks :)

Will this make #136804 unnecessary?

cab404 · 2021-11-27T08:40:22Z

Haven't looked at this in depth, but thanks :)

Will this make #136804 unnecessary?

My solution does not add back __bootPackages and __hatPackages, so your fix is still probably relevant.

rski · 2021-11-27T11:27:22Z

with this patch, env NIX_PATH=nixpkgs=$HOME/Code/nix/nixpkgs nix-build -E 'with import<nixpkgs> {}; enableDebugging pkgs.emacs' starts building for me.
The other derivation that I used to build before the breakage does not however,

env NIX_PATH=nixpkgs=$HOME/Code/nix/nixpkgs nix-build -E 'with import<nixpkgs> {}; enableDebugging(firefox.overrideAttrs (old: rec {  name = "myfirefox"; }))'
error: 'wrapper' at /home/rski/Code/nix/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix:23:5 called with unexpected argument 'stdenv'

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:79:63:

           78|       # Change the result of the function call by applying g to it
           79|       overrideResult = g: makeOverridable (copyArgs (args: g (f args))) origArgs;

I used to use this kind of thing to set separateDebugInfo and meta.outputsToInstall. This is with nix2.4 and nixpkgs@d4839a7e572f5ada860ad3b7f0d2d76ebb860ffb + this PR

rski · 2021-11-27T11:31:12Z

actually, with the above setup firefox fails, but emacs does not:

env NIX_PATH=nixpkgs=$HOME/Code/nix/nixpkgs nix-build --show-trace -E 'with import<nixpkgs> {}; enableDebugging pkgs.firefox'
error: 'wrapper' at /home/rski/Code/nix/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix:23:5 called with unexpected argument 'stdenv'

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:69:16:

           68|     let
           69|       result = f origArgs;
             |                ^
           70|

       … while evaluating 'makeOverridable'

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:67:24:

           66|   */
           67|   makeOverridable = f: origArgs:
             |                        ^
           68|     let

       … from call site

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:77:41:

           76|       # Re-call the function but with different arguments
           77|       overrideArgs = copyArgs (newArgs: makeOverridable f (overrideWith newArgs));
             |                                         ^
           78|       # Change the result of the function call by applying g to it

       … while evaluating anonymous lambda

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:77:32:

           76|       # Re-call the function but with different arguments
           77|       overrideArgs = copyArgs (newArgs: makeOverridable f (overrideWith newArgs));
             |                                ^
           78|       # Change the result of the function call by applying g to it

       … from call site

       at /home/rski/Code/nix/nixpkgs/pkgs/top-level/all-packages.nix:762:26:

          761|   # intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage'
          762|   enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; };
             |                          ^
          763|

       … while evaluating 'enableDebugging'

       at /home/rski/Code/nix/nixpkgs/pkgs/top-level/all-packages.nix:762:21:

          761|   # intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage'
          762|   enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; };
             |                     ^
          763|

       … from call site

       at «string»:1:26:

            1| with import<nixpkgs> {}; enableDebugging pkgs.firefox
            ```

cab404 · 2021-11-27T12:38:13Z

actually, with the above setup firefox fails, but emacs does not:

env NIX_PATH=nixpkgs=$HOME/Code/nix/nixpkgs nix-build --show-trace -E 'with import<nixpkgs> {}; enableDebugging pkgs.firefox'
error: 'wrapper' at /home/rski/Code/nix/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix:23:5 called with unexpected argument 'stdenv'

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:69:16:

           68|     let
           69|       result = f origArgs;
             |                ^
           70|

       … while evaluating 'makeOverridable'

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:67:24:

           66|   */
           67|   makeOverridable = f: origArgs:
             |                        ^
           68|     let

       … from call site

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:77:41:

           76|       # Re-call the function but with different arguments
           77|       overrideArgs = copyArgs (newArgs: makeOverridable f (overrideWith newArgs));
             |                                         ^
           78|       # Change the result of the function call by applying g to it

       … while evaluating anonymous lambda

       at /home/rski/Code/nix/nixpkgs/lib/customisation.nix:77:32:

           76|       # Re-call the function but with different arguments
           77|       overrideArgs = copyArgs (newArgs: makeOverridable f (overrideWith newArgs));
             |                                ^
           78|       # Change the result of the function call by applying g to it

       … from call site

       at /home/rski/Code/nix/nixpkgs/pkgs/top-level/all-packages.nix:762:26:

          761|   # intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage'
          762|   enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; };
             |                          ^
          763|

       … while evaluating 'enableDebugging'

       at /home/rski/Code/nix/nixpkgs/pkgs/top-level/all-packages.nix:762:21:

          761|   # intended to be used like nix-build -E 'with import <nixpkgs> {}; enableDebugging fooPackage'
          762|   enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; };
             |                     ^
          763|

       … from call site

       at «string»:1:26:

            1| with import<nixpkgs> {}; enableDebugging pkgs.firefox
            ```

That does get fixed by adding "..." to wrapper in firefox, alas I am not sure why it was broken in the first place.
(that also probably does not apply overridden stdenv somewhere, from that point it is fixable)

cab404 · 2021-11-27T13:43:55Z

@rski Fun fact is that enableDebugging was not working in firefox since at least fix-stdenv-override~85240. (enableDebugging hello) worked back then. So I guess that's on firefox side, and will require separate PR.

rski · 2021-11-27T14:53:05Z

hah ok, that's fine then, thanks for checking and thank you so much for trying to fix this

cab404 · 2021-11-29T13:38:06Z

@NixOS/nixos-release-managers please?

balsoft

The change looks correct; I'm not sure what the policy on updating codeowners is.

cab404 · 2021-11-30T14:09:23Z

@Ericson2314, can you please review the change?)

symphorien · 2021-12-10T20:29:08Z

This does not change hashes so it seems low risk for a stdenv change.

Artturin · 2021-12-10T22:52:29Z

Backport after testing it on unstable for a while?

symphorien · 2021-12-10T23:08:54Z

after a while, why not

ajs124 · 2022-01-11T12:13:49Z

has a while passed?

symphorien · 2022-01-11T20:59:06Z

Yes I think so, and no issue was linked here in the meantime.

github-actions · 2022-01-11T21:03:51Z

Successfully created backport PR #154652 for release-21.11.

stdenv: move overriden stdenv in closure

523c701

Before that, base stdenv passed non-makeOverridable version of itself inside. This cause it to be lost on package-name.stdenv.

cab404 requested review from Ericson2314 and matthewbauer as code owners November 26, 2021 22:28

github-actions bot added the 6.topic: stdenv Standard environment label Nov 26, 2021

cab404 mentioned this pull request Nov 26, 2021

enableDebugging does not work anymore: error: attribute 'override' missing #136756

Closed

ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 26, 2021

cab404 mentioned this pull request Nov 26, 2021

21.11 Feature Freeze #140168

Closed

CODEOWNERS: added cab404

706988f

cab404 requested a review from edolstra as a code owner November 26, 2021 23:06

github-actions bot added the 6.topic: policy discussion Discuss policies to work in and around Nixpkgs label Nov 26, 2021

balsoft approved these changes Nov 29, 2021

View reviewed changes

symphorien merged commit 4a8f997 into NixOS:master Dec 10, 2021

symphorien added the backport release-21.11 label Jan 11, 2022

github-actions bot mentioned this pull request Jan 11, 2022

[Backport release-21.11] stdenv: move overriden stdenv in closure #154652

Merged

1 task

Uh oh!

Conversation

cab404 commented Nov 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation for this change

Things done

Uh oh!

cab404 commented Nov 26, 2021

Uh oh!

r-burns commented Nov 27, 2021

Uh oh!

cab404 commented Nov 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rski commented Nov 27, 2021

Uh oh!

rski commented Nov 27, 2021

Uh oh!

cab404 commented Nov 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cab404 commented Nov 27, 2021

Uh oh!

rski commented Nov 27, 2021

Uh oh!

cab404 commented Nov 29, 2021

Uh oh!

balsoft left a comment

Choose a reason for hiding this comment

Uh oh!

cab404 commented Nov 30, 2021

Uh oh!

symphorien commented Dec 10, 2021

Uh oh!

Artturin commented Dec 10, 2021

Uh oh!

symphorien commented Dec 10, 2021

Uh oh!

ajs124 commented Jan 11, 2022

Uh oh!

symphorien commented Jan 11, 2022

Uh oh!

github-actions bot commented Jan 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

cab404 commented Nov 26, 2021 •

edited

Loading

cab404 commented Nov 27, 2021 •

edited

Loading

cab404 commented Nov 27, 2021 •

edited

Loading