Commit 13694111 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

gnome-keyring: Move from gnome scope to top-level 

It is on the way out.
parent 71750a5e

nixos/modules/security/pam.nix

+3 −3
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ let 
                disable_interactive = true;

              }; }

              { name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; }

              { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; }

              { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; }

              { name = "intune"; enable = config.services.intune.enable; control = "optional"; modulePath = "${pkgs.intune-portal}/lib/security/pam_intune.so"; }

              { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = {

                store-only = cfg.gnupg.storeOnly;
@@ -789,7 +789,7 @@ let 
          { name = "krb5"; enable = config.security.pam.krb5.enable; control = "sufficient"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; settings = {

            use_first_pass = true;

          }; }

          { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {

          { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {

            use_authtok = true;

          }; }

        ];
@@ -858,7 +858,7 @@ let 
            debug = true;

          }; }

          { name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; }

          { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {

          { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = {

            auto_start = true;

          }; }

          { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = {

nixos/modules/services/desktops/gnome/gnome-keyring.nix

+4 −4
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ in 
  };



  config = lib.mkIf cfg.enable {

    environment.systemPackages = [ pkgs.gnome.gnome-keyring ];

    environment.systemPackages = [ pkgs.gnome-keyring ];



    services.dbus.packages = [

      pkgs.gnome.gnome-keyring

      pkgs.gnome-keyring

      pkgs.gcr

    ];



    xdg.portal.extraPortals = [ pkgs.gnome.gnome-keyring ];

    xdg.portal.extraPortals = [ pkgs.gnome-keyring ];



    security.pam.services = lib.mkMerge [

      {
@@ -52,7 +52,7 @@ in 
      owner = "root";

      group = "root";

      capabilities = "cap_ipc_lock=ep";

      source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon";

      source = "${pkgs.gnome-keyring}/bin/gnome-keyring-daemon";

    };

  };

}

pkgs/applications/misc/keeweb/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
, nss

, udev

, xorg

, gnome

, gnome-keyring

, mesa

, gtk3

, libusb1
@@ -54,7 +54,7 @@ let 
    xorg.libXScrnSaver

    xorg.libXtst

    xorg.libxshmfence

    gnome.gnome-keyring

    gnome-keyring

    mesa

    gtk3

    libusb1

pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, dpkg

, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome

, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome-keyring

, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg

, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }:
@@ -30,7 +30,7 @@ let 
    gtk3

    libappindicator-gtk3



    gnome.gnome-keyring

    gnome-keyring



    libnotify

    libpulseaudio

pkgs/by-name/bi/bitwarden-desktop/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, electron_29

, fetchFromGitHub

, glib

, gnome

, gnome-keyring

, gtk3

, jq

, libsecret
@@ -127,7 +127,7 @@ in buildNpmPackage rec { 


  nativeCheckInputs = [

    dbus

    (gnome.gnome-keyring.override { useWrappedDaemon = false; })

    (gnome-keyring.override { useWrappedDaemon = false; })

  ];



  checkFlags = [