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

switch users of "gnupg1" to plain "gnupg" #57982

Merged
merged 1 commit into from May 12, 2019
Merged

switch users of "gnupg1" to plain "gnupg" #57982

merged 1 commit into from May 12, 2019

Conversation

catern
Copy link
Contributor

@catern catern commented Mar 20, 2019

gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra
symlinks in the bin directory. None of these packages need those
symlinks, and it's confusing for them to say they're depending on
"gnupg1", so switch their dep to plain "gnupg".

I have not built any of these packages, I'm hoping to rely on ofborg.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

gnupg is gnupg 2.2. gnupg1 is also gnupg 2.2, just with a few extra
symlinks in the bin directory. None of these packages need those
symlinks, and it's confusing for them to say they're depending on
"gnupg1", so switch their dep to plain "gnupg".
@disassembler
Copy link
Member

@GrahamcOfBorg build gnupg

@matthewbauer
Copy link
Member

Nice work! I am glad people are handling these. I would consider moving gnupg1 to aliases.nix if possible.

Another one that I've wanted to rename is mesa_noglu (should just be mesa).

@catern
Copy link
Contributor Author

catern commented Mar 20, 2019

Yeah, ideally gnupg1 would point to what we currently call "gnupg1orig". Not sure what's the best transition strategy there. Should I delete the current gnupg1, wait a bit, and then later on rename gnupg1orig to gnugp1? Or should I do that in a single commit?

@catern
Copy link
Contributor Author

catern commented Mar 20, 2019

(With either transition approach I think it's best to leave gnupg1 as it is for this change - maybe something will come up after this)

@FRidh FRidh merged commit 4b8803d into NixOS:master May 12, 2019
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.

None yet

5 participants