dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
It is on the way out.
This commit is contained in:
Jan Tojnar 2024-06-22 16:46:12 +02:00
parent 71750a5e1d
commit 1369411184
13 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/security/pam.nix
View File

@ -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 = {

8
nixos/modules/services/desktops/gnome/gnome-keyring.nix
View File

@ -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";
};
};
}

4
pkgs/applications/misc/keeweb/default.nix
View File

@ -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

4
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View File

@ -1,5 +1,5 @@
{ 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

4
pkgs/by-name/bi/bitwarden-desktop/package.nix
View File

@ -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 = [

4
pkgs/by-name/gi/github-desktop/package.nix
View File

@ -4,7 +4,7 @@
, autoPatchelfHook
, wrapGAppsHook3
, makeWrapper
, gnome
, gnome-keyring
, libsecret
, git
, curl
@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
];
buildInputs = [
gnome.gnome-keyring
gnome-keyring
xorg.libXdamage
xorg.libX11
libsecret

1
pkgs/desktops/gnome/core/gnome-keyring/default.nix → pkgs/by-name/gn/gnome-keyring/package.nix
View File

@ -95,7 +95,6 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = "gnome-keyring";
attrPath = "gnome.gnome-keyring";
};
};

4
pkgs/by-name/ht/htb-toolkit/package.nix
View File

@ -6,7 +6,7 @@
, stdenv
, darwin
, coreutils
, gnome
, gnome-keyring
, libsecret
, bash
, openvpn
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage {
buildInputs = [
openssl
] ++ lib.optionals stdenv.isLinux [
gnome.gnome-keyring
gnome-keyring
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration

3
pkgs/desktops/gnome/default.nix
View File

@ -36,8 +36,6 @@ in
gnome-control-center = callPackage ./core/gnome-control-center { };
gnome-keyring = callPackage ./core/gnome-keyring { };
gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
gnome-online-miners = callPackage ./core/gnome-online-miners { };
@ -201,6 +199,7 @@ in
gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22.
gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.
gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.
gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22.
gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22.
gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22.

4
pkgs/desktops/lomiri/services/history-service/default.nix
View File

@ -8,7 +8,7 @@
, dbus
, dbus-test-runner
, dconf
, gnome
, gnome-keyring
, libphonenumber
, libqtdbustest
, pkg-config
@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
dbus
dbus-test-runner
dconf
gnome.gnome-keyring
gnome-keyring
telepathy-mission-control
xvfb-run
];

4
pkgs/desktops/lomiri/services/telephony-service/default.nix
View File

@ -13,7 +13,7 @@
, dconf
, gettext
, glib
, gnome
, gnome-keyring
, history-service
, libnotify
, libphonenumber
@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeCheckInputs = [
dbus-test-runner
dconf
gnome.gnome-keyring
gnome-keyring
telepathy-mission-control
xvfb-run
];

2
pkgs/desktops/pantheon/default.nix
View File

@ -98,7 +98,7 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-print-shim = callPackage ./desktop/elementary-print-shim { };
elementary-session-settings = callPackage ./desktop/elementary-session-settings {
inherit (gnome) gnome-session gnome-keyring;
inherit (gnome) gnome-session;
};
elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { };

6
pkgs/tools/security/beyond-identity/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, dpkg, buildFHSEnv
, glibc, glib, openssl, tpm2-tss
, gtk3, gnome, polkit, polkit_gnome
, gtk3, gnome-keyring, polkit, polkit_gnome
}:
let
pname = "beyond-identity";
version = "2.97.0-0";
libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome.gnome-keyring polkit polkit_gnome ]);
libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome-keyring polkit polkit_gnome ]);
meta = with lib; {
description = "Passwordless MFA identities for workforces, customers, and developers";
homepage = "https://www.beyondidentity.com";
@ -73,7 +73,7 @@ in buildFHSEnv {
targetPkgs = pkgs: [
beyond-identity
glib glibc openssl tpm2-tss
gtk3 gnome.gnome-keyring
gtk3 gnome-keyring
polkit polkit_gnome
];