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

pinentry: change attributes to dashes, alias old ones

Browse Source
This commit is contained in:
Florian Klink 2019-10-14 00:14:42 +02:00 committed by worldofpeace
parent a4916fdea5
commit 66081ceb16
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/kwalletcli/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig { mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig
, kcoreaddons, ki18n, kwallet, mksh, pinentry_qt5 }: , kcoreaddons, ki18n, kwallet, mksh, pinentry-qt }:
mkDerivation rec { mkDerivation rec {
pname = "kwalletcli"; pname = "kwalletcli";
@ -36,7 +36,7 @@ mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/pinentry-kwallet \ 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 --set-default PINENTRY pinentry-qt
''; '';

5
pkgs/top-level/aliases.nix
View File

@ -290,6 +290,11 @@ mapAliases ({
pg_hll = postgresqlPackages.pg_hll; pg_hll = postgresqlPackages.pg_hll;
pg_cron = postgresqlPackages.pg_cron; pg_cron = postgresqlPackages.pg_cron;
pg_topn = postgresqlPackages.pg_topn; 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; postgis = postgresqlPackages.postgis;
# end # end
ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream."; ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";

10
pkgs/top-level/all-packages.nix
View File

@ -5525,11 +5525,11 @@ in
libcap = if stdenv.isDarwin then null else libcap; libcap = if stdenv.isDarwin then null else libcap;
}; };
pinentry_curses = (stdenv.lib.getOutput "curses" pinentry); pinentry-curses = (stdenv.lib.getOutput "curses" pinentry);
pinentry_emacs = (stdenv.lib.getOutput "emacs" pinentry); pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry);
pinentry_gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry);
pinentry_qt = (stdenv.lib.getOutput "qt" pinentry); pinentry-qt = (stdenv.lib.getOutput "qt" pinentry);
pinentry_gnome = (stdenv.lib.getOutput "gnome" pinentry); pinentry-gnome = (stdenv.lib.getOutput "gnome" pinentry);
pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;