From 78bff7ac89a523f6a5a7fcd3866b54ad25314c9d Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Wed, 3 May 2023 17:54:14 +0200
Subject: Update Hashicorp packages

---
 tw/packages/ci.scm | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'tw/packages/ci.scm')

diff --git a/tw/packages/ci.scm b/tw/packages/ci.scm
index 1b118c4c..2a5a517c 100644
--- a/tw/packages/ci.scm
+++ b/tw/packages/ci.scm
@@ -3,7 +3,9 @@
   #:use-module (gnu packages elf)
   #:use-module (guix build-system copy)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix modules)
   #:use-module (guix packages)
   #:use-module (guix utils))
 
@@ -38,12 +40,12 @@ images for multiple platforms from a single source configuration.")
 (define-public hashicorp-consul-bin
   (package
     (name "hashicorp-consul")
-    (version "1.14.4")
+    (version "1.15.2")
     (source
      (origin
        (method url-fetch/zipbomb)
        (uri (hashicorp-download-url "consul" version))
-       (sha256 (base32 "0ypxmnl68fg66rw06g5qldqgyrgkimgk56gspwv1bk797j2pryza"))))
+       (sha256 (base32 "1s8lckdh0vd3dnvdc6hik8li9m44bazkz1fmxrixxpyzz02c5ri1"))))
     (build-system copy-build-system)
     (arguments '(#:install-plan '(("consul" "bin/"))))
     (home-page "https://consul.io/")
@@ -56,12 +58,12 @@ distributed infrastructure.")
 (define-public hashicorp-vault-bin
   (package
     (name "hashicorp-vault")
-    (version "1.12.3")
+    (version "1.13.2")
     (source
      (origin
        (method url-fetch/zipbomb)
        (uri (hashicorp-download-url "vault" version))
-       (sha256 (base32 "1sxiqjq837mvl3r4awsxakyssf4jrcx45xzg0ys8fxp70snmp0pl"))))
+       (sha256 (base32 "0g4vx7gvbb7rsbly490ddihdk5c882jb8r11adydx0c3vrwh54zp"))))
     (build-system copy-build-system)
     (arguments '(#:install-plan '(("vault" "bin/"))))
     (home-page "https://vaultproject.io/")
@@ -77,29 +79,31 @@ log.")
 (define-public hashicorp-nomad-bin
   (package
     (name "hashicorp-nomad")
-    (version "1.4.4")
+    (version "1.5.3")
     (source
      (origin
        (method url-fetch/zipbomb)
        (uri (hashicorp-download-url "nomad" version))
-       (sha256 (base32 "0l73ffffs002jkjfzidj604wzpjf38qfsghyvml7mnn3sz0v9fv3"))))
+       (sha256 (base32 "0ws50gkzpiwjh5js3zr0s98rk9llah973z3ziy1y029xb7ad58cj"))))
     (build-system copy-build-system)
     (arguments
      `(#:install-plan '(("nomad" "bin/"))
        #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-interpreter
-           ;; For some reason, the "nomad" binary has /lib64/ld-linux*.so
-           ;; hardcoded, so fix that.
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((patchelf
-                    (string-append (assoc-ref inputs "patchelf")
-                                   "/bin/patchelf"))
-                   (ld-linux.so
-                    (string-append
-                     (assoc-ref inputs "glibc")
-                     "/lib/ld-" ,(package-version glibc) ".so")))
-               (invoke patchelf "--set-interpreter" ld-linux.so "nomad")))))))
+       ,(with-imported-modules (source-module-closure
+                                '((guix build utils)))
+          #~(modify-phases %standard-phases
+              (add-after 'unpack 'patch-interpreter
+                ;; For some reason, the "nomad" binary has /lib64/ld-linux*.so
+                ;; hardcoded, so fix that.
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (use-modules (guix build utils))
+                  (let ((patchelf
+                         (search-input-file inputs "bin/patchelf"))
+                        (ld-linux.so
+                         ;; TODO: remove hardcoded linux-x86-64.
+                         ;; (%current-target-system) is almost the right format...
+                         (search-input-file inputs "lib/ld-linux-x86-64.so.2")))
+                    (invoke patchelf "--set-interpreter" ld-linux.so "nomad"))))))))
     (inputs (list glibc))
     (native-inputs (list patchelf))
     (home-page "https://nomadproject.io/")
-- 
cgit v1.2.3