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.

Sign up for GitHub

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

release-lib: Cache cross nixpkgs evals too, and other fixes #49565

Merged
merged 6 commits into from Nov 1, 2018
Merged

release-lib: Cache cross nixpkgs evals too, and other fixes #49565

merged 6 commits into from Nov 1, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

This will help with release-cross.nix eval time. It also allowed me to
share code between the cross and native helpers.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@Ericson2314 Ericson2314 mentioned this pull request Nov 1, 2018
Merged
9 tasks
@Ericson2314
release-lib: Cache cross nixpkgs evals too
79c713b 
This will help with release-cross.nix eval time. It also allowed me to
share code between the cross and native helpers.
@Ericson2314
release-lib: Fallback on uncached rather than error for unknown cross…
24e2bc1 
…System

The `ensureUnaffected` the tests purposefully use an absurd crossSystem.
Also sheevaplug and pogoplug share the same config.
@Ericson2314
top-level: libcCrossChooser: More or fallback hack
984df7c 
This fixes some eval errors in release-cross.nix
@Ericson2314
linux bootstrap-tools: use stdenv.*Platform to avoid deprecation wa…
ffaffb3 
…rning
@Ericson2314
linux bootstrap tools: Use right system for some raw derivations
f2ed7c7 
This allows cross builds to work. Evidentallyy this has been done wrong
since I combined the bootstrap tool creation files in
ab651d2. Oops!
@Ericson2314 Ericson2314 changed the title release-lib: Cache cross nixpkgs evals too release-lib: Cache cross nixpkgs evals too, and other fixes Nov 1, 2018
@Ericson2314 Ericson2314 merged commit 3dfd66f into NixOS:master Nov 1, 2018
@Ericson2314 Ericson2314 deleted the release-lib-cleanup branch November 1, 2018 21:39
@peti
Copy link
Member

peti commented Nov 3, 2018

This PR breaks the https://hydra.nixos.org/jobset/nixpkgs/haskell-updates job. It's evaluation is driven by https://github.com/peti/ci/blob/master/haskell-nixpkgs.nix which has worked fine for years, but now I'm getting plenty of evaluation errors:

error: while evaluating 'setAttrByPath' at /home/simons/.nix-defexpr/lib/attrsets.nix:57:29, called from /home/simons/.nix-defexpr/lib/attrsets.nix:60:41:
while evaluating 'getAttrFromPath' at /home/simons/.nix-defexpr/lib/attrsets.nix:73:31, called from /home/simons/src/ci/haskell-nixpkgs.nix:28:72:
while evaluating 'attrByPath' at /home/simons/.nix-defexpr/lib/attrsets.nix:24:35, called from /home/simons/.nix-defexpr/lib/attrsets.nix:75:8:
value is a function while a set was expected, at /home/simons/.nix-defexpr/pkgs/top-level/release-lib.nix:12:6

@peti
Copy link
Member

peti commented Nov 3, 2018

I'm pretty sure the line

  inherit (pkgsForCross null) pkgsFor;

is wrong. That's probably supposed to be something along the lines of

pkgsFor = mkPkgsFor null;

peti added a commit to peti/ci that referenced this pull request Nov 3, 2018
@peti
haskell-nixpkgs.nix: work around broken pkgsFor function
6aebdd4 
NixOS/nixpkgs#49565 changed that function, probably
inadvertently.
@Ericson2314
Copy link
Member Author

Ericson2314 commented Nov 3, 2018 •
edited

Sorry I thought I tested everything with release.nix and release-cross.nix. what we actually want is:

pkgsFor = pkgsForCross null;

Which will allow for slightly better caching. I'll fix.

@peti
Copy link
Member

peti commented Nov 5, 2018

Will you commit a fix soon? If not, then I'd prefer to revoke those breaking changes for the time being.

@Ericson2314
Copy link
Member Author

@peti sorry my computer broke. Pushing in a moment.

@Ericson2314 Ericson2314 mentioned this pull request Nov 5, 2018
Merged
9 tasks
@Ericson2314
Copy link
Member Author

#49795 is the fix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ericson2314 @peti @kquick @GrahamcOfBorg