Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixUnstable: pre20210503_6d2553a -> pre20210513_340f831 #122794

Merged
merged 1 commit into from May 15, 2021

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented May 13, 2021

Motivation for this change

critical bug in nixUnstable breaking many usages: NixOS/nix#4801

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92 Mic92 requested a review from cole-h May 13, 2021 04:55
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/derivation-does-not-have-wanted-outputs-dev-out/12905/6

@ofborg ofborg bot requested a review from edolstra May 13, 2021 05:03
@Mic92 Mic92 changed the title nixUnstable: fix output name tokenizatoin nixUnstable: fix output name tokenization May 13, 2021
@r-rmcgibbo
Copy link

r-rmcgibbo commented May 13, 2021

Result of nixpkgs-review pr 122794 at 6e1f9a5a run on x86_64-linux 1

7 packages built successfully:
  • hydra-unstable
  • nix-direnv
  • nix-update
  • nixExperimental
  • nixFlakes
  • nixUnstable
  • nixpkgs-review
5 suggestions:
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:67:17:

       |
    67 |                 ./aws-sdk-cpp-TransferManager-ContentEncoding.patch
       |                 ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:238:41:

        |
    238 |     patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ];
        |                                         ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:205:16:

        |
    205 |     patches = [(
        |                ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:242:41:

        |
    242 |     patches = (prev.patches or []) ++ [ ./enable-flakes.patch ];
        |                                         ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:230:7:

        |
    230 |       (fetchpatch {
        |       ^
    

Result of nixpkgs-review pr 122794 at 6e1f9a5a run on aarch64-linux 1

7 packages built successfully:
  • hydra-unstable
  • nix-direnv
  • nix-update
  • nixExperimental
  • nixFlakes
  • nixUnstable
  • nixpkgs-review
5 suggestions:
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:205:16:

        |
    205 |     patches = [(
        |                ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:238:41:

        |
    238 |     patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ];
        |                                         ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:230:7:

        |
    230 |       (fetchpatch {
        |       ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:67:17:

       |
    67 |                 ./aws-sdk-cpp-TransferManager-ContentEncoding.patch
       |                 ^
    
  • warning: missing-patch-comment

    Consider adding a comment explaining the purpose of this patch on the line preceeding.
    Near pkgs/tools/package-management/nix/default.nix:242:41:

        |
    242 |     patches = (prev.patches or []) ++ [ ./enable-flakes.patch ];
        |                                         ^
    

@vcunat
Copy link
Member

vcunat commented May 13, 2021

Generally it would make sense to me to first merge it in https://github.com/NixOS/nix (and then consider just switching commit to current master instead of patching)

@cole-h
Copy link
Member

cole-h commented May 13, 2021

NixOS/nix#4801 was merged, so now you can bump to the latest commit and drop the patch :)

@Mic92 Mic92 changed the title nixUnstable: fix output name tokenization nixUnstable: pre20210503_6d2553a -> pre20210513_340f831 May 13, 2021
@Mic92
Copy link
Member Author

Mic92 commented May 13, 2021

updated.

Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff LGTM.


Result of nixpkgs-review pr 122794 run on x86_64-linux 1

7 packages built:
  • hydra-unstable
  • nix-direnv
  • nix-review (nixpkgs-review)
  • nix-update
  • nixExperimental
  • nixFlakes
  • nixUnstable

@happysalada
Copy link
Contributor

Result of nixpkgs-review pr 122794 run on x86_64-darwin 1

6 packages failed to build:
  • nix-direnv
  • nix-update
  • nixExperimental
  • nixFlakes
  • nixUnstable
  • nixpkgs-review

@happysalada
Copy link
Contributor

I'm not sure this is supposed to build on darwin.
Here are the logs in case somebody is interested

ran test tests/nix-channel.sh... [FAIL]
    + clearProfiles
    + profiles=/private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/var/nix/
    + rm -rf /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/var/nix/pr
    + rm -f /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/test-home/.
    + nix-channel --add http://foo/bar xyzzy
    + nix-channel --list
    + grep -q http://foo/bar
    + nix-channel --remove xyzzy
    warning: selector 'xyzzy' matched no installed derivations
    building '/private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/ic3
    + '[' -e /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/test-home/
    ++ cat /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/test-home/.n
    + '[' '' = '' ']'
    + rm -rf /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/foo
    + mkdir -p /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/foo
    +++ nix-instantiate dependencies.nix
    warning: you did not specify '--add-root'; the result might be removed by the garbage collector
    ++ nix-store -r /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/sto
    these 4 derivations will be built:
      /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/y48v2202l57
      /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/xk7y0123hbb
      /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/xzmp60w4rsg
      /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/2d2kklm7hb6
    building '/private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/xzm
    building '/private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/y48
    building '/private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/xk7
    building '/private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/2d2
    FOO
    warning: you did not specify '--add-root'; the result might be removed by the garbage collector
    + nix copy --to 'file:///private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-cha
    + rm -rf /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/nixexprs
    + mkdir -p /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/nixexprs
    + cp config.nix dependencies.nix dependencies.builder0.sh /private/tmp/nix-build-nix-2.4pre20210513_34
    + ln -s dependencies.nix /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-ch
    + cd /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel
    + tar cvf - nixexprs
    + bzip2
    nixexprs/
    nixexprs/config.nix
    nixexprs/dependencies.builder0.sh
    nixexprs/dependencies.nix
    nixexprs/default.nix
    + nix-channel --add file:///private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-
    + nix-channel --update
    unpacking channels...
    + nix-env -qa '*' --meta --xml --out-path
    + grep -q 'meta.*description.*Random test package' /private/tmp/nix-build-nix-2.4pre20210513_340f831.d
    + grep -q 'item.*attrPath="foo".*name="dependencies-top"' /private/tmp/nix-build-nix-2.4pre20210513_34
    + nix-env -i dependencies-top
    installing 'dependencies-top'
    building '/private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/store/slz
    + '[' -e /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/test-home/
    + clearProfiles
    + profiles=/private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/var/nix/
    + rm -rf /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/var/nix/pr
    + rm -f /private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-channel/test-home/.
    + nix-channel --add file:///private/tmp/nix-build-nix-2.4pre20210513_340f831.drv-1/nix-test/tests/nix-
    + nix-channel --update
    error: value is the built-in function 'import' while a set was expected
    error: program '/nix/store/iz0yqm179zy24rp9pbpdb9ljwi4x4lww-nix-2.4pre20210513_340f831/bin/nix-build'
make: *** [mk/lib.mk:106: tests/nix-channel.sh.test] Error 1

@Mic92
Copy link
Member Author

Mic92 commented May 15, 2021

@happysalada I reverted to a patch again. Please test!

@happysalada
Copy link
Contributor

Result of nixpkgs-review pr 122794 run on x86_64-darwin 1

6 packages failed to build:
  • nix-direnv
  • nix-update
  • nixExperimental
  • nixFlakes
  • nixUnstable
  • nixpkgs-review

@happysalada
Copy link
Contributor

Here are the logs

[nix-shell:~/.cache/nixpkgs-review/pr-122794-1]$ nix log /nix/store/5n9ggfkippkbh54xdzvln86inms10pml-nix-2.4pre20210503_6d2553a.drv
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/6fr2lqjdk7lppcrjy4g54d7vad7j24yw-source
source root is source
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
applying patch /nix/store/k3fkwz8xadhdir51cqwnyb4xl4cb0znq-8c7e043de2f673bc355d83f1e873baa93f30be62.patch
patching file src/libstore/derived-path.cc
@nix { "action": "setPhase", "phase": "autoreconfPhase" }
autoreconfPhase
autoreconf: export WARNINGS=
autoreconf: Entering directory '.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force
autoreconf: configure.ac: tracing
autoreconf: configure.ac: not using Libtool
autoreconf: configure.ac: not using Intltool
autoreconf: configure.ac: not using Gtkdoc
...skipping...
    + grep -q 'item.*attrPath="foo".*name="dependencies-top"' /private/tmp/nix-build-nix-2.4pre20210503_6d
    + nix-env -i dependencies-top
    installing 'dependencies-top'
    building '/private/tmp/nix-build-nix-2.4pre20210503_6d2553a.drv-0/nix-test/tests/nix-channel/store/zip
    + '[' -e /private/tmp/nix-build-nix-2.4pre20210503_6d2553a.drv-0/nix-test/tests/nix-channel/test-home/
    + clearProfiles
    + profiles=/private/tmp/nix-build-nix-2.4pre20210503_6d2553a.drv-0/nix-test/tests/nix-channel/var/nix/
    + rm -rf /private/tmp/nix-build-nix-2.4pre20210503_6d2553a.drv-0/nix-test/tests/nix-channel/var/nix/pr
    + rm -f /private/tmp/nix-build-nix-2.4pre20210503_6d2553a.drv-0/nix-test/tests/nix-channel/test-home/.
    + nix-channel --add file:///private/tmp/nix-build-nix-2.4pre20210503_6d2553a.drv-0/nix-test/tests/nix-
    + nix-channel --update
    error: value is the built-in function 'import' while a set was expected
    error: program '/nix/store/g2g2cck16l57pb0r5kwlgacx8dfl7cpm-nix-2.4pre20210503_6d2553a/bin/nix-build'
make: *** [mk/lib.mk:106: tests/nix-channel.sh.test] Error 1

@vcunat
Copy link
Member

vcunat commented May 15, 2021

The current commit built on ofborg for darwin: https://github.com/NixOS/nixpkgs/pull/122794/checks?check_run_id=2589312786

@happysalada
Copy link
Contributor

If you think it's fine, feel free to merge it, I was just trying to help by testing.
I don't have any particular customization on my machine.

@vcunat
Copy link
Member

vcunat commented May 15, 2021

Oh, I assumed you were reporting on the previous version of this PR, but that doesn't seem like it (now that I look at the comments again). I certainly appreciate the testing; darwin seems to lack contributors the most around here (from the big platforms we build on Hydra.nixos.org).

@happysalada
Copy link
Contributor

As long as you feel it helps, I'm always available for testing core infrastructure.
I re-tested as asked by @Mic92 . Available for more testing if you need!

@domenkozar domenkozar merged commit f5f8f24 into NixOS:master May 15, 2021
@Mic92 Mic92 deleted the nix-hotfix branch May 15, 2021 15:13
@xaverdh
Copy link
Contributor

xaverdh commented May 15, 2021

nixUnstable from master fails to build locally for me, since this pr was merged. It complains about some test involving hash mismatches.. This is the build log: nix-buildlog.txt

@grahamc
Copy link
Member

grahamc commented May 15, 2021

I've seen that too, it seems to be an unstable test that periodically fails. Maybe someone can research this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants