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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/kde/kgpg.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, mkDerivation, lib,
extra-cmake-modules, kdoctools, ki18n, makeWrapper, extra-cmake-modules, kdoctools, ki18n, makeWrapper,
akonadi-contacts, gnupg1, karchive, kcodecs, kcontacts, kcoreaddons, akonadi-contacts, gnupg, karchive, kcodecs, kcontacts, kcoreaddons,
kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme, ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme,
}: }:
@ -10,12 +10,12 @@ mkDerivation {
name = "kgpg"; name = "kgpg";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
buildInputs = [ buildInputs = [
akonadi-contacts gnupg1 karchive kcodecs kcontacts kcoreaddons kcrash akonadi-contacts gnupg karchive kcodecs kcontacts kcoreaddons kcrash
kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice
ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme
]; ];
postFixup = '' postFixup = ''
wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}" wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg ]}"
''; '';
meta = { meta = {
license = [ lib.licenses.gpl2 ]; license = [ lib.licenses.gpl2 ];

4
pkgs/applications/misc/playonlinux/default.nix
View File

@ -4,7 +4,7 @@
, cabextract , cabextract
, gettext , gettext
, glxinfo , glxinfo
, gnupg1compat , gnupg
, icoutils , icoutils
, imagemagick , imagemagick
, netcat-gnu , netcat-gnu
@ -32,7 +32,7 @@ let
python2Packages.python python2Packages.python
gettext gettext
glxinfo glxinfo
gnupg1compat gnupg
icoutils icoutils
imagemagick imagemagick
netcat-gnu netcat-gnu

4
pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, git, gnupg1compat, makeWrapper, openssl, stdenv }: { fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "git-crypt-${version}"; name = "git-crypt-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
make install PREFIX=$out make install PREFIX=$out
wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg1compat}/bin wrapProgram $out/bin/* --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, docutils, makeWrapper { stdenv, fetchFromGitHub, docutils, makeWrapper
, gnupg1compat, curl, rsync, coreutils , gnupg, curl, rsync, coreutils
, gawk, gnused, gnugrep , gawk, gnused, gnugrep
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
prefix="$out" ./install.sh prefix="$out" ./install.sh
wrapProgram "$out/bin/git-remote-gcrypt" \ wrapProgram "$out/bin/git-remote-gcrypt" \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat curl rsync coreutils --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg curl rsync coreutils
gawk gnused gnugrep ]}" gawk gnused gnugrep ]}"
''; '';

4
pkgs/applications/virtualization/rkt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools, { stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools,
cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }: cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }:
let let
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glibc.out glibc.static glibc.out glibc.static
autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd
makeWrapper makeWrapper
]; ];

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 { buildPythonPackage rec {
pname = "python-gnupg"; pname = "python-gnupg";
@ -12,9 +12,9 @@ buildPythonPackage rec {
# Let's make the library default to our gpg binary # Let's make the library default to our gpg binary
patchPhase = '' patchPhase = ''
substituteInPlace gnupg.py \ substituteInPlace gnupg.py \
--replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'" --replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'"
substituteInPlace test_gnupg.py \ 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" --replace "test_search_keys" "disabled__test_search_keys"
''; '';

4
pkgs/development/tools/build-managers/leiningen/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, makeWrapper
, coreutils, jdk, rlwrap, gnupg1compat }: , coreutils, jdk, rlwrap, gnupg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "leiningen"; pname = "leiningen";
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
--replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME" --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/$JARNAME"
wrapProgram $out/bin/lein \ wrapProgram $out/bin/lein \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \
--set LEIN_GPG ${gnupg1compat}/bin/gpg \ --set LEIN_GPG ${gnupg}/bin/gpg \
--set JAVA_CMD ${jdk}/bin/java --set JAVA_CMD ${jdk}/bin/java
''; '';

4
pkgs/servers/mail/spamassassin/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perlPackages, makeWrapper, gnupg1 }: { stdenv, fetchurl, perlPackages, makeWrapper, gnupg }:
perlPackages.buildPerlPackage rec { perlPackages.buildPerlPackage rec {
name = "SpamAssassin-3.4.2"; name = "SpamAssassin-3.4.2";
@ -27,7 +27,7 @@ perlPackages.buildPerlPackage rec {
mv "rules/"* $out/share/spamassassin/ mv "rules/"* $out/share/spamassassin/
for n in "$out/bin/"*; do for n in "$out/bin/"*; do
wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg1}/bin" wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg}/bin"
done done
''; '';

4
pkgs/tools/backup/duply/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg1, bash { stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash
, gnugrep, txt2man, makeWrapper, which , gnugrep, txt2man, makeWrapper, which
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out/share/man/man1" mkdir -p "$out/share/man/man1"
install -vD duply "$out/bin" install -vD duply "$out/bin"
wrapProgram "$out/bin/duply" --set PATH \ wrapProgram "$out/bin/duply" --set PATH \
${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg1 bash gnugrep txt2man which ]} ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]}
"$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
''; '';

4
pkgs/tools/misc/aptly/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg1compat, bzip2, xz, graphviz }: { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg, bzip2, xz, graphviz }:
let let
@ -34,7 +34,7 @@ buildGoPackage {
mkdir -p $bin/share/bash-completion/completions mkdir -p $bin/share/bash-completion/completions
ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions
wrapProgram "$bin/bin/aptly" \ wrapProgram "$bin/bin/aptly" \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat bzip2 xz graphviz ]}" --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/tools/misc/diffoscope/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit, python3Packages, docutils, help2man { lib, stdenv, fetchgit, python3Packages, docutils, help2man
, acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , acl, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg1, gnutar , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar
, gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite , gzip, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
, squashfsTools, tcpdump, unoconv, unzip, xxd, xz , squashfsTools, tcpdump, unoconv, unzip, xxd, xz
, enableBloat ? false , enableBloat ? false
@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec {
dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz libarchive libcaca lz4 pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz
] ++ lib.optionals enableBloat [ ] ++ lib.optionals enableBloat [
apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 gnumeric imagemagick apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg gnumeric imagemagick
llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv
python3Packages.guestfs python3Packages.guestfs
]; ];

30
pkgs/tools/security/signing-party/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, autoconf, automake, makeWrapper { stdenv, fetchFromGitLab, autoconf, automake, makeWrapper
, python3, perl, perlPackages , python3, perl, perlPackages
, libmd, gnupg1, which, getopt, libpaper, nettools, qprint , libmd, gnupg, which, getopt, libpaper, nettools, qprint
, sendmailPath ? "/run/wrappers/bin/sendmail" }: , sendmailPath ? "/run/wrappers/bin/sendmail" }:
let let
@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
# Perl is required for it's pod2man. # Perl is required for it's pod2man.
# Python and Perl are required for patching the script interpreter paths. # Python and Perl are required for patching the script interpreter paths.
nativeBuildInputs = [ autoconf automake makeWrapper ]; nativeBuildInputs = [ autoconf automake makeWrapper ];
buildInputs = [ python3 perl perlPackages.GnuPGInterface libmd gnupg1 ]; buildInputs = [ python3 perl perlPackages.GnuPGInterface libmd gnupg ];
postInstall = '' postInstall = ''
# Install all tools which aren't handled by 'make install'. # Install all tools which aren't handled by 'make install'.
@ -126,59 +126,59 @@ in stdenv.mkDerivation rec {
TextTemplate MIMETools MailTools TimeDate NetIDNEncode ] TextTemplate MIMETools MailTools TimeDate NetIDNEncode ]
++ GnuPGInterfaceRuntimeDependencies)} \ ++ GnuPGInterfaceRuntimeDependencies)} \
--prefix PATH ":" \ --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ nettools gnupg1 ]}" "${stdenv.lib.makeBinPath [ nettools gnupg ]}"
wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \ wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \
${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
--prefix PATH ":" \ --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 libpaper ]}" "${stdenv.lib.makeBinPath [ gnupg libpaper ]}"
wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \ wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ which gnupg1 libpaper ]}" "${stdenv.lib.makeBinPath [ which gnupg libpaper ]}"
wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \ wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 qprint ]}" "${stdenv.lib.makeBinPath [ gnupg qprint ]}"
wrapProgram $out/bin/gpgdir --set PERL5LIB \ wrapProgram $out/bin/gpgdir --set PERL5LIB \
${with perlPackages; makePerlPath ([ ${with perlPackages; makePerlPath ([
TermReadKey ] TermReadKey ]
++ GnuPGInterfaceRuntimeDependencies)} \ ++ GnuPGInterfaceRuntimeDependencies)} \
--prefix PATH ":" \ --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 ]}" "${stdenv.lib.makeBinPath [ gnupg ]}"
wrapProgram $out/bin/gpglist --prefix PATH ":" \ wrapProgram $out/bin/gpglist --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 ]}" "${stdenv.lib.makeBinPath [ gnupg ]}"
wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \ wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ getopt gnupg1 ]}" "${stdenv.lib.makeBinPath [ getopt gnupg ]}"
# wrapProgram $out/bin/gpgparticipants-prefill # wrapProgram $out/bin/gpgparticipants-prefill
wrapProgram $out/bin/gpgsigs --set PERL5LIB \ wrapProgram $out/bin/gpgsigs --set PERL5LIB \
${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
--prefix PATH ":" \ --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 ]}" "${stdenv.lib.makeBinPath [ gnupg ]}"
wrapProgram $out/bin/gpgwrap --prefix PATH ":" \ wrapProgram $out/bin/gpgwrap --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 ]}" "${stdenv.lib.makeBinPath [ gnupg ]}"
# wrapProgram $out/bin/keyanalyze --set PERL5LIB \ # wrapProgram $out/bin/keyanalyze --set PERL5LIB \
wrapProgram $out/bin/keyart --prefix PATH ":" \ wrapProgram $out/bin/keyart --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 ]}" "${stdenv.lib.makeBinPath [ gnupg ]}"
wrapProgram $out/bin/keylookup --prefix PATH ":" \ wrapProgram $out/bin/keylookup --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 ]}" "${stdenv.lib.makeBinPath [ gnupg ]}"
wrapProgram $out/bin/pgp-clean --set PERL5LIB \ wrapProgram $out/bin/pgp-clean --set PERL5LIB \
${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
--prefix PATH ":" \ --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 ]}" "${stdenv.lib.makeBinPath [ gnupg ]}"
wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \ wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \
${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \ ${perlPackages.makePerlPath GnuPGInterfaceRuntimeDependencies} \
--prefix PATH ":" \ --prefix PATH ":" \
"${stdenv.lib.makeBinPath [ gnupg1 ]}" "${stdenv.lib.makeBinPath [ gnupg ]}"
# wrapProgram $out/bin/pgpring # wrapProgram $out/bin/pgpring