From fbf13b49fb5e38a1fba5aea5a3f37e18604e3d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 14 Feb 2023 23:32:20 +0100 Subject: [PATCH 1/2] libgnome-keyring: don't set name --- pkgs/desktops/gnome/core/libgnome-keyring/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index 9d2e3d4eff74..b12e1ad37c71 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -2,15 +2,12 @@ , testers }: -let +stdenv.mkDerivation (finalAttrs: { pname = "libgnome-keyring"; version = "3.12.0"; -in -stdenv.mkDerivation (finalAttrs: { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libgnome-keyring/${lib.versions.majorMinor finalAttrs.version}/libgnome-keyring-${finalAttrs.version}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; From 5ea14c1fb4fbc2ccf21edb1cc958cb4dc1103265 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 14 Feb 2023 23:53:00 +0100 Subject: [PATCH 2/2] libgnome-keyring: remove maintainers It has been deprecated for years and is not really maintained. --- pkgs/desktops/gnome/core/libgnome-keyring/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index b12e1ad37c71..f6d2eb4bf63a 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; pkgConfigModules = [ "gnome-keyring-1" ]; - inherit (glib.meta) platforms maintainers; + platforms = lib.platforms.unix; + maintainers = []; longDescription = '' gnome-keyring is a program that keeps password and other secrets for