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

splice.nix: inherit from lib #341067

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

splice.nix: inherit from lib #341067

wants to merge 7 commits into from
+50 −34

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Sep 10, 2024 •
edited
Loading

This may improve performance

For stdenv inheriting from lib improved performance c3c31aa

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Artturin Artturin mentioned this pull request Sep 10, 2024
Closed
13 tasks
philiptaron
philiptaron reviewed Sep 10, 2024
View reviewed changes
pkgs/top-level/splice.nix Outdated Show resolved Hide resolved
pkgs/top-level/splice.nix Show resolved Hide resolved
@Artturin
Copy link
Member Author

Artturin commented Sep 10, 2024 •
edited
Loading

Eval failed and of course it's QT.... https://gist.github.com/GrahamcOfBorg/f132dfbaac921f6172f0728c8b4c13df

I'll just do try in (checked pkgs).pkgsCross.aarch64-multiplatform instead of always splicing.

@Artturin Artturin force-pushed the testperfofsplice branch 2 times, most recently from c1a5221 to 19ace80 Compare September 11, 2024 17:43
@Artturin
Copy link
Member Author

Artturin commented Sep 11, 2024 •
edited
Loading

Had to stop returning of cross/always splice because they've been killing ofborg lol

image

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 12, 2024
@Artturin
Copy link
Member Author

Artturin commented Sep 12, 2024 •
edited
Loading

@ofborg eval
Though the splicing path isn't exercised let's still see if there's a diff
Run 1
image

Run 2
image

@kjeremy
Copy link
Contributor

kjeremy commented Sep 17, 2024

Looks pretty neutral

@Artturin Artturin force-pushed the testperfofsplice branch 4 times, most recently from d5439f0 to 314090a Compare September 27, 2024 18:29
@kjeremy
Copy link
Contributor

kjeremy commented Oct 2, 2024 •
edited
Loading

I think the remaining errors are resolved

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024
@Artturin Artturin mentioned this pull request Dec 4, 2024
Draft
13 tasks
@Artturin Artturin force-pushed the testperfofsplice branch 5 times, most recently from 4b22806 to f1f6424 Compare December 4, 2024 23:41
@philiptaron
Copy link
Contributor

I am loving watching this progress through the thicket of eval errors!

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 5, 2024
@github-actions github-actions bot added the 6.topic: k3s Kubernates distribution (https://k3s.io/) label Dec 6, 2024
@Artturin Artturin force-pushed the testperfofsplice branch 3 times, most recently from 0c43302 to ee9c06b Compare December 8, 2024 19:28
@Artturin
Copy link
Member Author

Artturin commented Dec 8, 2024 •
edited
Loading

On dfd6a4a the eval succeeds, after rebasing to master the eval doesn't succeedd that eval also worked yesterday :/

EDIT: fd9961b#diff-5603ef0aa746fa9e312093cca93c03b310010f48e3dd381de5ff37c0945ea1adR6

@Artturin
Copy link
Member Author

Artturin commented Dec 9, 2024

ofborg-eval-lib-tests fail

https://gist.github.com/GrahamcOfBorg/a2b431acc304bc74cdb3723cb560980f

> /build/.attr-0l2nkwhif96f51f4amnlf414lhl4rv9vh8iffyp431v6s28gsr90: line 15: /nix/store/7pami0aqan88pykzki6rqswmm54kv9ir-nix-aarch64-unknown-linux-gnu-2.24.10/bin/nix-instantiate: cannot execute binary file: Exec format error

Fixed

@github-actions github-actions bot added 6.topic: lib The Nixpkgs function library 8.has: documentation This PR adds or changes documentation labels Dec 9, 2024
@Artturin Artturin force-pushed the testperfofsplice branch 2 times, most recently from 9bb397c to 898274f Compare December 10, 2024 17:58
@Artturin Artturin force-pushed the testperfofsplice branch 2 times, most recently from 929a4f3 to bd468ef Compare December 11, 2024 17:27
@philiptaron
Copy link
Contributor

https://gist.github.com/GrahamcOfBorg/458aadffab9d4c8d51dc191cff93c222

Seems to hit every branch on the way down!

@Artturin
Copy link
Member Author

That was fixed in #364542

@philiptaron
Copy link
Contributor

https://gist.githubusercontent.com/GrahamcOfBorg/6627bea2a8da597c22b94008d04f29e2/raw/9fc4b15b83ebdfe7e163ecb1de33b3f9144e18c5/ofborg-eval-nixpkgs-unstable-jobset

qemu failure this time about darwin.

@github-actions github-actions bot removed 6.topic: haskell 8.has: documentation This PR adds or changes documentation 6.topic: lib The Nixpkgs function library 6.topic: k3s Kubernates distribution (https://k3s.io/) labels Dec 15, 2024
@Artturin
Hopefully this fixes the error
fd40d60 
https://gist.github.com/GrahamcOfBorg/6627bea2a8da597c22b94008d04f29e2

>        error: Unsupported guest system aarch64-linux for host x86_64-darwin, supported: x86_64-linux
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philiptaron philiptaron philiptaron left review comments

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Artturin @kjeremy @philiptaron @wegank