public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch users of "gnupg1" to plain "gnupg"

Browse Source 
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".
This commit is contained in:
Spencer Baugh
2019-03-20 18:23:30 +00:00
committed by Frederik Rietdijk
parent 147621f7db
commit 4b8803dae6
12 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/python-gnupg/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, gnupg1 }:
{ stdenv, buildPythonPackage, fetchPypi, gnupg }:
buildPythonPackage rec {
pname = "python-gnupg";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
# Let's make the library default to our gpg binary
patchPhase = ''
substituteInPlace gnupg.py \
--replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'"
--replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'"
substituteInPlace test_gnupg.py \
--replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'" \
--replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg}/bin/gpg'" \
--replace "test_search_keys" "disabled__test_search_keys"
'';