From a4d3f9cc667af18f7efc17dedd31770f4dbcfbca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Lopez?= Date: Thu, 18 Dec 2025 22:22:39 +0100 Subject: [PATCH] gnu: secrets: Move to (gnu packages gnome-circle). * gnu/packages/gnome-circle.scm (secrets): New variable. * gnu/packages/gnome.scm (secrets): Replace with deprecated alias. Change-Id: I07c65ddca922358998174b8313ecb9b8306c3d5a Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-circle.scm | 64 +++++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 63 ++-------------------------------- 2 files changed, 66 insertions(+), 61 deletions(-) diff --git a/gnu/packages/gnome-circle.scm b/gnu/packages/gnome-circle.scm index c18cf495f80..48733eaf7a1 100644 --- a/gnu/packages/gnome-circle.scm +++ b/gnu/packages/gnome-circle.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019-2022 Liliana Marie Prikler ;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2019, 2024, 2025 Giacomo Leidi +;;; Copyright © 2020 raingloom ;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2023 Dominik Delgado Steuter @@ -46,6 +47,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages linux) + #:use-module (gnu packages password-utils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) @@ -599,3 +601,65 @@ integrate seamlessly with the GNOME desktop.") File Shredder, it uses the GNU Core Utility called shred to securely delete files.") (license license:gpl3+))) + +(define-public secrets + (package + (name "secrets") + (version "6.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/secrets") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11jd9f0d3fyrs29p8cyzb6i2ib6mzhwwvjnznl55gkggrgnrcb8z")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:imported-modules `(,@%meson-build-system-modules + (guix build python-build-system)) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-postinstall-script + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")) + (setenv "DESTDIR" "/"))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/secrets") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") + ,(python:site-packages inputs outputs))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + (native-inputs + (list desktop-file-utils + gettext-minimal + `(,glib "bin") + gobject-introspection + pkg-config)) + (inputs + (list bash-minimal + glib + gsettings-desktop-schemas + gtk + libadwaita + libhandy + libpwquality + python + python-pygobject + python-pykeepass + python-pyotp)) + (home-page "https://gitlab.gnome.org/World/secrets") + (synopsis "Password manager for the GNOME desktop") + (description + "Secrets is a password manager which makes use of the KeePass v4 +format. It integrates perfectly with the GNOME desktop and provides an easy +and uncluttered interface for the management of password databases.") + (license license:gpl3+))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 871644200bb..8129631b77e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11691,67 +11691,8 @@ photo-booth-like software, such as Cheese.") apply fancy special effects and lets you share the fun with others.") (license license:gpl2+)))) -(define-public secrets - (package - (name "secrets") - (version "6.5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.gnome.org/World/secrets") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "11jd9f0d3fyrs29p8cyzb6i2ib6mzhwwvjnznl55gkggrgnrcb8z")))) - (build-system meson-build-system) - (arguments - (list - #:glib-or-gtk? #t - #:imported-modules `(,@%meson-build-system-modules - (guix build python-build-system)) - #:modules '((guix build meson-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'disable-postinstall-script - (lambda _ - (substitute* "meson.build" - (("gtk_update_icon_cache: true") - "gtk_update_icon_cache: false")) - (setenv "DESTDIR" "/"))) - (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/secrets") - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") - ,(python:site-packages inputs outputs))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) - (native-inputs - (list desktop-file-utils - gettext-minimal - `(,glib "bin") - gobject-introspection - pkg-config)) - (inputs - (list bash-minimal - glib - gsettings-desktop-schemas - gtk - libadwaita - libhandy - libpwquality - python - python-pygobject - python-pykeepass - python-pyotp)) - (home-page "https://gitlab.gnome.org/World/secrets") - (synopsis "Password manager for the GNOME desktop") - (description - "Secrets is a password manager which makes use of the KeePass v4 -format. It integrates perfectly with the GNOME desktop and provides an easy -and uncluttered interface for the management of password databases.") - (license license:gpl3+))) +(define-deprecated/public-alias secrets + (@ (gnu packages gnome-circle) secrets)) (define-public sound-juicer (package