diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2017-08-10 11:43:48 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-11 19:24:06 +0200 |
| commit | e34ce9d1c551fb43742aada6bb43ccb1a52e64a1 (patch) | |
| tree | e20c090163bad0902265eb5b9d2d7ab28a2b3be5 /pkgs/tools/misc/debian-devscripts | |
| parent | d8f08bb088f662a16768ba4e205b2951e0a23bdc (diff) | |
| download | nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.gz nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.bz2 nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.lz nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.xz nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.tar.zst nixlib-e34ce9d1c551fb43742aada6bb43ccb1a52e64a1.zip | |
gnupg: 2.1.22 -> 2.1.23
This release in a RC for gnupg-2.2. The main difference as far as nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and `gpgv2` is called `gpgv`. This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs, but there might be some packaged software that internally use `gpg2` not handeled by this commit. See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html for full release information
Diffstat (limited to 'pkgs/tools/misc/debian-devscripts')
| -rw-r--r-- | pkgs/tools/misc/debian-devscripts/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index cbc7a2e7e46c..810bf06527b0 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -27,10 +27,10 @@ in stdenv.mkDerivation rec { mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" find po4a scripts -type f -exec sed -r \ - -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \ + -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg@g" \ -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ - -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \ + -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv@g" \ -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \ -i {} + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile |