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.

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

kanidm: discern normal build from provisioning build and fix 1_3 patches #367230

Merged
merged 1 commit into from
Dec 23, 2024

Conversation

oddlama
Copy link
Contributor

@oddlama oddlama commented Dec 21, 2024

This renames pname of the kanidm package with provisioning package (as suggested by @adamcstephens)
so we can better discern them when both are built in package updates.

I also fixed the secret provisioning build for the recently introduced 1_3 variant,
which requires the old patchfiles from pre 1_4 to apply properly.

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: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 21, 2024
@ofborg ofborg bot requested review from adamcstephens and Flakebi December 22, 2024 13:29
@adamcstephens
Copy link
Contributor

Why is the cargo hash different for the patched version?

@adamcstephens
Copy link
Contributor

Ahh because pname is used by it. Looks like we can set cargoDepsName = "kanidm" to avoid having two hashes. https://nixos.org/manual/nixpkgs/unstable/#compiling-rust-applications-with-cargo

@oddlama oddlama force-pushed the change-kanidm-provision-pname branch from 206dab1 to e7e095e Compare December 22, 2024 15:57
@oddlama
Copy link
Contributor Author

oddlama commented Dec 22, 2024

That's definitely a better solution. I've updated the files.

@adamcstephens adamcstephens merged commit 0e2d2f8 into NixOS:master Dec 23, 2024
40 of 41 checks passed
@adamcstephens adamcstephens added the backport release-24.11 Backport PR automatically label Dec 23, 2024
@nix-backports
Copy link

nix-backports bot commented Dec 23, 2024

@nix-backports
Copy link

nix-backports bot commented Dec 23, 2024

Git push to origin failed for release-24.11 with exitcode 1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants