Skip to content

Staging next (with gcc 10, binutils 2.34 and autoconf 2.70)#107783

Merged
FRidh merged 259 commits intomasterfrom
staging-next
Jan 3, 2021
Merged

Staging next (with gcc 10, binutils 2.34 and autoconf 2.70)#107783
FRidh merged 259 commits intomasterfrom
staging-next

Conversation

@FRidh
Copy link
Member

@FRidh FRidh commented Dec 28, 2020

Motivation for this change

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

Includes #89793.

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.

flokli and others added 4 commits January 1, 2021 23:11
gobject-introspection doesn't currently cross-compile (see
#88222), but polkit is somewhat
essential for many system components.

By disabling gobject-introspection when cross-compiling, we get it to
build.
libjack2 doesn't cross-compile, see
#96548.

The pulseaudio NixOS module uses pkgs.alsaPlugins to create its
asound.conf, so let's make sure that one can be built when
cross-compiling.
…ompiling

When cross-compiling, pulseaudio seems to not find some m4 macro
providing GSETTINGS_RULES.

However, apart from the obviously missing gsettings support, this works
just fine.
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 1, 2021
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 2, 2021
FRidh and others added 3 commits January 2, 2021 10:28
Several aarch64 builds fail with is referenced by DSO followed by
bin/ld: final link failed: bad value. This seems related to libgcc_s.so.

#108111
Fix NixOS cross-compilation SD Image
@alyssais
Copy link
Member

alyssais commented Jan 2, 2021 via email

@flokli
Copy link
Member

flokli commented Jan 2, 2021

@alyssais can you inline-quote? The link doesn't seem to work for me.

@vcunat
Copy link
Member

vcunat commented Jan 2, 2021

I can't see a problem in that commit, but perhaps if you're more specific...

@FRidh
Copy link
Member Author

FRidh commented Jan 2, 2021

@FRidh FRidh closed this Jan 2, 2021
@FRidh FRidh reopened this Jan 2, 2021
FRidh and others added 2 commits January 2, 2021 17:47
This was accidentally added in 136c0d0 when doing a search & replace.
@jonringer
Copy link
Contributor

jonringer commented Jan 2, 2021

getting this now when tyring to do a nixpkgs-review:

$ nix-env -f /home/jon/.cache/nixpkgs-review/pr-107783-6/nixpkgs -qaP --xml --out-path --show-trace
error: stack overflow (possible infinite recursion)
$ git worktree prune

seeing as nixpkgs-review is pretty crucial in most master targeting PRs, I don't think this should land in master until it's able to at least evaluate.

@alyssais
Copy link
Member

alyssais commented Jan 2, 2021

Oh yeah sorry for the pasting error with the link.

@FRidh FRidh merged commit f7267e9 into master Jan 3, 2021
@FRidh
Copy link
Member Author

FRidh commented Jan 3, 2021

getting this now when tyring to do a nixpkgs-review:

Forgot about that one when merging. Tracking in #108304

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

Labels

6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: xfce The Xfce Desktop Environment 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.