commit c86e8fd7a02aec59bd732bbf01f94a22a34e4594 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/config/no-x-libs.nix

···

       66
       66
        
             networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; };

     

       67
       67
        
             networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };

     

       68
       68
        
             pango = super.pango.override { x11Support = false; };

     

       69
       69
       -
             pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; };

     

       69
       69
       +
             pinentry-curses = super.pinentry-curses.override { withLibsecret = false; };

     

       70
       70
        
             pipewire = super.pipewire.override { vulkanSupport = false; x11Support = false; };

     

       71
       71
        
             pythonPackagesExtensions = super.pythonPackagesExtensions ++ [

     

       72
       72
        
               (python-final: python-prev: {

+20 -22

nixos/modules/programs/gnupg.nix

···

       1
       1
        
       { config, lib, pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       4
       4
       +
         inherit (lib) mkRemovedOptionModule mkOption mkPackageOption types mkIf optionalString;

     

       6
       5
        
       

     

       7
       6
        
         cfg = config.programs.gnupg;

     

       8
       7
        
       

     
···

       26
       25
        
             "curses";

     

       27
       26
        
       

     

       28
       27
        
       in

     

       29
       29
       -
       

     

       30
       28
        
       {

     

       29
       29
       +
         imports = [

     

       30
       30
       +
           (mkRemovedOptionModule [ "programs" "gnupg" "agent" "pinentryFlavor" ] "Use programs.gnupg.agent.pinentryPackage instead")

     

       31
       31
       +
         ];

     

       31
       32
        
       

     

       32
       33
        
         options.programs.gnupg = {

     

       33
       34
        
           package = mkPackageOption pkgs "gnupg" { };

     
···

       66
       67
        
             '';

     

       67
       68
        
           };

     

       68
       69
        
       

     

       69
       69
       -
           agent.pinentryFlavor = mkOption {

     

       70
       70
       -
             type = types.nullOr (types.enum pkgs.pinentry.flavors);

     

       71
       71
       -
             example = "gnome3";

     

       72
       72
       -
             default = defaultPinentryFlavor;

     

       73
       73
       -
             defaultText = literalMD ''matching the configured desktop environment'';

     

       70
       70
       +
           agent.pinentryPackage = mkOption {

     

       71
       71
       +
             type = types.nullOr types.package;

     

       72
       72
       +
             example = lib.literalMD "pkgs.pinentry-gnome3";

     

       73
       73
       +
             default = pkgs.pinentry-curses;

     

       74
       74
       +
             defaultText = lib.literalMD "matching the configured desktop environment or `pkgs.pinentry-curses`";

     

       74
       75
        
             description = lib.mdDoc ''

     

       75
       75
       -
               Which pinentry interface to use. If not null, the path to the

     

       76
       76
       -
               pinentry binary will be set in /etc/gnupg/gpg-agent.conf.

     

       77
       77
       -
               If not set at all, it'll pick an appropriate flavor depending on the

     

       78
       78
       -
               system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce

     

       79
       79
       -
               4.12, gnome3 on all other systems with X enabled, ncurses otherwise).

     

       76
       76
       +
               Which pinentry package to use. The path to the mainProgram as defined in

     

       77
       77
       +
               the package's meta attriutes will be set in /etc/gnupg/gpg-agent.conf.

     

       78
       78
       +
               If not set by the user, it'll pick an appropriate flavor depending on the

     

       79
       79
       +
               system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce,

     

       80
       80
       +
               gnome3 on all other systems with X enabled, curses otherwise).

     

       80
       81
        
             '';

     

       81
       82
        
           };

     

       82
       83
        
       

     
···

       102
       103
        
         };

     

       103
       104
        
       

     

       104
       105
        
         config = mkIf cfg.agent.enable {

     

       105
       105
       -
           programs.gnupg.agent.settings = {

     

       106
       106
       -
             pinentry-program = lib.mkIf (cfg.agent.pinentryFlavor != null)

     

       107
       107
       -
               "${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry";

     

       106
       106
       +
           programs.gnupg.agent.settings = mkIf (cfg.agent.pinentryPackage != null) {

     

       107
       107
       +
             pinentry-program = lib.getExe cfg.agent.pinentryPackage;

     

       108
       108
        
           };

     

       109
       109
        
       

     

       110
       110
        
           environment.etc."gnupg/gpg-agent.conf".source =

     
···

       207
       207
        
             wantedBy = [ "sockets.target" ];

     

       208
       208
        
           };

     

       209
       209
        
       

     

       210
       210
       -
           services.dbus.packages = mkIf (cfg.agent.pinentryFlavor == "gnome3") [ pkgs.gcr ];

     

       210
       210
       +
           services.dbus.packages = mkIf (lib.elem "gnome3" (cfg.agent.pinentryPackage.flavors or [])) [ pkgs.gcr ];

     

       211
       211
        
       

     

       212
       212
       -
           environment.systemPackages = with pkgs; [ cfg.package ];

     

       212
       212
       +
           environment.systemPackages = [ cfg.package ];

     

       213
       213
        
       

     

       214
       214
        
           environment.interactiveShellInit = ''

     

       215
       215
        
             # Bind gpg-agent to this TTY if gpg commands are used.

     
···

       230
       230
        
           '';

     

       231
       231
        
       

     

       232
       232
        
           assertions = [

     

       233
       233
       -
             { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent;

     

       233
       233
       +
             {

     

       234
       234
       +
               assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent;

     

       234
       235
        
               message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!";

     

       235
       236
        
             }

     

       236
       237
        
           ];

     

       237
       238
        
         };

     

       238
       238
       -
       

     

       239
       239
       -
         # uses attributes of the linked package

     

       240
       240
       -
         meta.buildDocsInSandbox = false;

     

       241
       239
        
       }

+5

nixos/modules/programs/wayland/sway.nix

···

       152
       152
        
                   '';

     

       153
       153
        
                 }

     

       154
       154
        
               ];

     

       155
       155
       +
       

     

       155
       156
        
               environment = {

     

       156
       157
        
                 systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages;

     

       157
       158
        
                 # Needed for the default wallpaper:

     
···

       166
       167
        
                   "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config";

     

       167
       168
        
                 };

     

       168
       169
        
               };

     

       170
       170
       +
       

     

       171
       171
       +
               programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gnome3;

     

       172
       172
       +
       

     

       169
       173
        
               # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050913

     

       170
       174
        
               xdg.portal.config.sway.default = mkDefault [ "wlr" "gtk" ];

     

       175
       175
       +
       

     

       171
       176
        
               # To make a Sway session available if a display manager like SDDM is enabled:

     

       172
       177
        
               services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; }

     

       173
       178
        
             (import ./wayland-session.nix { inherit lib pkgs; })

+2 -10

nixos/modules/services/security/yubikey-agent.nix

···

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
        
         cfg = config.services.yubikey-agent;

     

       9
       9
       -
       

     

       10
       10
       -
         # reuse the pinentryFlavor option from the gnupg module

     

       11
       11
       -
         pinentryFlavor = config.programs.gnupg.agent.pinentryFlavor;

     

       12
       9
        
       in

     

       13
       10
        
       {

     

       14
       11
        
         ###### interface

     
···

       41
       38
        
           # This overrides the systemd user unit shipped with the

     

       42
       39
        
           # yubikey-agent package

     

       43
       40
        
           systemd.user.services.yubikey-agent = mkIf (pinentryFlavor != null) {

     

       44
       44
       -
             path = [ pkgs.pinentry.${pinentryFlavor} ];

     

       45
       45
       -
             wantedBy = [

     

       46
       46
       -
               (if pinentryFlavor == "tty" || pinentryFlavor == "curses" then

     

       47
       47
       -
                 "default.target"

     

       48
       48
       -
               else

     

       49
       49
       -
                 "graphical-session.target")

     

       50
       50
       -
             ];

     

       41
       41
       +
             path = [ config.programs.gnupg.agent.pinentryPackage ];

     

       42
       42
       +
             wantedBy = [ "default.target" ];

     

       51
       43
        
           };

     

       52
       44
        
       

     

       53
       45
        
           # Yubikey-agent expects pcsd to be running in order to function.

+1

nixos/modules/services/x11/desktop-managers/deepin.nix

···

       66
       66
        
             services.upower.enable = mkDefault config.powerManagement.enable;

     

       67
       67
        
             networking.networkmanager.enable = mkDefault true;

     

       68
       68
        
             programs.dconf.enable = mkDefault true;

     

       69
       69
       +
             programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;

     

       69
       70
        
       

     

       70
       71
        
             fonts.packages = with pkgs; [ noto-fonts ];

     

       71
       72
        
             xdg.mime.enable = true;

+2

nixos/modules/services/x11/desktop-managers/lxqt.nix

···

       62
       62
        
           # Link some extra directories in /run/current-system/software/share

     

       63
       63
        
           environment.pathsToLink = [ "/share" ];

     

       64
       64
        
       

     

       65
       65
       +
           programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;

     

       66
       66
       +
       

     

       65
       67
        
           # virtual file systems support for PCManFM-QT

     

       66
       68
        
           services.gvfs.enable = true;

     

       67
       69

+1

nixos/modules/services/x11/desktop-managers/plasma5.nix

···

       336
       336
        
               serif = [ "Noto Serif" ];

     

       337
       337
        
             };

     

       338
       338
        
       

     

       339
       339
       +
             programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;

     

       339
       340
        
             programs.ssh.askPassword = mkDefault "${pkgs.plasma5Packages.ksshaskpass.out}/bin/ksshaskpass";

     

       340
       341
        
       

     

       341
       342
        
             # Enable helpful DBus services.

+1

nixos/modules/services/x11/desktop-managers/plasma6.nix

···

       210
       210
        
             serif = ["Noto Serif"];

     

       211
       211
        
           };

     

       212
       212
        
       

     

       213
       213
       +
           programs.gnupg.agent.pinentryPackage = pkgs.pinentry-qt;

     

       213
       214
        
           programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass";

     

       214
       215
        
       

     

       215
       216
        
           # Enable helpful DBus services.

+1

nixos/modules/services/x11/desktop-managers/xfce.nix

···

       131
       131
        
               xfdesktop

     

       132
       132
        
             ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;

     

       133
       133
        
       

     

       134
       134
       +
           programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;

     

       134
       135
        
           programs.xfconf.enable = true;

     

       135
       136
        
           programs.thunar.enable = true;

     

       136
       137

+2

nixos/modules/services/x11/xserver.nix

···

       749
       749
        
           boot.kernel.sysctl."fs.inotify.max_user_instances" = mkDefault 524288;

     

       750
       750
        
           boot.kernel.sysctl."fs.inotify.max_user_watches" = mkDefault 524288;

     

       751
       751
        
       

     

       752
       752
       +
           programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gnome3;

     

       753
       753
       +
       

     

       752
       754
        
           systemd.defaultUnit = mkIf cfg.autorun "graphical.target";

     

       753
       755
        
       

     

       754
       756
        
           systemd.services.display-manager =

-1

nixos/tests/pass-secret-service.nix

···

       26
       26
        
       

     

       27
       27
        
             programs.gnupg = {

     

       28
       28
        
               agent.enable = true;

     

       29
       29
       -
               agent.pinentryFlavor = "tty";

     

       30
       29
        
               dirmngr.enable = true;

     

       31
       30
        
             };

     

       32
       31
        
           };

+1 -1

pkgs/applications/version-management/blackbox/default.nix

···

       31
       31
        
           expect

     

       32
       32
        
           which

     

       33
       33
        
           coreutils

     

       34
       34
       -
           pinentry.tty

     

       34
       34
       +
           pinentry

     

       35
       35
        
           git

     

       36
       36
        
           gnutar

     

       37
       37
        
           procps

+2 -2

pkgs/by-name/go/goldwarden/package.nix

···

       4
       4
        
       , makeBinaryWrapper

     

       5
       5
        
       , libfido2

     

       6
       6
        
       , dbus

     

       7
       7
       -
       , pinentry

     

       7
       7
       +
       , pinentry-gnome3

     

       8
       8
        
       , nix-update-script

     

       9
       9
        
       }:

     

       10
       10
        
       

     
···

       29
       29
        
       

     

       30
       30
        
         postInstall = ''

     

       31
       31
        
           wrapProgram $out/bin/goldwarden \

     

       32
       32
       -
             --suffix PATH : ${lib.makeBinPath [dbus pinentry]}

     

       32
       32
       +
             --suffix PATH : ${lib.makeBinPath [dbus pinentry-gnome3]}

     

       33
       33
        
       

     

       34
       34
        
           install -Dm644 $src/resources/com.quexten.goldwarden.policy -t $out/share/polkit-1/actions

     

       35
       35
        
         '';

+102 -82

pkgs/tools/security/pinentry/default.nix

···

       1
       1
       -
       { fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook

     

       2
       2
       -
       , libgpg-error, libassuan, qtbase, wrapQtAppsHook

     

       3
       3
       -
       , ncurses, gtk2, gcr

     

       4
       4
       -
       , withLibsecret ? true, libsecret

     

       5
       5
       -
       , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ]

     

       6
       6
       -
         ++ lib.optionals stdenv.isLinux [ "gnome3" ]

     

       7
       7
       -
         ++ lib.optionals (!stdenv.isDarwin) [ "qt" ]

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , autoreconfHook

     

       7
       7
       +
       , wrapGAppsHook

     

       8
       8
       +
       , libgpg-error

     

       9
       9
       +
       , libassuan

     

       10
       10
       +
       , libsForQt5

     

       11
       11
       +
       , ncurses

     

       12
       12
       +
       , gtk2

     

       13
       13
       +
       , gcr

     

       14
       14
       +
       , withLibsecret ? true

     

       15
       15
       +
       , libsecret

     

       8
       16
        
       }:

     

       9
       17
        
       

     

       10
       10
       -
       assert lib.isList enabledFlavors && enabledFlavors != [];

     

       11
       11
       -
       

     

       12
       18
        
       let

     

       13
       13
       -
         pinentryMkDerivation =

     

       14
       14
       -
           if (builtins.elem "qt" enabledFlavors)

     

       15
       15
       -
             then mkDerivation

     

       16
       16
       -
             else stdenv.mkDerivation;

     

       17
       17
       -
       

     

       18
       18
       -
         enableFeaturePinentry = f:

     

       19
       19
       -
           let

     

       20
       20
       -
             flag = flavorInfo.${f}.flag or null;

     

       21
       21
       -
           in

     

       22
       22
       -
             lib.optionalString (flag != null)

     

       23
       23
       -
               (lib.enableFeature (lib.elem f enabledFlavors) ("pinentry-" + flag));

     

       24
       24
       -
       

     

       25
       19
        
         flavorInfo = {

     

       26
       26
       -
           curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; };

     

       27
       27
       -
           tty = { bin = "tty"; flag = "tty"; };

     

       28
       28
       -
           gtk2 = { bin = "gtk-2"; flag = "gtk2"; buildInputs = [ gtk2 ]; };

     

       29
       29
       -
           gnome3 = { bin = "gnome3"; flag = "gnome3"; buildInputs = [ gcr ]; nativeBuildInputs = [ wrapGAppsHook ]; };

     

       30
       30
       -
           qt = { bin = "qt"; flag = "qt"; buildInputs = [ qtbase ]; nativeBuildInputs = [ wrapQtAppsHook ]; };

     

       31
       31
       -
           emacs = { bin = "emacs"; flag = "emacs"; buildInputs = []; };

     

       20
       20
       +
           tty = { flag = "tty"; };

     

       21
       21
       +
           curses = {

     

       22
       22
       +
             flag = "curses";

     

       23
       23
       +
             buildInputs = [ ncurses ];

     

       24
       24
       +
           };

     

       25
       25
       +
           gtk2 = {

     

       26
       26
       +
             flag = "gtk2";

     

       27
       27
       +
             buildInputs = [ gtk2 ];

     

       28
       28
       +
           };

     

       29
       29
       +
           gnome3 = {

     

       30
       30
       +
             flag = "gnome3";

     

       31
       31
       +
             buildInputs = [ gcr ];

     

       32
       32
       +
             nativeBuildInputs = [ wrapGAppsHook ];

     

       33
       33
       +
           };

     

       34
       34
       +
           qt = {

     

       35
       35
       +
             flag = "qt";

     

       36
       36
       +
             buildInputs = [ libsForQt5.qtbase ];

     

       37
       37
       +
             nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];

     

       38
       38
       +
           };

     

       39
       39
       +
           emacs = { flag = "emacs"; };

     

       32
       40
        
         };

     

       33
       41
        
       

     

       34
       34
       -
       in

     

       42
       42
       +
         buildPinentry = pinentryExtraPname: buildFlavors:

     

       43
       43
       +
           let

     

       44
       44
       +
             enableFeaturePinentry = f:

     

       45
       45
       +
               lib.enableFeature (lib.elem f buildFlavors) ("pinentry-" + flavorInfo.${f}.flag);

     

       35
       46
        
       

     

       36
       36
       -
       pinentryMkDerivation rec {

     

       37
       37
       -
         pname = "pinentry";

     

       38
       38
       -
         version = "1.2.1";

     

       47
       47
       +
             pinentryMkDerivation =

     

       48
       48
       +
               if (lib.elem "qt" buildFlavors)

     

       49
       49
       +
               then libsForQt5.mkDerivation

     

       50
       50
       +
               else stdenv.mkDerivation;

     

       39
       51
        
       

     

       40
       40
       -
         src = fetchurl {

     

       41
       41
       -
           url = "mirror://gnupg/pinentry/${pname}-${version}.tar.bz2";

     

       42
       42
       -
           sha256 = "sha256-RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc=";

     

       43
       43
       -
         };

     

       52
       52
       +
           in

     

       53
       53
       +
           pinentryMkDerivation rec {

     

       54
       54
       +
             pname = "pinentry-${pinentryExtraPname}";

     

       55
       55
       +
             version = "1.2.1";

     

       44
       56
        
       

     

       45
       45
       -
         nativeBuildInputs = [ pkg-config autoreconfHook ]

     

       46
       46
       -
           ++ lib.concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors;

     

       57
       57
       +
             src = fetchurl {

     

       58
       58
       +
               url = "mirror://gnupg/pinentry/pinentry-${version}.tar.bz2";

     

       59
       59
       +
               hash = "sha256-RXoYXlqFI4+5RalV3GNSq5YtyLSHILYvyfpIx1QKQGc=";

     

       60
       60
       +
             };

     

       47
       61
        
       

     

       48
       48
       -
         buildInputs = [ libgpg-error libassuan ]

     

       49
       49
       -
           ++ lib.optional withLibsecret libsecret

     

       50
       50
       -
           ++ lib.concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors;

     

       62
       62
       +
             nativeBuildInputs = [ pkg-config autoreconfHook ]

     

       63
       63
       +
               ++ lib.concatMap (f: flavorInfo.${f}.nativeBuildInputs or [ ]) buildFlavors;

     

       51
       64
        
       

     

       52
       52
       -
         dontWrapGApps = true;

     

       53
       53
       -
         dontWrapQtApps = true;

     

       65
       65
       +
             buildInputs = [ libgpg-error libassuan ]

     

       66
       66
       +
               ++ lib.optional withLibsecret libsecret

     

       67
       67
       +
               ++ lib.concatMap (f: flavorInfo.${f}.buildInputs or [ ]) buildFlavors;

     

       54
       68
        
       

     

       55
       55
       -
         patches = [

     

       56
       56
       -
           ./autoconf-ar.patch

     

       57
       57
       -
         ] ++ lib.optionals (lib.elem "gtk2" enabledFlavors) [

     

       58
       58
       -
           (fetchpatch {

     

       59
       59
       -
             url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch";

     

       60
       60
       -
             sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd";

     

       61
       61
       -
           })

     

       62
       62
       -
         ];

     

       69
       69
       +
             dontWrapGApps = true;

     

       70
       70
       +
             dontWrapQtApps = true;

     

       63
       71
        
       

     

       64
       64
       -
         configureFlags = [

     

       65
       65
       -
           "--with-libgpg-error-prefix=${libgpg-error.dev}"

     

       66
       66
       -
           "--with-libassuan-prefix=${libassuan.dev}"

     

       67
       67
       -
           (lib.enableFeature withLibsecret "libsecret")

     

       68
       68
       -
         ] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo));

     

       72
       72
       +
             patches = [

     

       73
       73
       +
               ./autoconf-ar.patch

     

       74
       74
       +
             ] ++ lib.optionals (lib.elem "gtk2" buildFlavors) [

     

       75
       75
       +
               (fetchpatch {

     

       76
       76
       +
                 url = "https://salsa.debian.org/debian/pinentry/raw/debian/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch";

     

       77
       77
       +
                 sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd";

     

       78
       78
       +
               })

     

       79
       79
       +
             ];

     

       69
       80
        
       

     

       70
       70
       -
         postInstall =

     

       71
       71
       -
           lib.concatStrings (lib.flip map enabledFlavors (f:

     

       72
       72
       -
             let

     

       73
       73
       -
               binary = "pinentry-" + flavorInfo.${f}.bin;

     

       74
       74
       -
             in ''

     

       75
       75
       -
               moveToOutput bin/${binary} ${placeholder f}

     

       76
       76
       -
               ln -sf ${placeholder f}/bin/${binary} ${placeholder f}/bin/pinentry

     

       77
       77
       -
             '' + lib.optionalString (f == "gnome3") ''

     

       78
       78
       -
               wrapGApp ${placeholder f}/bin/${binary}

     

       79
       79
       -
             '' + lib.optionalString (f == "qt") ''

     

       80
       80
       -
               wrapQtApp ${placeholder f}/bin/${binary}

     

       81
       81
       -
             '')) + ''

     

       82
       82
       -
             ln -sf ${placeholder (lib.head enabledFlavors)}/bin/pinentry-${flavorInfo.${lib.head enabledFlavors}.bin} $out/bin/pinentry

     

       83
       83
       -
           '';

     

       81
       81
       +
             configureFlags = [

     

       82
       82
       +
               "--with-libgpg-error-prefix=${libgpg-error.dev}"

     

       83
       83
       +
               "--with-libassuan-prefix=${libassuan.dev}"

     

       84
       84
       +
               (lib.enableFeature withLibsecret "libsecret")

     

       85
       85
       +
             ] ++ (map enableFeaturePinentry (lib.attrNames flavorInfo));

     

       84
       86
        
       

     

       85
       85
       -
         outputs = [ "out" ] ++ enabledFlavors;

     

       87
       87
       +
             postInstall =

     

       88
       88
       +
               lib.optionalString (lib.elem "gnome3" buildFlavors) ''

     

       89
       89
       +
                 wrapGApp $out/bin/pinentry-gnome3

     

       90
       90
       +
               '' + lib.optionalString (lib.elem "qt" buildFlavors) ''

     

       91
       91
       +
                 wrapQtApp $out/bin/pinentry-qt

     

       92
       92
       +
               '';

     

       86
       93
        
       

     

       87
       87
       -
         passthru = { flavors = enabledFlavors; };

     

       94
       94
       +
             passthru = { flavors = buildFlavors; };

     

       88
       95
        
       

     

       89
       89
       -
         meta = with lib; {

     

       90
       90
       -
           homepage = "http://gnupg.org/aegypten2/";

     

       91
       91
       -
           description = "GnuPG’s interface to passphrase input";

     

       92
       92
       -
           license = licenses.gpl2Plus;

     

       93
       93
       -
           platforms = platforms.all;

     

       94
       94
       -
           longDescription = ''

     

       95
       95
       -
             Pinentry provides a console and (optional) GTK and Qt GUIs allowing users

     

       96
       96
       -
             to enter a passphrase when `gpg' or `gpg2' is run and needs it.

     

       97
       97
       -
           '';

     

       98
       98
       -
           maintainers = with maintainers; [ ttuegel fpletz ];

     

       99
       99
       -
         };

     

       96
       96
       +
             meta = with lib; {

     

       97
       97
       +
               homepage = "https://gnupg.org/software/pinentry/index.html";

     

       98
       98
       +
               description = "GnuPG’s interface to passphrase input";

     

       99
       99
       +
               license = licenses.gpl2Plus;

     

       100
       100
       +
               platforms =

     

       101
       101
       +
                 if elem "gnome3" buildFlavors then platforms.linux else

     

       102
       102
       +
                 if elem "qt" buildFlavors then (remove "aarch64-darwin" platforms.all) else

     

       103
       103
       +
                 platforms.all;

     

       104
       104
       +
               longDescription = ''

     

       105
       105
       +
                 Pinentry provides a console and (optional) GTK and Qt GUIs allowing users

     

       106
       106
       +
                 to enter a passphrase when `gpg' or `gpg2' is run and needs it.

     

       107
       107
       +
               '';

     

       108
       108
       +
               maintainers = with maintainers; [ fpletz ];

     

       109
       109
       +
               mainProgram = "pinentry";

     

       110
       110
       +
             };

     

       111
       111
       +
           };

     

       112
       112
       +
       in

     

       113
       113
       +
       {

     

       114
       114
       +
         pinentry-curses = buildPinentry "curses" [ "curses" "tty" ];

     

       115
       115
       +
         pinentry-gtk2 = buildPinentry "gtk2" [ "gtk2" "curses" "tty" ];

     

       116
       116
       +
         pinentry-gnome3 = buildPinentry "gnome3" [ "gnome3" "curses" "tty" ];

     

       117
       117
       +
         pinentry-qt = buildPinentry "qt" [ "qt" "curses" "tty" ];

     

       118
       118
       +
         pinentry-emacs = buildPinentry "emacs" [ "emacs" "curses" "tty" ];

     

       119
       119
       +
         pinentry-all = buildPinentry "all" [ "curses" "tty" "gtk2" "gnome3" "qt" "emacs" ];

     

       100
       120
        
       }

+11

pkgs/top-level/aliases.nix

···

       902
       902
        
         timescaledb = postgresqlPackages.timescaledb;

     

       903
       903
        
         tsearch_extras = postgresqlPackages.tsearch_extras;

     

       904
       904
        
       

     

       905
       905
       +
         # pinentry was using multiple outputs, this emulates the old interface for i.e. home-manager

     

       906
       906
       +
         # soon: throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'";

     

       907
       907
       +
         pinentry = pinentry-all // {

     

       908
       908
       +
           curses = pinentry-curses;

     

       909
       909
       +
           gtk2 = pinentry-gtk2;

     

       910
       910
       +
           gnome2 = pinentry-gnome3;

     

       911
       911
       +
           qt = pinentry-qt;

     

       912
       912
       +
           emacs = pinentry-emacs;

     

       913
       913
       +
           flavors = [ "curses" "gtk2" "gnome2" "qt" "emacs" ];

     

       914
       914
       +
         }; # added 2024-01-15

     

       905
       915
        
         pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2023-09-10

     

       906
       916
        
         pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2023-09-10

     

       907
       917
        
         pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2023-09-10

     

       908
       918
        
         pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10

     

       909
       919
        
         pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10

     

       910
       920
        
         pinentry_qt5 = pinentry-qt; # Added 2020-02-11

     

       921
       921
       +
       

     

       911
       922
        
         PlistCpp = plistcpp; # Added 2024-01-05

     

       912
       923
        
         pocket-updater-utility = pupdate; # Added 2024-01-25

     

       913
       924
        
         poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26

+13 -9

pkgs/top-level/all-packages.nix

···

       11990
       11990
        
       

     

       11991
       11991
        
         piknik = callPackage ../tools/networking/piknik { };

     

       11992
       11992
        
       

     

       11993
       11993
       -
         pinentry = libsForQt5.callPackage ../tools/security/pinentry { };

     

       11994
       11994
       -
       

     

       11995
       11995
       -
         pinentry-curses = (lib.getOutput "curses" pinentry);

     

       11996
       11996
       -
         pinentry-emacs = (lib.getOutput "emacs" pinentry);

     

       11997
       11997
       -
         pinentry-gtk2 = (lib.getOutput "gtk2" pinentry);

     

       11998
       11998
       -
         pinentry-qt = (lib.getOutput "qt" pinentry);

     

       11999
       11999
       -
         pinentry-gnome = (lib.getOutput "gnome3" pinentry);

     

       11993
       11993
       +
         inherit (callPackages ../tools/security/pinentry { })

     

       11994
       11994
       +
           pinentry-curses

     

       11995
       11995
       +
           pinentry-emacs

     

       11996
       11996
       +
           pinentry-gtk2

     

       11997
       11997
       +
           pinentry-gnome3

     

       11998
       11998
       +
           pinentry-qt

     

       11999
       11999
       +
           pinentry-all;

     

       12000
       12000
        
       

     

       12001
       12001
        
         pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {

     

       12002
       12002
        
           inherit (darwin.apple_sdk.frameworks) Cocoa;

     
···

       30341
       30341
        
       

     

       30342
       30342
        
         bgpq4 = callPackage ../tools/networking/bgpq4 { };

     

       30343
       30343
        
       

     

       30344
       30344
       -
         blackbox = callPackage ../applications/version-management/blackbox { };

     

       30344
       30344
       +
         blackbox = callPackage ../applications/version-management/blackbox {

     

       30345
       30345
       +
           pinentry = pinentry-curses;

     

       30346
       30346
       +
         };

     

       30345
       30347
        
       

     

       30346
       30348
        
         bleachbit = callPackage ../applications/misc/bleachbit { };

     

       30347
       30349
        
       

     
···

       41242
       41244
        
       

     

       41243
       41245
        
         linkchecker = callPackage ../tools/networking/linkchecker { };

     

       41244
       41246
        
       

     

       41245
       41245
       -
         tomb = callPackage ../os-specific/linux/tomb { };

     

       41247
       41247
       +
         tomb = callPackage ../os-specific/linux/tomb {

     

       41248
       41248
       +
           pinentry = pinentry-curses;

     

       41249
       41249
       +
         };

     

       41246
       41250
        
       

     

       41247
       41251
        
         sccache = callPackage ../development/tools/misc/sccache { };

     

       41248
       41252

+3 -1

pkgs/top-level/python-packages.nix

···

       14972
       14972
        
       

     

       14973
       14973
        
         treq = callPackage ../development/python-modules/treq { };

     

       14974
       14974
        
       

     

       14975
       14975
       -
         trezor-agent = callPackage ../development/python-modules/trezor-agent { };

     

       14975
       14975
       +
         trezor-agent = callPackage ../development/python-modules/trezor-agent {

     

       14976
       14976
       +
           pinentry = pkgs.pinentry-curses;

     

       14977
       14977
       +
         };

     

       14976
       14978
        
       

     

       14977
       14979
        
         trezor = callPackage ../development/python-modules/trezor { };

     

       14978
       14980