Skip to content

systemd: don't reference build bash & disallowedReferences nativeBuildInputs & cross to passthru.tests#214207

Merged
Artturin merged 2 commits intoNixOS:stagingfrom
Artturin:ssytemdbuildbash1
Feb 13, 2023
Merged

systemd: don't reference build bash & disallowedReferences nativeBuildInputs & cross to passthru.tests#214207
Artturin merged 2 commits intoNixOS:stagingfrom
Artturin:ssytemdbuildbash1

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Feb 2, 2023 •
edited by SuperSandro2000
Loading

the .install files retained references to build bash

$ pwd
/nix/store/yfzncfa577cbc0r1bm1fjdc1szyy0dif-systemd-aarch64-unknown-linux-gnu-252.4/lib $ tree kernel
kernel
├── install.conf
└── install.d
    ├── 50-depmod.install
    └── 90-loaderentry.install
Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Artturin
systemd: don't reference build bash
2142bc8 
the .install files retained references to build bash

$ pwd
/nix/store/yfzncfa577cbc0r1bm1fjdc1szyy0dif-systemd-aarch64-unknown-linux-gnu-252.4/lib
$ tree kernel
kernel
├── install.conf
└── install.d
    ├── 50-depmod.install
    └── 90-loaderentry.install
@Artturin Artturin requested a review from a team as a code owner February 2, 2023 16:13
@github-actions github-actions bot added the 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. label Feb 2, 2023
flokli
flokli approved these changes Feb 2, 2023
View reviewed changes
Copy link
Member

@flokli flokli left a comment

Choose a reason for hiding this comment

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

I wonder if we can use disallowedReferences in the cross case to prevent this from regressing again?

@ofborg ofborg bot requested review from Mic92, flokli and kloenk February 2, 2023 16:37
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 2, 2023
@Artturin
systemd: disallowedReferences nativeBuildInputs
1db2422 
add cross to passthru.tests to prevent cross breaking
@Artturin Artturin changed the title systemd: don't reference build bash systemd: don't reference build bash & disallowedReferences nativeBuildInputs & cross to passthru.tests Feb 2, 2023
@Artturin Artturin added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Feb 2, 2023
@Artturin Artturin merged commit fa169bb into NixOS:staging Feb 13, 2023
@Artturin Artturin deleted the ssytemdbuildbash1 branch February 13, 2023 20:34
flokli
flokli reviewed Feb 17, 2023
View reviewed changes
pkgs/os-specific/linux/systemd/default.nix
Comment on lines +702 to +704
disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
# 'or p' is for manually specified buildPackages as they dont have __spliced
(builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs);
Copy link
Member

@flokli flokli Feb 17, 2023

Choose a reason for hiding this comment

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

A bit odd we have to interact with __spliced directly here, but ugh, fair enough. Thanks for fixing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@flokli flokli flokli approved these changes

@Mic92 Mic92 Awaiting requested review from Mic92

@kloenk kloenk Awaiting requested review from kloenk

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Artturin @flokli