diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 16:57:37 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 17:15:08 -0400 |
| commit | 3bacd3c76a58ebe70f98be654f09cbd4166093ab (patch) | |
| tree | 89f687565205971a9925d33400235968a569a069 /gnu/packages/backup.scm | |
| parent | df3391c0309443ac37f9a9a6b1038a85454b8ee6 (diff) | |
| parent | 97ed675718b948319e6f6e51f2d577971bea1176 (diff) | |
| download | guix-3bacd3c76a58ebe70f98be654f09cbd4166093ab.tar.gz | |
Merge branch 'master' into core-updates.
Conflicts: gnu/local.mk gnu/packages/build-tools.scm gnu/packages/certs.scm gnu/packages/check.scm gnu/packages/compression.scm gnu/packages/cups.scm gnu/packages/fontutils.scm gnu/packages/gnuzilla.scm gnu/packages/guile.scm gnu/packages/ibus.scm gnu/packages/image-processing.scm gnu/packages/linux.scm gnu/packages/music.scm gnu/packages/nss.scm gnu/packages/pdf.scm gnu/packages/python-xyz.scm gnu/packages/qt.scm gnu/packages/ruby.scm gnu/packages/shells.scm gnu/packages/tex.scm gnu/packages/video.scm gnu/packages/vulkan.scm gnu/packages/web.scm gnu/packages/webkit.scm gnu/packages/wm.scm
Diffstat (limited to 'gnu/packages/backup.scm')
| -rw-r--r-- | gnu/packages/backup.scm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index bb192c7d7d..a218e9caaf 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1245,13 +1245,13 @@ compression parameters used by Gzip.") (define-public borgmatic (package (name "borgmatic") - (version "1.5.22") + (version "1.7.9") (source (origin (method url-fetch) (uri (pypi-uri "borgmatic" version)) (sha256 - (base32 "0pvqlj17vp81i7saxqh5hsaxqz29ldrjd7bcssh4g1h0ikmnaf2r")))) + (base32 "1scfh90qgv8xhafnnpl3pa9d8m4rg9xgvf21yybvmsnm5v1k2x5z")))) (build-system python-build-system) (arguments (list #:phases @@ -1260,10 +1260,15 @@ compression parameters used by Gzip.") (lambda* (#:key inputs #:allow-other-keys) ;; Set absolute store path to borg. (substitute* "borgmatic/commands/borgmatic.py" - (("location\\.get\\('local_path', 'borg'\\)") - (string-append "location.get('local_path', '" + (("\\.get\\('local_path', 'borg'\\)") + (string-append ".get('local_path', '" (search-input-file inputs "bin/borg") - "')"))))) + "')"))) + (substitute* "tests/unit/commands/test_borgmatic.py" + (("(module.get_local_path.+ == )'borg'" all start) + (string-append start "'" + (search-input-file inputs "bin/borg") + "'"))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? |