guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit c30da59c0dccb256cd7bdccf61a3a95388f5b115
Author: Noé Lopez <[email protected]>
AuthorDate: Thu Dec 18 21:41:59 2025 +0100
gnu: deja-dup: Move to (gnu packages gnome-circle).
* gnu/packages/gnome-circle.scm (deja-dup): New variable.
* gnu/packages/gnome.scm (deja-dup): Replace with deprecated alias.
Change-Id: I7bbaf8887ed4339f1480b16fc64149902b451f27
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/packages/gnome-circle.scm | 86 +++++++++++++++++++++++++++++++++++++++++++
gnu/packages/gnome.scm | 82 +----------------------------------------
2 files changed, 88 insertions(+), 80 deletions(-)
diff --git a/gnu/packages/gnome-circle.scm b/gnu/packages/gnome-circle.scm
index b493521ab4..577d4198c2 100644
--- a/gnu/packages/gnome-circle.scm
+++ b/gnu/packages/gnome-circle.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2019, 2020, 2022 Marius Bakke <[email protected]>
;;; Copyright © 2019, 2024, 2025 Giacomo Leidi <[email protected]>
;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <[email protected]>
+;;; Copyright © 2020, 2021 Brice Waegeneire <[email protected]>
;;; Copyright © 2025 Noé Lopez <[email protected]>
;;;
;;; This file is part of GNU Guix.
@@ -30,11 +31,14 @@
(define-module (gnu packages gnome-circle)
#:use-module (gnu packages aidc)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages bash)
#:use-module (gnu packages enchant)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnupg)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages haskell-xyz)
@@ -50,6 +54,7 @@
#:use-module (guix build-system cargo)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
+ #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
@@ -120,6 +125,87 @@
It uses pandoc as back-end for parsing Markdown.")
(license license:gpl3)))
+(define-public deja-dup
+ (package
+ (name "deja-dup")
+ (version "45.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
"https://gitlab.gnome.org/World/deja-dup/-/archive/";
+ version "/deja-dup-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "000cwy1haiglkvn5plmhrs2a1fhpcpw6z4mdzck7ybmky795amza"))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:configure-flags
+ #~(list
+ ;; Otherwise, the RUNPATH will lack the final path component.
+ (string-append "-Dc_link_args=-Wl,-rpath="
+ (assoc-ref %outputs "out") "/lib/deja-dup"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((python (assoc-ref inputs "python")))
+ (substitute* '("libdeja/duplicity/DuplicityInstance.vala"
+ "libdeja/tests/scripts/instance-error.test")
+ (("/bin/rm")
+ (which "rm")))
+ (substitute* "libdeja/tests/runner.vala"
+ (("/bin/sh")
+ (which "sh")))
+ (substitute* "libdeja/tests/scripts/instance-error.test"
+ (("`which python3`")
+ (string-append python "/bin/python3"))))))
+ (add-after 'unpack 'patch-libgpg-error
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libgpg-error (assoc-ref inputs "libgpg-error")))
+ (substitute* "meson.build"
+ (("(gpgerror_libs = ).*" _ var)
+ (format #f "~a '-L~a/lib -lgpg-error'\n" var
libgpg-error))))))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Add duplicity to the search path
+ (wrap-program (string-append (assoc-ref outputs "out")
+ "/bin/deja-dup")
+ `("PATH" ":" prefix
+ (,(dirname (search-input-file inputs
"/bin/duplicity"))))))))))
+ (inputs
+ (list bash-minimal
+ duplicity
+ gsettings-desktop-schemas
+ gtk
+ json-glib
+ libadwaita
+ libgpg-error
+ libnotify
+ libsecret
+ libsoup
+ libhandy
+ packagekit
+ python
+ python-pygobject))
+ (native-inputs
+ (list appstream-glib
+ desktop-file-utils
+ gettext-minimal
+ `(,glib "bin") ;for glib-compile-schemas
+ gobject-introspection
+ `(,gtk "bin") ;for gtk-update-icon-cache
+ itstool
+ pkg-config
+ vala))
+ (home-page "https://wiki.gnome.org/Apps/DejaDup";)
+ (synopsis "Simple backup tool, for regular encrypted backups")
+ (description
+ "Déjà Dup is a simple backup tool, for regular encrypted backups. It
+uses duplicity as the backend, which supports incremental backups and storage
+either on a local, or remote machine via a number of methods.")
+ (license license:gpl3+)))
+
(define-public gnome-authenticator
(package
(name "gnome-authenticator")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e7cc9ca8d7..f1d622c984 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1730,86 +1730,8 @@ configuration files for the GNOME menu, as well as a
simple menu editor.")
(home-page "https://gitlab.gnome.org/GNOME/gnome-menus";)
(license license:lgpl2.0+)))
-(define-public deja-dup
- (package
- (name "deja-dup")
- (version "45.2")
- (source (origin
- (method url-fetch)
- (uri (string-append
"https://gitlab.gnome.org/World/deja-dup/-/archive/";
- version "/deja-dup-" version ".tar.bz2"))
- (sha256
- (base32
- "000cwy1haiglkvn5plmhrs2a1fhpcpw6z4mdzck7ybmky795amza"))))
- (build-system meson-build-system)
- (arguments
- (list
- #:glib-or-gtk? #t
- #:configure-flags
- #~(list
- ;; Otherwise, the RUNPATH will lack the final path component.
- (string-append "-Dc_link_args=-Wl,-rpath="
- (assoc-ref %outputs "out") "/lib/deja-dup"))
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((python (assoc-ref inputs "python")))
- (substitute* '("libdeja/duplicity/DuplicityInstance.vala"
- "libdeja/tests/scripts/instance-error.test")
- (("/bin/rm")
- (which "rm")))
- (substitute* "libdeja/tests/runner.vala"
- (("/bin/sh")
- (which "sh")))
- (substitute* "libdeja/tests/scripts/instance-error.test"
- (("`which python3`")
- (string-append python "/bin/python3"))))))
- (add-after 'unpack 'patch-libgpg-error
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((libgpg-error (assoc-ref inputs "libgpg-error")))
- (substitute* "meson.build"
- (("(gpgerror_libs = ).*" _ var)
- (format #f "~a '-L~a/lib -lgpg-error'\n" var
libgpg-error))))))
- (add-after 'install 'wrap-program
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Add duplicity to the search path
- (wrap-program (string-append (assoc-ref outputs "out")
- "/bin/deja-dup")
- `("PATH" ":" prefix
- (,(dirname (search-input-file inputs
"/bin/duplicity"))))))))))
- (inputs
- (list bash-minimal
- duplicity
- gsettings-desktop-schemas
- gtk
- json-glib
- libadwaita
- libgpg-error
- libnotify
- libsecret
- libsoup
- libhandy
- packagekit
- python
- python-pygobject))
- (native-inputs
- (list appstream-glib
- desktop-file-utils
- gettext-minimal
- `(,glib "bin") ;for glib-compile-schemas
- gobject-introspection
- `(,gtk "bin") ;for gtk-update-icon-cache
- itstool
- pkg-config
- vala))
- (home-page "https://wiki.gnome.org/Apps/DejaDup";)
- (synopsis "Simple backup tool, for regular encrypted backups")
- (description
- "Déjà Dup is a simple backup tool, for regular encrypted backups. It
-uses duplicity as the backend, which supports incremental backups and storage
-either on a local, or remote machine via a number of methods.")
- (license license:gpl3+)))
+(define-deprecated/public-alias deja-dup
+ (@ (gnu packages gnome-circle) deja-dup))
(define-public gnome-commander
(package
