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

stdenv: fix missing dependencies in __sandboxProfile and __impureHostDeps #291456

Merged
merged 1 commit into from
Apr 21, 2024
Merged

stdenv: fix missing dependencies in __sandboxProfile and __impureHostDeps #291456

merged 1 commit into from
Apr 21, 2024

Conversation

corngood
Copy link
Contributor

@corngood corngood commented Feb 26, 2024 •
edited
Loading

Fixes: 7f3ca3e (stdenv: Fix handling of dependencies and hooks)
Fixes: #237458

Description of changes

These seem to have been broken ages ago.

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 Feb 26, 2024
@corngood corngood changed the base branch from master to staging February 26, 2024 00:34
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild label Feb 26, 2024
@ofborg ofborg bot requested a review from hrdinka February 26, 2024 00:58
@ofborg ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Feb 26, 2024
@corngood
Copy link
Contributor Author

FYI @reckenrode because you added some of these workarounds.

philiptaron
philiptaron approved these changes Feb 27, 2024
View reviewed changes
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

I built glib (as a random heavily-depended-on package), musescore, qtpass, qtkeychain, and all their dependencies on x86_64-linux with this change.

Thanks for reducing one super irritating edge in Nixpkgs!

pkgs/stdenv/generic/make-derivation.nix Outdated Show resolved Hide resolved
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 27, 2024
@corngood
Copy link
Contributor Author

I would love to nixpkgs-review this, but the only darwin machine I have access to is the community builder, and it was likely going to run out of storage. I did build a good chunk of things with sandboxing enabled, and didn't hit any problems.

@corngood corngood requested a review from reckenrode March 5, 2024 17:07
@reckenrode
Copy link
Contributor

Looks like there’s a merge conflict now.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@corngood corngood force-pushed the stdenv-darwin-deps branch from 0cd36af to 9cab776 Compare April 19, 2024 18:01
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell and removed 6.topic: stdenv Standard environment labels Apr 19, 2024
@github-actions github-actions bot added 6.topic: stdenv Standard environment and removed 6.topic: testing Tooling for automated testing of packages and modules 6.topic: cinnamon Desktop environment 6.topic: module system About "NixOS" module system internals 6.topic: systemd 6.topic: agda "A dependently typed programming language / interactive theorem prover" 6.topic: LXQt The Lightweight Qt Desktop Environment 6.topic: Lumina DE The Lumina Desktop Environment 6.topic: Enlightenment DE The Enlightenment Desktop Environment 6.topic: mate The MATE Desktop Environment 6.topic: vscode 6.topic: flakes The experimental Nix feature 6.topic: lib The Nixpkgs function library 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: php labels Apr 19, 2024
@corngood
Copy link
Contributor Author

Apologies, I accidentally pushed a rebase on master, which added a bunch of reviewers. :(

@corngood corngood mentioned this pull request Apr 19, 2024
Merged
13 tasks
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 19, 2024
@ofborg ofborg bot requested a review from doronbehar April 19, 2024 19:59
@doronbehar
Copy link
Contributor

Let's let this cook in staging.

@doronbehar doronbehar merged commit 3bb3aa2 into NixOS:staging Apr 21, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philiptaron philiptaron philiptaron approved these changes

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@hrdinka hrdinka Awaiting requested review from hrdinka

@reckenrode reckenrode Awaiting requested review from reckenrode

@doronbehar doronbehar Awaiting requested review from doronbehar

Assignees
No one assigned
Labels
6.topic: stdenv Standard environment 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

propagatedSandboxProfile does not appear to propagate
6 participants
@corngood @reckenrode @doronbehar @philiptaron @delroth @wegank