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 #86442

Merged
merged 107 commits into from May 6, 2020
Merged

Staging next #86442

merged 107 commits into from May 6, 2020

Conversation

@FRidh
Copy link
Member

FRidh commented May 1, 2020

Motivation for this change
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.
veprbl and others added 30 commits Apr 20, 2020
…ginal
In the distribution they are located in a separate directory from the
others and the standard installation doesn't process them.
I've since convinced upstream to not use such vars for the build
platform during cross. Finally!
- I've removed the stack of patch linked to
https://sourceware.org/bugzilla/show_bug.cgi?id=23428 . The associated
issue says it is closed and targeted for 2.32.

- I've ugraded the "no_plugin" patch. The logic changed in
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=41f37a6fb71f2a3de388108f5cdfca9cbe6e9d51
and I tried to keep the same logic by disabling everything.

It closes #78197
Bumping binutils to 2.32 broke coreutils for unknown reasons[1]. Upon
further investigation we found that there was some issue with mknod
inside a chroot[2][3], which setting ac_cv_func_lchmod to "no" _somehow_
fixes.

We apply this fix and hope to never have to debug this again.

Thanks to @flokli and @LnL7 who helped me chase after this and @pbogdan
who found the fix in the fedora build.

[1]: #85951
[2]: #85951 (comment)
[3]: https://bugzilla.redhat.com/show_bug.cgi?id=1811038
libcbor: Fix pkgconfig being placed correctly
opencv4: 4.1.2 -> 4.3.0
binutils: 2.31.1 -> 2.34
FRidh added 2 commits May 2, 2020
Reverting because of merge conflict. Rebase the fix and submit again.

This reverts commit 3853c27.
@FRidh
Copy link
Member Author

FRidh commented May 2, 2020

Made two reverts of master changes to avoid merge conflicts.

misuzu and others added 2 commits May 2, 2020
@flokli
Copy link
Contributor

flokli commented May 4, 2020

Is this ready to be merged?

@vcunat
Copy link
Member

vcunat commented May 4, 2020

Hydra shows that 37k jobs are remaining, so I'd say it's too early.

FRidh and others added 2 commits May 5, 2020
/cc #85879
@lblasc
Copy link
Contributor

lblasc commented May 6, 2020

@vcunat gst_all_1.gst-plugins-bad is already fixed is staging

@vcunat
Copy link
Member

vcunat commented May 6, 2020

Oh, I looked bad (missed the PR somehow; probably ignored merged ones). I'll take care of conflict resolution.

@vcunat vcunat merged commit 54eb2d1 into master May 6, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1906fc5"; rev="1906fc5bd10a7bbab35136325fa3251a043361b2"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1906fc5"; rev="1906fc5bd10a7bbab35136325fa3251a043361b2"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1906fc5"; rev="1906fc5bd10a7bbab35136325fa3251a043361b2"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1906fc5"; rev="1906fc5bd10a7bbab35136325fa3251a043361b2"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1906fc5"; rev="1906fc5bd10a7bbab35136325fa3251a043361b2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1906fc5"; rev="1906fc5bd10a7bbab35136325fa3251a043361b2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="1906fc5"; rev="1906fc5bd10a7bbab35136325fa3251a043361b2"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@vcunat

This comment has been minimized.

Copy link
Member

vcunat commented on 38b084f May 11, 2020

Oh, I was working around meson overriding the compiler by using meson.override { stdenv = correctStdenv;}, and this commit broke that workaround by adding another compiler in front. (I can't immediately see how to better approach it on nixpkgs side, though.)

@vcunat

This comment has been minimized.

Copy link
Member

vcunat commented on 6fc9fd5 Jun 10, 2020

SND_SOC_SOF_HDA_COMMON_HDMI_CODEC disappeared in 5.7 already. I didn't investigate why and conditionally removed it in bbe7161.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.