Navigation Menu

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

Jump to bottom

Staging next #97146

Merged
merged 205 commits into from Sep 7, 2020
Merged

Staging next #97146

merged 205 commits into from Sep 7, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Sep 4, 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.

B4dM4n and others added 30 commits July 2, 2020 18:36
@B4dM4n
libusb1: drop unneeded workaround
4158201
@freezeboy
kbounce: init at 20.04.3
a9a6437
@freezeboy
kigo: init at 20.04.3
231a2b7
@freezeboy
kwave: init at 20.04.3
7e0095d
@freezeboy
kmag: init at 20.04.3
9185505
@freezeboy
katomic: init at 20.04.3
3083545
@freezeboy
kmines: init at 20.04.3
3be794a
@freezeboy
kalzium: init at 20.04.3
ef27975
@freezeboy
klettres: init at 20.04.3
5476251
@freezeboy
klines: init at 20.04.3
18d5a17
@freezeboy
knetwalk: init at 20.04.3
4919f3c
@freezeboy
kturtle: init at 20.04.3
71830f4
@freezeboy
kapman: init at 20.04.3
48c5f49
@freezeboy
kblocks: init at 20.04.3
214647d
@freezeboy
killbots: init at 20.04.3
05ec46b
@freezeboy
kreversi: init at 20.04.3
d166d7b
@freezeboy
kdiamond: init at 20.04.3
4331654
@freezeboy
kblackbox: init at 20.04.3
5344891
@freezeboy
knavalbattle: init at 20.04.3
62772e6
@freezeboy
knights: init at 20.04.3
7e69895
@freezeboy
kollision: init at 20.04.3
2a5afc5
@freezeboy
ktimer: init at 20.04.3
f33b526
@freezeboy
kshisen: init at 20.04.3
cd235e3
@freezeboy
kteatime: init at 20.04.3
c561811
@kampka
texinfo. 6.5 -> 6.7
fb223f6
@kampka
texinfo: patch cross-build in non-interactive build mode
765d3e1
@freezeboy
kdeApplications reorder to avoid too much conflicts
8962e59
@xaverdh
kmod: add patch to correct behaviour with --field
40d3388 
This came up in #96008.
Without this patch modinfo always prints the module name for builtin
modules, even if an explicit --field is passed.
@antifuchs
gcc: Fix building libgccjit on darwin, using strip -x
038e86f 
The default `strip` invocation tries to strip global symbols from the
library, and refuses because those are indirect symbol table
references.
@antifuchs
emacs: Use stdenv.libc instead of .glibc
0d15ea9 
The latter doesn't exist on Darwin (and, presumably, other targets as
well). This change allows emacsGcc from emacs-overlay to attempt to
build where previously, the derivation would error out.
@FRidh
Copy link
Member Author

FRidh commented Sep 5, 2020

Right, I forgot that as well when I created a new eval.

@jtojnar
Copy link
Contributor

jtojnar commented Sep 5, 2020

Sorry, did not notice this PR. Yeah, I cancelled the builds and triggered a new eval (mentioned on #nixos-dev) and did not realize that new eval will not restart the cancelled builds.

@vcunat
Copy link
Member

vcunat commented Sep 5, 2020 •
edited

For reference, there's a handy "restart aborted" button which won't restart builds that have been attempted and failed.

@FRidh
Copy link
Member Author

FRidh commented Sep 5, 2020 •
edited

Darwin-stdenv does not build #95910 (comment) because of texinfo change. Proposed revert #97218.

@vcunat
nixos/tests/installer swraid: increase partition size
6eea644 
We apparently didn't fit anymore.  I don't think this test is meant
to (also) check closure size.

Note: as of this commit, the test is blocked by a fontconfig problem,
so I tested with that merge temporarily reverted.
@worldofpeace worldofpeace mentioned this pull request Sep 5, 2020
Closed
jtojnar and others added 2 commits September 6, 2020 02:56
@jtojnar
Revert "nixos/fontconfig: fix 50-user.conf handling"
f0cb5c6 
This reverts commit 8425726.

This should have been reverted in #95358
but I forgot about it.
@vcunat
texinfo: revert to version 6.5 on Darwin
b23940e 
It's basically a partial revert of PR #95910.
I chose a temporar-ish solution, maximizing likelihood of fixing
this while minimizing rebuilds.  (20.09 process is being blocked)
@pbogdan
Copy link
Member

pbogdan commented Sep 6, 2020 •
edited

I can't seem to be able to find it on Hydra but FWIW building stdenv shows that cmake-boot is also broken on Darwin.

I ran a bisect which pointed to #93560 but I don't really understand the changes (or know anything about Darwin) to know how to fix it (other than reverting those changes completely).

EDIT: oops, page didn't refresh so I didn't see vcunat's comment.
EDIT: I fixed texinfo by adding gettext on Darwin which seems to have the libintl stuff on that platform.

@FRidh
Copy link
Member Author

FRidh commented Sep 6, 2020 •
edited

I ran a bisect which pointed to #93560 but I don't really understand the changes (or know anything about Darwin) to know how to fix it (other than reverting those changes completely).

If reverting that change makes darwin build again, then that's good enough at this point. Please confirm you're able to build cmake(-boot) with that change reverted on darwin.

@pbogdan
Copy link
Member

pbogdan commented Sep 6, 2020

Yes, I reverted the change locally and cmake-boot now succeeds. I'm trying to build a full stdenv but it will take hours on my hardware (currently chewing through the stage3-stdenv stuff).

@pbogdan
Copy link
Member

pbogdan commented Sep 6, 2020

Can confirm Darwin stdenv builds with #93560 reverted, haven't built non-bootstrap cmake yet.

@pbogdan
Copy link
Member

pbogdan commented Sep 6, 2020

haven't built non-bootstrap cmake yet

It builds as well with the revert.

@FRidh
Copy link
Member Author

FRidh commented Sep 6, 2020

Thanks for testing. Ugly work-around reverting the PR for Darwin #97296.

@FRidh
utils.bash: revert #93560 for darwin, unblocks channels
08eb704 
Temporary fix. We definitely do not want to have two separate
implementations.
@pbogdan
Copy link
Member

pbogdan commented Sep 6, 2020 •
edited

@FRidh It looks like we may need to apply your to change to cc-wrapper as well at least (there is a fortran wrapper too I think but not sure how important that is), currently cmake-boot still won't build.
EDIT: patching cc-wrapper is sufficient to make cmake-boot build (didn't bother with any other wrappers).

@vcunat
Copy link
Member

vcunat commented Sep 7, 2020 •
edited

Haskell boostrap on aarch64 is broken. I can't see any relevant change (since master where it works), and I can reproduce the segfault on the shared box. EDIT: I opened #97407

Still, I don't think we should block merge to master because of this, in our situation.

vcunat
vcunat approved these changes Sep 7, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment •
edited

Choose a reason for hiding this comment

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

After a few thousand rebuilt darwin packages, I believe we're good enough to merge... at least in our dire situation.

@vcunat vcunat merged commit c1c85b9 into master Sep 7, 2020
20.09 Blockers automation moved this from To Do to Done Sep 7, 2020
@vcunat
Copy link
Member

vcunat commented Sep 7, 2020

The tested job succeeded on Hydra 🎉 Thanks to everyone who's helped; this staging iteration wasn't easy at all.

@vcunat vcunat mentioned this pull request Sep 7, 2020
Closed
@rvolosatovs rvolosatovs mentioned this pull request Sep 9, 2020
Closed
@worldofpeace worldofpeace added this to In progress in 20.09 Blockers via automation Oct 5, 2020
@worldofpeace worldofpeace removed this from Done in 20.09 Blockers Oct 5, 2020
@worldofpeace worldofpeace moved this from In progress to Done in 20.09 Blockers Oct 5, 2020
@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/marketing-team-can-we-present-nix-nixos-better/6249/106

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

@vcunat vcunat vcunat approved these changes

@adisbladis adisbladis Awaiting requested review from adisbladis adisbladis is a code owner

@jonringer jonringer Awaiting requested review from jonringer

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

Assignees
No one assigned
Labels
6.topic: emacs 6.topic: nixos 6.topic: python 6.topic: qt/kde 6.topic: vim 8.has: clean-up 8.has: documentation 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
No open projects
20.09 Blockers
  
Done
Milestone
20.09
Development

Successfully merging this pull request may close these issues.

None yet