Skip to content

spotube: unify linux and darwin builder#369695

Merged
GaetanLepage merged 1 commit intoNixOS:masterfrom
TomaSajt:spotube
Jan 1, 2025
Merged

spotube: unify linux and darwin builder#369695
GaetanLepage merged 1 commit intoNixOS:masterfrom
TomaSajt:spotube

Conversation

@TomaSajt
Copy link
Contributor

@TomaSajt TomaSajt commented Dec 31, 2024

Luckily the github diff is not too horrible

Other then the combining of the two builders I did the following:

  • use finalAttrs
  • calculate meta.platforms from passthru.sources

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 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 Dec 31, 2024
@GaetanLepage
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369695


x86_64-linux

✅ 1 package built:
  • spotube

x86_64-darwin

✅ 1 package built:
  • spotube

aarch64-darwin

✅ 1 package built:
  • spotube

Copy link
Contributor

Choose a reason for hiding this comment

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

passthru should be at the bottom, right before meta.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

IMO in this case passthru is a bit more important than in other cases, so it doesn't hurt if it's earlier in the file.

Though, I don't care that much about it so I'll change it.

Copy link
Contributor

Choose a reason for hiding this comment

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

IMO in this case passthru is a bit more important than in other cases, so it doesn't hurt if it's earlier in the file.

Though, I don't care that much about it so I'll change it.

True, both ways would have worked indeed. Thanks for changing though :)

Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

LGTM ! Thanks for cleaning things up :)

@GaetanLepage GaetanLepage merged commit 02e6030 into NixOS:master Jan 1, 2025
21 checks passed
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.

2 participants