git.iko.soy/typeable/nixpkgs
on master help sign in
pinentry: change attributes to dashes, alias old ones
66081ceFlorian Klink
pkgs/tools/security/kwalletcli/default.nix+2−2
@@ -1,5 +1,5 @@
1{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig
1{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig
2−, kcoreaddons, ki18n, kwallet, mksh, pinentry_qt5 }:
2+, kcoreaddons, ki18n, kwallet, mksh, pinentry-qt }:
3
3
4mkDerivation rec {
4mkDerivation rec {
5 pname = "kwalletcli";
5 pname = "kwalletcli";
@@ -36,7 +36,7 @@ mkDerivation rec {
36
36
37 postInstall = ''
37 postInstall = ''
38 wrapProgram $out/bin/pinentry-kwallet \
38 wrapProgram $out/bin/pinentry-kwallet \
39− --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry_qt5 ]} \
39+ --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \
40 --set-default PINENTRY pinentry-qt
40 --set-default PINENTRY pinentry-qt
41 '';
41 '';
42
42
pkgs/top-level/aliases.nix+5
@@ -290,6 +290,11 @@ mapAliases ({
290 pg_hll = postgresqlPackages.pg_hll;
290 pg_hll = postgresqlPackages.pg_hll;
291 pg_cron = postgresqlPackages.pg_cron;
291 pg_cron = postgresqlPackages.pg_cron;
292 pg_topn = postgresqlPackages.pg_topn;
292 pg_topn = postgresqlPackages.pg_topn;
293+ pinentry_curses = pinentry-curses; # added 2019-10-14
294+ pinentry_emacs = pinentry-emacs; # added 2019-10-14
295+ pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14
296+ pinentry_qt = pinentry-qt; # added 2019-10-14
297+ pinentry_gnome = pinentry-gnome; # added 2019-10-14
293 postgis = postgresqlPackages.postgis;
298 postgis = postgresqlPackages.postgis;
294 # end
299 # end
295 ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
300 ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
pkgs/top-level/all-packages.nix+5−5
@@ -5525,11 +5525,11 @@ in
5525 libcap = if stdenv.isDarwin then null else libcap;
5525 libcap = if stdenv.isDarwin then null else libcap;
5526 };
5526 };
5527
5527
5528− pinentry_curses = (stdenv.lib.getOutput "curses" pinentry);
5528+ pinentry-curses = (stdenv.lib.getOutput "curses" pinentry);
5529− pinentry_emacs = (stdenv.lib.getOutput "emacs" pinentry);
5529+ pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry);
5530− pinentry_gtk2 = (stdenv.lib.getOutput "gtk2" pinentry);
5530+ pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry);
5531− pinentry_qt = (stdenv.lib.getOutput "qt" pinentry);
5531+ pinentry-qt = (stdenv.lib.getOutput "qt" pinentry);
5532− pinentry_gnome = (stdenv.lib.getOutput "gnome" pinentry);
5532+ pinentry-gnome = (stdenv.lib.getOutput "gnome" pinentry);
5533
5533
5534 pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
5534 pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
5535 inherit (darwin.apple_sdk.frameworks) Cocoa;
5535 inherit (darwin.apple_sdk.frameworks) Cocoa;