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

git-trim: add missing zlib dependency #369536

Merged
merged 1 commit into from
Dec 31, 2024
Merged

Conversation

jpetrucciani
Copy link
Member

@jpetrucciani jpetrucciani commented Dec 31, 2024

Similar to #366745, there appears to be a missing zlib dep for this package on darwin. Adding this allows the build to succeed again!

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 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 31, 2024
@@ -46,6 +47,7 @@ rustPlatform.buildRustPackage rec {
IOKit
CoreFoundation
Security
zlib
Copy link
Contributor

Choose a reason for hiding this comment

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

#369535 (comment). can make zlib unconditional ( and drop IOKit CoreFoundation and Security -- they are no-ops now as they are part of the stdenv)

Copy link
Member Author

Choose a reason for hiding this comment

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

ah cool! will fixup - thanks for the callouts!

Copy link
Member Author

Choose a reason for hiding this comment

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

When removing Security from the top level attrset, i get an error in eval - i guess because this is invoked with

git-trim = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-trim {...}

in all-packages.nix - is that something i should swap out for the main callPackage now?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've made this ^ change and made sure it built

@jpetrucciani jpetrucciani changed the title git-trim: add missing zlib dependency on Darwin git-trim: add missing zlib dependency Dec 31, 2024
@github-actions github-actions bot added 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Dec 31, 2024
Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

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

LGTM built on x64 linux and aarch64-darwin

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 31, 2024
@ofborg ofborg bot requested a review from cafkafk December 31, 2024 13:18
@emilazy emilazy merged commit 40ee6b1 into NixOS:master Dec 31, 2024
43 of 44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants