Skip to content

Comments

nixos-option: fix self inclusive src#307564

Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
Stunkymonkey:self-inclusive-src-nixos-option
Apr 28, 2024
Merged

nixos-option: fix self inclusive src#307564
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
Stunkymonkey:self-inclusive-src-nixos-option

Conversation

@Stunkymonkey
Copy link
Contributor

Description of changes

part of #301014

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.

@SuperSandro2000
Copy link
Member

@ofborg build nixos-option

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 28, 2024
@SuperSandro2000 SuperSandro2000 merged commit 5a51f32 into NixOS:master Apr 28, 2024
@K900
Copy link
Contributor

K900 commented Apr 30, 2024

This broke the installer tests, somehow: https://hydra.nixos.org/build/258074134/nixlog/829

I don't really get why it's failing, but given this is just a cleanup change, I'm going to revert this and we can reland later.

@SuperSandro2000
Copy link
Member

It is probably triggering a rebuild and we need to copy more things?

@K900
Copy link
Contributor

K900 commented Apr 30, 2024

Potentially. I'm not really familiar with how that entire setup works.

@SuperSandro2000
Copy link
Member

It fails to download zlib which is totally unrelated to the package itself and I remember similar issues in the past.

@Stunkymonkey Stunkymonkey deleted the self-inclusive-src-nixos-option branch June 2, 2025 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants