[bug#72096] Borg backup 1.4.0 update

[bug#72096] Borg backup 1.4.0 update

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 77 bytes --]

This patch series updates Borg to 1.4.0, along with other requisite
changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#72096] [PATCH 1/2] gnu: xxHash: Update to 0.8.2.

[Leo Famulari]

* gnu/packages/digest.scm (xxhash): Update to 0.8.2.
[arguments]: Remove obsolete build phase 'fix-man-page-links'.

Change-Id: I43b10dd18c70c21de8de50336dfef9f8125519f7
---
 gnu/packages/digest.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm
index 481771804b..ae3bf8da75 100644
--- a/gnu/packages/digest.scm
+++ b/gnu/packages/digest.scm
@@ -69,8 +69,7 @@ (define-public wyhash
 (define-public xxhash
   (package
     (name "xxhash")
-    ;; XXX Remove the 'fix-man-page-links phase when updating.
-    (version "0.8.1")
+    (version "0.8.2")
     (source
      (origin
        (method git-fetch)
@@ -79,7 +78,7 @@ (define-public xxhash
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1h6080lvcr5mpbvy4fhb4i7wvhpy72nrixk3djmpai4hxq41hsnr"))))
+        (base32 "1ljsmxcxfyxzxzk435qnjiyy441bgrxirn285lymyvv39nrwz1wj"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags
@@ -93,12 +92,6 @@ (define-public xxhash
                    (string-append "prefix=" (assoc-ref %outputs "out")))
            #:phases
            #~(modify-phases %standard-phases
-               (add-after 'unpack 'fix-man-page-links
-                 ;; https://github.com/Cyan4973/xxHash/issues/647
-                 (lambda _
-                   (substitute* "Makefile"
-                     (("ln -sf \\$\\(MAN\\)")
-                      "ln -sf xxhsum.1"))))
                (delete 'configure))))         ; no configure script
     (home-page "https://cyan4973.github.io/xxHash/")
     (synopsis "Extremely fast hash algorithm")

base-commit: 3e7ce72d80878d5b3eb161c37ca97fd6ded33b2f
-- 
2.45.2

[bug#72096] [PATCH 2/2] gnu: borg: Update to 1.4.0.

[Leo Famulari]

* gnu/packages/backup.scm (borg): Update to 1.4.0.
[source]: Remove obsolete snippet components.
[arguments]: Export a newly required environment variable in the 'set-env'
phase. Adjust the custom 'install-doc' phase to install miscellaneous
documentation into a directory named after the package name and version.

Change-Id: I688bb4e6c67506226418b6b4a47595f2a10c10ae
---
 gnu/packages/backup.scm | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 637a873fbf..1c79be7078 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -675,14 +675,13 @@ (define-public libchop
 (define-public borg
   (package
     (name "borg")
-    (version "1.2.8")
+    (version "1.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "borgbackup" version))
        (sha256
-        (base32 "1aplj54x6hcyg3mnzscnwi07npy7nrws2246ss25ax6bsaq257fk"))
-       (modules '((guix build utils)))
+        (base32 "0agdyrmj7yy2vn0qghcpq458v9d09q9jvzzrszz6dyj3aqalak65"))
        (snippet
         #~(begin
             ;; Delete files generated by Cython.  We used to have a regex that
@@ -701,11 +700,7 @@ (define-public borg
                         "src/borg/platform/linux.c"
                         "src/borg/platform/posix.c"
                         "src/borg/platform/syncfilerange.c"
-                        "src/borg/platform/windows.c"))
-            ;; Remove bundled shared libraries.
-            (with-directory-excursion "src/borg/algorithms"
-              (for-each delete-file-recursively
-                        (list "lz4" "xxh64" "zstd")))))))
+                        "src/borg/platform/windows.c"))))))
     (build-system python-build-system)
     (arguments
      (list
@@ -716,10 +711,12 @@ (define-public borg
       #~(modify-phases %standard-phases
           (add-after 'unpack 'set-env
             (lambda* (#:key inputs #:allow-other-keys)
-              (let ((openssl #$(this-package-input "openssl"))
+              (let ((acl #$(this-package-input "acl"))
+                    (openssl #$(this-package-input "openssl"))
                     (lz4 #$(this-package-input "lz4"))
                     (xxhash #$(this-package-input "xxhash"))
                     (zstd #$(this-package-input "zstd")))
+                (setenv "BORG_LIBACL_PREFIX" openssl)
                 (setenv "BORG_OPENSSL_PREFIX" openssl)
                 (setenv "BORG_LIBLZ4_PREFIX" lz4)
                 (setenv "BORG_LIBXXHASH_PREFIX" xxhash)
@@ -756,7 +753,8 @@ (define-public borg
           (add-after 'install 'install-doc
             (lambda _
               (let ((man (string-append #$output "/share/man/man1"))
-                    (misc (string-append #$output "/share/borg/misc")))
+                    (misc (string-append #$output "/share/doc/borg-"
+                                         #$(package-version this-package))))
                 (for-each (cut install-file <> misc)
                           '("docs/misc/create_chunker-params.txt"
                             "docs/misc/borg-data-flow.png"
-- 
2.45.2

[bug#72096] [PATCH v--thread=shallow 1/2] gnu: xxHash: Update to 0.8.2.

[Leo Famulari]

* gnu/packages/digest.scm (xxhash): Update to 0.8.2.
[arguments]: Remove obsolete build phase 'fix-man-page-links'.

Change-Id: I43b10dd18c70c21de8de50336dfef9f8125519f7
---
 gnu/packages/digest.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm
index 481771804b..ae3bf8da75 100644
--- a/gnu/packages/digest.scm
+++ b/gnu/packages/digest.scm
@@ -69,8 +69,7 @@ (define-public wyhash
 (define-public xxhash
   (package
     (name "xxhash")
-    ;; XXX Remove the 'fix-man-page-links phase when updating.
-    (version "0.8.1")
+    (version "0.8.2")
     (source
      (origin
        (method git-fetch)
@@ -79,7 +78,7 @@ (define-public xxhash
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1h6080lvcr5mpbvy4fhb4i7wvhpy72nrixk3djmpai4hxq41hsnr"))))
+        (base32 "1ljsmxcxfyxzxzk435qnjiyy441bgrxirn285lymyvv39nrwz1wj"))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags
@@ -93,12 +92,6 @@ (define-public xxhash
                    (string-append "prefix=" (assoc-ref %outputs "out")))
            #:phases
            #~(modify-phases %standard-phases
-               (add-after 'unpack 'fix-man-page-links
-                 ;; https://github.com/Cyan4973/xxHash/issues/647
-                 (lambda _
-                   (substitute* "Makefile"
-                     (("ln -sf \\$\\(MAN\\)")
-                      "ln -sf xxhsum.1"))))
                (delete 'configure))))         ; no configure script
     (home-page "https://cyan4973.github.io/xxHash/")
     (synopsis "Extremely fast hash algorithm")

base-commit: 3e7ce72d80878d5b3eb161c37ca97fd6ded33b2f
-- 
2.45.2

[bug#72096] [PATCH v--thread=shallow 2/2] gnu: borg: Update to 1.4.0.

[Leo Famulari]

* gnu/packages/backup.scm (borg): Update to 1.4.0.
[source]: Remove obsolete snippet components.
[arguments]: Export a newly required environment variable in the 'set-env'
phase. Adjust the custom 'install-doc' phase to install miscellaneous
documentation into a directory named after the package name and version.

Change-Id: I688bb4e6c67506226418b6b4a47595f2a10c10ae
---
 gnu/packages/backup.scm | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 637a873fbf..fbad03ebbc 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -675,14 +675,13 @@ (define-public libchop
 (define-public borg
   (package
     (name "borg")
-    (version "1.2.8")
+    (version "1.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "borgbackup" version))
        (sha256
-        (base32 "1aplj54x6hcyg3mnzscnwi07npy7nrws2246ss25ax6bsaq257fk"))
-       (modules '((guix build utils)))
+        (base32 "0agdyrmj7yy2vn0qghcpq458v9d09q9jvzzrszz6dyj3aqalak65"))
        (snippet
         #~(begin
             ;; Delete files generated by Cython.  We used to have a regex that
@@ -701,11 +700,7 @@ (define-public borg
                         "src/borg/platform/linux.c"
                         "src/borg/platform/posix.c"
                         "src/borg/platform/syncfilerange.c"
-                        "src/borg/platform/windows.c"))
-            ;; Remove bundled shared libraries.
-            (with-directory-excursion "src/borg/algorithms"
-              (for-each delete-file-recursively
-                        (list "lz4" "xxh64" "zstd")))))))
+                        "src/borg/platform/windows.c"))))))
     (build-system python-build-system)
     (arguments
      (list
@@ -716,10 +711,12 @@ (define-public borg
       #~(modify-phases %standard-phases
           (add-after 'unpack 'set-env
             (lambda* (#:key inputs #:allow-other-keys)
-              (let ((openssl #$(this-package-input "openssl"))
+              (let ((acl #$(this-package-input "acl"))
+                    (openssl #$(this-package-input "openssl"))
                     (lz4 #$(this-package-input "lz4"))
                     (xxhash #$(this-package-input "xxhash"))
                     (zstd #$(this-package-input "zstd")))
+                (setenv "BORG_LIBACL_PREFIX" acl)
                 (setenv "BORG_OPENSSL_PREFIX" openssl)
                 (setenv "BORG_LIBLZ4_PREFIX" lz4)
                 (setenv "BORG_LIBXXHASH_PREFIX" xxhash)
@@ -756,7 +753,8 @@ (define-public borg
           (add-after 'install 'install-doc
             (lambda _
               (let ((man (string-append #$output "/share/man/man1"))
-                    (misc (string-append #$output "/share/borg/misc")))
+                    (misc (string-append #$output "/share/doc/borg-"
+                                         #$(package-version this-package))))
                 (for-each (cut install-file <> misc)
                           '("docs/misc/create_chunker-params.txt"
                             "docs/misc/borg-data-flow.png"
-- 
2.45.2

bug#72096: [PATCH v--thread=shallow 2/2] gnu: borg: Update to 1.4.0.

[Leo Famulari]

On Sat, Jul 13, 2024 at 02:14:29PM -0400, Leo Famulari wrote:
> * gnu/packages/backup.scm (borg): Update to 1.4.0.
> [source]: Remove obsolete snippet components.
> [arguments]: Export a newly required environment variable in the 'set-env'
> phase. Adjust the custom 'install-doc' phase to install miscellaneous
> documentation into a directory named after the package name and version.

Pushed as ff4e3b4b0e46207518dc6a93f1ec8b05b543c439