tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

pinentry: change attributes to dashes, alias old ones

authored by

Florian Klink and committed by
worldofpeace 511b1823 cb0adc11

+12 -7
unified split
+2 -2
pkgs/tools/security/kwalletcli/default.nix
··· 1 1 { mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig 2 - , kcoreaddons, ki18n, kwallet, mksh, pinentry_qt5 }: 2 + , kcoreaddons, ki18n, kwallet, mksh, pinentry-qt }: 3 3 4 4 mkDerivation rec { 5 5 pname = "kwalletcli"; ··· 36 36 37 37 postInstall = '' 38 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 40 --set-default PINENTRY pinentry-qt 41 41 ''; 42 42
+5
pkgs/top-level/aliases.nix
··· 290 290 pg_hll = postgresqlPackages.pg_hll; 291 291 pg_cron = postgresqlPackages.pg_cron; 292 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 298 postgis = postgresqlPackages.postgis; 294 299 # end 295 300 ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";
+5 -5
pkgs/top-level/all-packages.nix
··· 5525 5525 libcap = if stdenv.isDarwin then null else libcap; 5526 5526 }; 5527 5527 5528 - pinentry_curses = (stdenv.lib.getOutput "curses" pinentry); 5529 - pinentry_emacs = (stdenv.lib.getOutput "emacs" pinentry); 5530 - pinentry_gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); 5531 - pinentry_qt = (stdenv.lib.getOutput "qt" pinentry); 5532 - pinentry_gnome = (stdenv.lib.getOutput "gnome" pinentry); 5528 + pinentry-curses = (stdenv.lib.getOutput "curses" pinentry); 5529 + pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry); 5530 + pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); 5531 + pinentry-qt = (stdenv.lib.getOutput "qt" pinentry); 5532 + pinentry-gnome = (stdenv.lib.getOutput "gnome" pinentry); 5533 5533 5534 5534 pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { 5535 5535 inherit (darwin.apple_sdk.frameworks) Cocoa;