Skip to content

gnupg: fix availability of libexec tools #395155

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.

Sign up for GitHub

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

Jump to bottom
Merged
thiagokokada merged 1 commit into from
Apr 18, 2025
Merged

gnupg: fix availability of libexec tools #395155

thiagokokada merged 1 commit into from
Apr 18, 2025

Conversation

@octvs
Copy link
Member

@octvs octvs commented Apr 1, 2025

Correct typo on postInstall attribute of gnupg derivation.

Commit 6f635e3 introduced a code snippet in postInstall to add libexec tools from gnupg (such as gpg-preset-passphrase) to $out/bin/, which would eventually appear on PATH. However with a minor typo, missing the necessary asterisk.

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.

@octvs octvs requested review from afh, fpletz and stigtsp April 1, 2025 11:57
@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Apr 1, 2025
Yarny0
Yarny0 reviewed Apr 2, 2025
View reviewed changes
Copy link
Contributor

@Yarny0 Yarny0 left a comment

Choose a reason for hiding this comment

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

This looks good to me. Unfortunatelly, I can't judge on the purpose of those additional programs, but the for-loop was obviously broken and gets fixed here. I tested only superficially: The package still builds, and gpg -d still decrypts files.

Note: Due to the large number of package rebuilds, this pull request should probably be targeted to the staging branch -- maybe after being rebased onto a merge base of master and staging.

afh
afh approved these changes Apr 2, 2025
View reviewed changes
Copy link
Member

@afh afh left a comment

Choose a reason for hiding this comment

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

Great find @octvs 💯

@octvs octvs force-pushed the fix-gpg-libexec-tools branch from 72663e5 to 4fda591 Compare April 2, 2025 19:14
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: stdenv Standard environment 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: R R is a programming language for statistical computing and data visualization. 6.topic: lib The Nixpkgs function library 6.topic: games Gaming on NixOS 6.topic: rocm ROCm is an Advanced Micro Devices software stack for graphics processing unit programming. 6.topic: php PHP is a general-purpose scripting language geared towards web development. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Apr 2, 2025
@github-actions github-actions bot added the 8.has: documentation This PR adds or changes documentation label Apr 2, 2025
@github-actions github-actions bot removed 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: stdenv Standard environment 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: java Including JDK, tooling, other languages, other VMs 6.topic: R R is a programming language for statistical computing and data visualization. 6.topic: lib The Nixpkgs function library 6.topic: games Gaming on NixOS 6.topic: rocm ROCm is an Advanced Micro Devices software stack for graphics processing unit programming. 6.topic: php PHP is a general-purpose scripting language geared towards web development. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related labels Apr 2, 2025
@octvs
Copy link
Member Author

octvs commented Apr 2, 2025 via email

Yarny0
Yarny0 approved these changes Apr 3, 2025
View reviewed changes
Copy link
Contributor

@Yarny0 Yarny0 left a comment

Choose a reason for hiding this comment

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

Thanks, looks good! Two automated GitHub tests are failing, but I can't see why. The diff should be alright.

stigtsp
stigtsp approved these changes Apr 3, 2025
View reviewed changes
Copy link
Member

@stigtsp stigtsp left a comment

Choose a reason for hiding this comment

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

Diff LGTM

@octvs
Copy link
Member Author

octvs commented Apr 3, 2025 via email

@stigtsp
Copy link
Member

stigtsp commented Apr 3, 2025 •
edited
Loading

Two automated GitHub tests are failing, but I can't see why. The diff should be alright.
Yeah, I'm looking at the exact same cause, maybe I've messed up with the
being rebased onto a merge base of master and staging
part suggested above.

The diff looks fine to me, and should shouldn't cause any eval breakage.

Will run a local build/test

@octvs octvs force-pushed the fix-gpg-libexec-tools branch from 4fda591 to 0d893d9 Compare April 3, 2025 11:14
@afh afh added the 12.approvals: 3+ This PR was reviewed and approved by three or more persons. label Apr 3, 2025
@octvs
Copy link
Member Author

octvs commented Apr 3, 2025 via email

@stigtsp
Copy link
Member

stigtsp commented Apr 3, 2025

Did you mean "shouldn't" here?

Woops, yep you are indeed right.

The failing tests passed now, as suspected it was somehow caused by the rebase to merge-base with staging part, a fresh branch fixed the issue.

👍

@fpletz fpletz changed the title gnupg: fix availibity of libexec tools gnupg: fix availability of libexec tools Apr 3, 2025
fpletz
fpletz approved these changes Apr 3, 2025
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Just noticed the little typo but otherwise LGTM.

@RossComputerGuy RossComputerGuy removed this from Stdenv Apr 6, 2025
@octvs
gnupg: fix availability of libexec tools
2c39ef9 
Correct typo on `postInstall` attribute of `gnupg` derivation.

Commit 6f635e3 introduced a code snippet in `postInstall` to add libexec
tools from gnupg (such as gpg-preset-passphrase) to `$out/bin/`,
which would eventually appear on `PATH`. However with a minor typo,
missing the necessary asterisk.
@octvs octvs force-pushed the fix-gpg-libexec-tools branch from 0d893d9 to 2c39ef9 Compare April 14, 2025 17:26
@octvs
Copy link
Member Author

octvs commented Apr 14, 2025

Just noticed the little typo but otherwise LGTM.

Thanks, just fixed the commit msg as well!

@thiagokokada thiagokokada merged commit 4eaf9c2 into NixOS:staging Apr 18, 2025
26 of 27 checks passed
@octvs octvs deleted the fix-gpg-libexec-tools branch June 9, 2025 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@afh afh afh approved these changes

@stigtsp stigtsp stigtsp approved these changes

@fpletz fpletz fpletz approved these changes

@thiagokokada thiagokokada thiagokokada approved these changes

+1 more reviewer

@Yarny0 Yarny0 Yarny0 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

8.has: documentation This PR adds or changes documentation 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 3+ This PR was reviewed and approved by three or more persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@octvs @stigtsp @afh @fpletz @thiagokokada @Yarny0