From 66081ceb163b757f40f979ae081535eae0cd0a0e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 14 Oct 2019 00:14:42 +0200 Subject: [PATCH] pinentry: change attributes to dashes, alias old ones --- pkgs/tools/security/kwalletcli/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 5 +++++ pkgs/top-level/all-packages.nix | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index fedf3421fb1c..9356e2f53f94 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig -, kcoreaddons, ki18n, kwallet, mksh, pinentry_qt5 }: +, kcoreaddons, ki18n, kwallet, mksh, pinentry-qt }: mkDerivation rec { pname = "kwalletcli"; @@ -36,7 +36,7 @@ mkDerivation rec { postInstall = '' wrapProgram $out/bin/pinentry-kwallet \ - --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry_qt5 ]} \ + --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \ --set-default PINENTRY pinentry-qt ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d4617a635f14..127bf8b2cdf0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -290,6 +290,11 @@ mapAliases ({ pg_hll = postgresqlPackages.pg_hll; pg_cron = postgresqlPackages.pg_cron; pg_topn = postgresqlPackages.pg_topn; + pinentry_curses = pinentry-curses; # added 2019-10-14 + pinentry_emacs = pinentry-emacs; # added 2019-10-14 + pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14 + pinentry_qt = pinentry-qt; # added 2019-10-14 + pinentry_gnome = pinentry-gnome; # added 2019-10-14 postgis = postgresqlPackages.postgis; # end ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d01c2ac98d0c..d1c5611d3892 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5525,11 +5525,11 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry_curses = (stdenv.lib.getOutput "curses" pinentry); - pinentry_emacs = (stdenv.lib.getOutput "emacs" pinentry); - pinentry_gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); - pinentry_qt = (stdenv.lib.getOutput "qt" pinentry); - pinentry_gnome = (stdenv.lib.getOutput "gnome" pinentry); + pinentry-curses = (stdenv.lib.getOutput "curses" pinentry); + pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry); + pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); + pinentry-qt = (stdenv.lib.getOutput "qt" pinentry); + pinentry-gnome = (stdenv.lib.getOutput "gnome" pinentry); pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa;