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

Staging next #105584

Merged
merged 500 commits into from Dec 6, 2020
Merged

Staging next #105584

merged 500 commits into from Dec 6, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Dec 1, 2020

Motivation for this change

https://hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents

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.

@FRidh
Copy link
Member Author

FRidh commented Dec 4, 2020

libjpeg_turbo fails to build on darwin due to cmake bump.
#105854
#105886

FRidh and others added 2 commits December 4, 2020 19:02
There is a regression with 3.19.1 which, for so far we've noticed, only
affects this package and on Darwin. To avoid a mass-rebuild right now,
we patch cmake only for darwin and this package.

Fixes #105854
@roberth
Copy link
Member

roberth commented Dec 4, 2020

Nix stable build failure. Seems like an instance of NixOS/nix#3605 or specifically NixOS/nix#4270. Restarted because Eelco suggests it's random in 3605. Copied test log below.

UPDATE: still random. It succeeded on second try.

    + nix-env -i foo-2.0pre1
    replacing old 'foo-1.0'
    installing 'foo-2.0pre1'
    these derivations will be built:
      /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/43pdb5q9xdpjv4jy0iyb7fxzl66jd2nf-foo-2.0pre1.drv
    building '/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/43pdb5q9xdpjv4jy0iyb7fxzl66jd2nf-foo-2.0pre1.drv'...
    error: unexpected EOF reading a line
    + nix-env --set-flag active false foo
    setting flag on 'foo-1.0'
    error: unexpected EOF reading a line
    + kill -9 87734
installcheck flags: -j1 -l1 SHELL=/nix/store/pmmh1dl7kmxi2xpagknl9qqa4wr7vv9c-bash-4.4-p23/bin/bash profiledir=\$\(out\)/etc/profile.d installcheck
  GEN    tests/common.sh
  CXX    tests/plugins/plugintest.o
  LD     tests/plugins/libplugintest.dylib
running test tests/init.sh... [PASS]
running test tests/hash.sh... [PASS]
running test tests/lang.sh... [PASS]
running test tests/add.sh... [PASS]
running test tests/simple.sh... [PASS]
running test tests/dependencies.sh... [PASS]
running test tests/gc.sh... [PASS]
running test tests/gc-concurrent.sh... [PASS]
running test tests/gc-auto.sh... [PASS]
running test tests/referrers.sh... [PASS]
running test tests/user-envs.sh... [FAIL]
    + '[' -z '' ']'
    + clearStore
    + echo 'clearing store...'
    clearing store...
    + chmod -R +w /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store
    + mkdir /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix
    + mkdir /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix
    + nix-store --init
    + clearProfiles
    + profiles=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles
    + clearProfiles
    + profiles=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles
    ++ nix-env -p /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles/test -q '*'
    ++ wc -l
    + test 0 -eq 0
    + mkdir -p /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/test-home
    + nix-env --switch-profile /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles/test
    ++ nix-env -f ./user-envs.nix -qa '*'
    ++ wc -l
    + test 6 -eq 6
    ++ nix-env -f ./user-envs.nix -qa --out-path --no-name '*'
    ++ grep foo-1.0
    + outPath10=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0
    ++ nix-env -f ./user-envs.nix -qa --drv-path --no-name '*'
    ++ grep foo-1.0
    + drvPath10=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/p44wnk8y4kng9mgwgr3alka88pd0pr3f-foo-1.0.drv
    + '[' -n /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0 -a -n /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/p44wnk8y4kng9mgwgr3alka88pd0pr3f-foo-1.0.drv ']'
    + nix-env -f ./user-envs.nix -qa '*' --description
    + grep -q silly
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/test-home/.nix-defexpr
    ++ pwd
    + ln -s /private/tmp/nix-build-nix-2.3.9.drv-0/nix-2.3.9/tests/user-envs.nix /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/test-home/.nix-defexpr
    + nix-env -qa '*' --description
    + grep -q silly
    + nix-env -qa '*' --system
    + grep -q x86_64-darwin
    + nix-env -i foo-1.0
    installing 'foo-1.0'
    these derivations will be built:
      /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/p44wnk8y4kng9mgwgr3alka88pd0pr3f-foo-1.0.drv
    building '/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/p44wnk8y4kng9mgwgr3alka88pd0pr3f-foo-1.0.drv'...
    building '/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/zjwzfzdchrbsxppy5070c3cya1cgjkn9-user-environment.drv'...
    created 1 symlinks in user environment
    ++ nix-env -q '*'
    ++ wc -l
    + test 1 -eq 1
    + nix-env -q '*'
    + grep -q foo-1.0
    ++ /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles/test/bin/foo
    + test foo-1.0 = foo-1.0
    + nix-env -qc '*'
    + grep -q '< 2.0'
    + nix-env -qac '*'
    + grep -q '> 1.0'
    ++ nix-env -qab
    ++ wc -l
    + '[' 1 -eq 1 ']'
    + nix-env -qas
    + grep -q 'IP-  foo-1.0'
    + nix-env -qas
    + grep -q -- '---  bar-0.1'
    + nix-env --set-flag active false foo
    setting flag on 'foo-1.0'
    building '/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/acdm0pmiw8rarm3rp1biwzdr9bp00zd8-user-environment.drv'...
    created 0 symlinks in user environment
    + '[' -e /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles/test/bin/foo ']'
    + nix-env --set-flag active true foo
    setting flag on 'foo-1.0'
    building '/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/2pzcl708c779iqcmz462r8jgrm2vjvcs-user-environment.drv'...
    created 1 symlinks in user environment
    + '[' -e /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles/test/bin/foo ']'
    ++ nix-env -q --out-path --no-name '*'
    ++ grep foo-1.0
    + outPath10_=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0
    + echo 'foo-1.0 = /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0'
    foo-1.0 = /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0
    + '[' /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0 = /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0 ']'
    + nix-env -i foo-2.0pre1
    replacing old 'foo-1.0'
    installing 'foo-2.0pre1'
    these derivations will be built:
      /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/43pdb5q9xdpjv4jy0iyb7fxzl66jd2nf-foo-2.0pre1.drv
    building '/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/43pdb5q9xdpjv4jy0iyb7fxzl66jd2nf-foo-2.0pre1.drv'...
    error: unexpected EOF reading a line
running test tests/logging.sh... [PASS]
running test tests/nix-build.sh... [PASS]
running test tests/misc.sh... [PASS]
running test tests/fixed.sh... [PASS]
running test tests/gc-runtime.sh... [PASS]
running test tests/check-refs.sh... [PASS]
running test tests/filter-source.sh... [PASS]
running test tests/remote-store.sh... [FAIL]
    + clearStore
    + echo 'clearing store...'
    clearing store...
    + chmod -R +w /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store
    + mkdir /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix
    + mkdir /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix
    + nix-store --init
    + clearProfiles
    + profiles=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles
    + startDaemon
    + rm -f /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/daemon-socket/socket
    + (( i = 0 ))
    + (( i < 30 ))
    + '[' -e /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/daemon-socket/socket ']'
    + sleep 1
    + nix-daemon
    + (( i++ ))
    + (( i < 30 ))
    + '[' -e /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/daemon-socket/socket ']'
    + break
    + pidDaemon=87734
    + trap 'kill -9 87734' EXIT
    + export NIX_REMOTE=daemon
    + NIX_REMOTE=daemon
    + storeCleared=1
    + /nix/store/pmmh1dl7kmxi2xpagknl9qqa4wr7vv9c-bash-4.4-p23/bin/bash ./user-envs.sh
    + '[' -z 1 ']'
    + clearProfiles
    + profiles=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles
    ++ nix-env -p /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles/test -q '*'
    ++ wc -l
    + test 0 -eq 0
    + mkdir -p /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/test-home
    + nix-env --switch-profile /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles/test
    ++ nix-env -f ./user-envs.nix -qa '*'
    ++ wc -l
    + test 6 -eq 6
    ++ nix-env -f ./user-envs.nix -qa --out-path --no-name '*'
    ++ grep foo-1.0
    + outPath10=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0
    ++ nix-env -f ./user-envs.nix -qa --drv-path --no-name '*'
    ++ grep foo-1.0
    + drvPath10=/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/p44wnk8y4kng9mgwgr3alka88pd0pr3f-foo-1.0.drv
    + '[' -n /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/5fmr06m0bfh5jlsg8k56nwqsb3w6nnap-foo-1.0 -a -n /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/p44wnk8y4kng9mgwgr3alka88pd0pr3f-foo-1.0.drv ']'
    + nix-env -f ./user-envs.nix -qa '*' --description
    + grep -q silly
    + rm -rf /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/test-home/.nix-defexpr
    ++ pwd
    + ln -s /private/tmp/nix-build-nix-2.3.9.drv-0/nix-2.3.9/tests/user-envs.nix /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/test-home/.nix-defexpr
    + nix-env -qa '*' --description
    + grep -q silly
    + nix-env -qa '*' --system
    + grep -q x86_64-darwin
    + nix-env -i foo-1.0
    installing 'foo-1.0'
    these derivations will be built:
      /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/p44wnk8y4kng9mgwgr3alka88pd0pr3f-foo-1.0.drv
    building '/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/p44wnk8y4kng9mgwgr3alka88pd0pr3f-foo-1.0.drv'...
    building '/private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/store/zjwzfzdchrbsxppy5070c3cya1cgjkn9-user-environment.drv'...
    created 1 symlinks in user environment
    ++ nix-env -q '*'
    ++ wc -l
    + test 1 -eq 1
    + nix-env -q '*'
    + grep -q foo-1.0
    ++ /private/tmp/nix-build-nix-2.3.9.drv-0/nix-test/var/nix/profiles/test/bin/foo
    + test foo-1.0 = foo-1.0
    + nix-env -qc '*'
    + grep -q '< 2.0'
    + nix-env -qac '*'
    + grep -q '> 1.0'
    ++ nix-env -qab
    ++ wc -l
    + '[' 1 -eq 1 ']'
    + nix-env -qas
    + grep -q 'IP-  foo-1.0'
    + nix-env -qas
    + grep -q -- '---  bar-0.1'
    + nix-env --set-flag active false foo
    setting flag on 'foo-1.0'
    error: unexpected EOF reading a line
    + kill -9 87734
running test tests/export.sh... [PASS]
running test tests/export-graph.sh... [PASS]
running test tests/timeout.sh... [PASS]
running test tests/secure-drv-outputs.sh... [PASS]
running test tests/nix-channel.sh... [PASS]
running test tests/multiple-outputs.sh... [PASS]
running test tests/import-derivation.sh... [PASS]
running test tests/fetchurl.sh... [PASS]
running test tests/optimise-store.sh... [PASS]
running test tests/binary-cache.sh... [PASS]
running test tests/nix-profile.sh... [PASS]
running test tests/repair.sh... [PASS]
running test tests/dump-db.sh... [PASS]
running test tests/case-hack.sh... [PASS]
running test tests/check-reqs.sh... [PASS]
running test tests/pass-as-file.sh... [PASS]
running test tests/tarball.sh... [PASS]
running test tests/restricted.sh... [PASS]
running test tests/placeholders.sh... [PASS]
running test tests/nix-shell.sh... [PASS]
running test tests/linux-sandbox.sh... [PASS]
running test tests/build-dry.sh... [PASS]
running test tests/build-remote.sh... [PASS]
running test tests/nar-access.sh... [PASS]
running test tests/structured-attrs.sh... [PASS]
running test tests/fetchGit.sh... [SKIP]
running test tests/fetchMercurial.sh... [SKIP]
running test tests/signing.sh... [PASS]
running test tests/run.sh... [PASS]
running test tests/brotli.sh... [PASS]
running test tests/pure-eval.sh... [PASS]
running test tests/check.sh... [PASS]
running test tests/plugins.sh... [PASS]
running test tests/search.sh... [PASS]
running test tests/nix-copy-ssh.sh... [PASS]
running test tests/post-hook.sh... [PASS]
running test tests/function-trace.sh... [PASS]
2 out of 56 tests failed 
make: *** [mk/tests.mk:12: installcheck] Error 1
builder for '/nix/store/znws2gp96l79viwg7yb374jhmyjkjkz8-nix-2.3.9.drv' failed with exit code 2

@doronbehar
Copy link
Contributor

Pushed an update to pdfarranger that was part of now unneeded #105977 .

@FRidh FRidh merged commit b6e98f1 into master Dec 6, 2020
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

8 participants