From e541dd7597a7ffd8c2b707df95a84209c56a43b3 Mon Sep 17 00:00:00 2001
From: Peter Tillemans <pti@melexis.com>
Date: Fri, 17 May 2024 00:10:10 +0200
Subject: [PATCH] remove butler

---
 packages/snam-babashka.scm | 74 +++++++++++++++++++-------------------
 packages/snam-butler.scm   | 63 --------------------------------
 2 files changed, 37 insertions(+), 100 deletions(-)
 delete mode 100644 packages/snam-butler.scm

diff --git a/packages/snam-babashka.scm b/packages/snam-babashka.scm
index 6d5784f..202b5d1 100644
--- a/packages/snam-babashka.scm
+++ b/packages/snam-babashka.scm
@@ -11,43 +11,43 @@
 
 (define-public snam-babashka
   (package
-    (name "snam-babashka")
-    (version "1.3.186")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/borkdude/babashka/releases/download/v" version "/babashka-" version "-linux-amd64.tar.gz"))
-              (sha256
-               (base32
-                 "039ak593vmqrw3yhglfdh8rmvwj2aznwqfy6yvfca1wlk1827c3l"))))
-    (build-system binary-build-system)
-    (supported-systems '("x86_64-linux" "i686-linux"))
-    (arguments
-     `(#:patchelf-plan
-       `(("bb"
-          ("libc" "zlib" "libstdc++")))
-       #:install-plan
-       `(("." ("bb") "bin/"))
-       #:phases
-       (modify-phases %standard-phases
-		      ;; this is required because standard unpack expects
-		      ;; the archive to contain a directory with everything inside it,
-		      ;; while babashka's release .tar.gz only contains the `bb` binary.
-		      (replace 'unpack
-			       (lambda* (#:key inputs #:allow-other-keys)
-					(system* (which "tar")
-						 "-xf"
-						 (assoc-ref inputs "source"))
-					#t)))))
-    (inputs
-      `(("libstdc++" ,(make-libstdc++ gcc))
-        ("zlib" ,zlib)))
-    (native-inputs
-      `(("tar" ,tar)))
-    (synopsis "A Clojure babushka for the grey areas of Bash")
-    (description
-      "The main idea behind babashka is to leverage Clojure in places
+   (name "snam-babashka")
+   (version "1.3.186")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "https://github.com/borkdude/babashka/releases/download/v" version "/babashka-" version "-linux-amd64.tar.gz"))
+            (sha256
+             (base32
+              "039ak593vmqrw3yhglfdh8rmvwj2aznwqfy6yvfca1wlk1827c3l"))))
+   (build-system binary-build-system)
+   (supported-systems '("x86_64-linux" "i686-linux"))
+   (arguments
+    `(#:patchelf-plan
+      `(("bb"
+         ("libc" "zlib" "libstdc++" "gcc:lib")))
+      #:install-plan
+      `(("." ("bb") "bin/"))
+      #:phases
+      (modify-phases %standard-phases
+		     ;; this is required because standard unpack expects
+		     ;; the archive to contain a directory with everything inside it,
+		     ;; while babashka's release .tar.gz only contains the `bb` binary.
+		     (replace 'unpack
+			      (lambda* (#:key inputs #:allow-other-keys)
+				(system* (which "tar")
+					 "-xf"
+					 (assoc-ref inputs "source"))
+				#t)))))
+   (inputs
+    `(("libstdc++" ,(make-libstdc++ gcc))
+      ("zlib" ,zlib)))
+   (native-inputs
+    `(("tar" ,tar)))
+   (synopsis "A Clojure babushka for the grey areas of Bash")
+   (description
+    "The main idea behind babashka is to leverage Clojure in places
 where you would be using bash otherwise.")
-    (home-page "https://github.com/borkdude/babashka")
-    (license license:epl1.0)))
+   (home-page "https://github.com/borkdude/babashka")
+   (license license:epl1.0)))
 
 snam-babashka
diff --git a/packages/snam-butler.scm b/packages/snam-butler.scm
deleted file mode 100644
index b1a1a80..0000000
--- a/packages/snam-butler.scm
+++ /dev/null
@@ -1,63 +0,0 @@
-(define-module (snam-butler)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix utils)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages gcc)
-  #:use-module (nonguix build-system binary))
-
-
-(use-modules (srfi srfi-8)
-             (web client)
-             (web response)
-             (web uri))
-
-(define-public snam-butler
-  (package
-   (name "snam-butler")
-   (version "15.21.0")
-   (source (origin
-            (method url-fetch)
-            (uri (uri->string
-                  (receive (response _txt) (http-get (string-append "https://broth.itch.zone/butler/linux-amd64/" version "/archive/default"))
-                    (response-location response))))
-            (sha256
-             (base32
-              "071frbwjclb0g9gkfh2lxcbkk4c57jhppr8f3dhcgbswvvmgqh5n"))))
-   (build-system binary-build-system)
-   (supported-systems '("x86_64-linux"))
-   (arguments
-    `(#:patchelf-plan
-      `(("butler"
-         ("libc" "zlib" "libstdc++")))
-      #:install-plan
-      `(("." ("butler") "bin/"))
-      #:phases
-      (modify-phases %standard-phases
-        	     ;; this is required because standard unpack expects
-        	     ;; the archive to contain a directory with everything inside it,
-        	     ;; while butler's release .tar.gz only contains the `bb` binary.
-        	     (replace 'unpack
-        		      (lambda* (#:key inputs #:allow-other-keys)
-        			(system* (which "tar")
-        				 "-xzf"
-        				 (assoc-ref inputs "source"))
-        			#t)))
-      ))
-   (inputs
-    `(("zlib" ,zlib)))
-   (native-inputs
-    `(("tar" ,tar)))
-   (synopsis "The tool provided by itch.io to manage your itch.io games and tools")
-   (description
-    "butler is a small command-line tool that lets you:
-
-- Upload builds of your games quickly & reliably to itch.io
-- Generate patches and apply them offline
-- Run a few other utility commands")
-   (home-page "https://itch.io/docs/butler/")
-   (license license:expat)))
-
-snam-butler