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

Reopen #263082 "make-derivation.nix: lib.warn if drv.__spliced missing" #283295

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

kjeremy
Copy link
Contributor

@kjeremy kjeremy commented Jan 23, 2024

Description of changes

Reopen @amjoseph-nixpkgs's #263082

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jan 23, 2024
Adam Joseph and others added 10 commits January 23, 2024 14:52
In order to avoid setting off the unspliced-dependency check, we
need to make sure that the targetPackages.stdenv.cc.bintools used by
gcc gets spliced.  In order for it to be spliced, it needs a
top-level entry in all-packages.nix.  Therefore, this commit adds one.

This also causes us to stop abusing targetPackages to access the
linker, which is a good thing.
This commit adds a `lib.warn` check to stdenv.mkDerivation, causing
it to emit a warning if a dependency which ought to be spliced in
fact is not.
Co-authored-by: Artturi <Artturin@artturin.com>
…s in buildInputs"

This reverts commit 0899b6b8746790eec9dc49ea4f4a6c3def072e3b.
@kjeremy kjeremy force-pushed the res/stdenv/warn-missing-splices branch from ec58a9e to f3b4dee Compare January 23, 2024 19:55
@kjeremy kjeremy force-pushed the res/stdenv/warn-missing-splices branch from 4e9b61c to 3559fb2 Compare January 23, 2024 21:58
# `pkgsBuildHost`.
#
# Please take a moment to try to fix your PR. If you
# can't get it fixed, ping @amjoseph-nixpkgs who can
Copy link
Member

Choose a reason for hiding this comment

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

This should be probably changed than:

Suggested change
# can't get it fixed, ping @amjoseph-nixpkgs who can
# can't get it fixed, ping @amjoseph-nixpkgs who can

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Mic92 it looks like the suggested change is what's currently there. The buttons to accept the change are greyed out.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@rrbutani rrbutani added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: stdenv Standard environment 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants