Skip to content

nixos/tests/userborn: fix setting hostPlatform#378940

Merged
wolfgangwalther merged 1 commit intoNixOS:masterfrom
nikstur:fix-userborn-tests
Feb 3, 2025
Merged

nixos/tests/userborn: fix setting hostPlatform#378940
wolfgangwalther merged 1 commit intoNixOS:masterfrom
nikstur:fix-userborn-tests

Conversation

@nikstur
Copy link
Contributor

@nikstur nikstur commented Feb 2, 2025

Fix tests broken by #376988

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Feb 2, 2025
@nikstur
Copy link
Contributor Author

nikstur commented Feb 2, 2025

@ofborg test userborn
@ofborg test userborn-mutable-users userborn-immutable-users
@ofborg test userborn-mutable-etc userborn-immutable-etc

@ofborg test user-enable-option mutableUsers

@github-actions github-actions 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 Feb 2, 2025
@wolfgangwalther
Copy link
Contributor

Thanks!

@wolfgangwalther wolfgangwalther merged commit 1e74431 into NixOS:master Feb 3, 2025
33 of 43 checks passed
Comment on lines +39 to +40
nixpkgs.hostPlatform = {
inherit (pkgs.stdenv.hostPlatform) system;
Copy link
Member

Choose a reason for hiding this comment

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

Why would non-system attributes have to be dropped?
This change should not be required of anyone.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just to be clear: I have no stakes (or particular interest) in the original PR and was just looking for a quick fix for my tests. I have no objections to reverting the original PR and this one.

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

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants