summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2022-11-25 14:44:27 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2022-11-25 14:46:15 +0100
commit7e0ad0dd0f2829d6f3776648ba7c88acf9888d7a (patch)
treee34f84668c2eeb2b42527f98ef2c39395051ae49
parent78ee6dcfe13c1561ff1d5cdfc2c2d4fa8afe0883 (diff)
downloadguix-7e0ad0dd0f2829d6f3776648ba7c88acf9888d7a.tar.gz
gnu: docker: Fix tests.
Fixes <https://issues.guix.gnu.org/59551>.
Reported by Edison Ibáñez <arkhan@riseup.net>

* gnu/packages/linux.scm (xfsprogs-5.9): New variable.
* gnu/packages/docker.scm (docker)[inputs]: Replace xfsprogs by xfsprogs-5.9.
-rw-r--r--gnu/packages/docker.scm2
-rw-r--r--gnu/packages/linux.scm14
2 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 184280b38f..7d109dc94c 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -580,7 +580,7 @@ runcexecutor/executor.go"
            util-linux
            lvm2
            tini
-           xfsprogs
+           xfsprogs-5.9
            xz))
     (native-inputs
      (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8727ddd76a..c032fb8c32 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8550,6 +8550,20 @@ file systems.")
     ;; licensed under lgpl2.1. the other stuff is licensed under gpl2.
     (license (list license:gpl2 license:lgpl2.1))))
 
+(define-public xfsprogs-5.9
+  (package
+    (inherit xfsprogs)
+    (name "xfsprogs")
+    (version "5.9.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://kernel.org/linux/utils/fs/xfs/xfsprogs/"
+                    "xfsprogs-" version ".tar.gz"))
+              (sha256
+               (base32
+                "13xkn9jpmwp4fm9r68vhgznkmxhnv83n2b39mhy2qdaph90w2a1l"))))))
+
 (define-public xfsprogs/static
   (package
     (inherit xfsprogs)