From dbfce1861c6eae64ee1a8710f230c91fe20d6298 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Wed, 19 Jun 2024 21:56:33 -0700
Subject: [PATCH] Remove conflicting definitions of SCSH

Changes that I made were added to Guix some time ago.
---
 oni/packages/count-emails.scm |  2 +-
 oni/packages/inbox-size.scm   |  2 +-
 oni/packages/scsh.scm         | 57 -----------------------------------
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 oni/packages/scsh.scm

diff --git a/oni/packages/count-emails.scm b/oni/packages/count-emails.scm
index e35c25e..0f527e8 100644
--- a/oni/packages/count-emails.scm
+++ b/oni/packages/count-emails.scm
@@ -5,7 +5,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
-  #:use-module (oni packages scsh)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages mail))
 
 (define-public count-emails
diff --git a/oni/packages/inbox-size.scm b/oni/packages/inbox-size.scm
index fb9fb7f..f89b05b 100644
--- a/oni/packages/inbox-size.scm
+++ b/oni/packages/inbox-size.scm
@@ -5,7 +5,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
-  #:use-module (oni packages scsh))
+  #:use-module (gnu packages shells))
 
 (define-public (inbox-size emacs)
   (let ((commit "e9a94db05e45be9357ccc757601c1cd890a6254c")
diff --git a/oni/packages/scsh.scm b/oni/packages/scsh.scm
deleted file mode 100644
index dc08654..0000000
--- a/oni/packages/scsh.scm
+++ /dev/null
@@ -1,57 +0,0 @@
-(define-module (oni packages scsh)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages scheme)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix git-download)
-  #:use-module (guix packages))
-
-(define-public scsh
-  (let ((commit "114432435e4eadd54334df6b37fcae505079b49f")
-        (revision "1"))
-    (package
-      (name "scsh")
-      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/scheme/scsh")
-               (commit commit)))
-         (file-name (string-append name "-" version "-checkout"))
-         (sha256
-          (base32
-           "1ghk08akiz7hff1pndi8rmgamgcrn2mv9asbss9l79d3c2iaav3q"))
-         (patches (search-patches "scsh-nonstring-search-path.patch"))))
-      (build-system gnu-build-system)
-      (arguments
-       `(#:test-target "test"
-         #:phases
-         (modify-phases %standard-phases
-           (add-before 'configure 'replace-rx
-             (lambda* (#:key inputs #:allow-other-keys)
-               (let* ((rx (assoc-ref inputs "scheme48-rx"))
-                      (rxpath (string-append rx "/share/scheme48-"
-                                             ,(package-version scheme48)
-                                             "/rx")))
-                 (delete-file-recursively "rx")
-                 (symlink rxpath "rx"))
-               #t)))))
-      (inputs
-       (list scheme48 scheme48-rx))
-      (native-inputs
-       (list autoconf automake))
-      (native-search-paths
-       (list (search-path-specification
-              (variable "SCSH_LIB_DIRS")
-              (separator " ")
-              (files '("share/scsh-0.7")))))
-      (home-page "https://github.com/scheme/scsh")
-      (synopsis "Unix shell embedded in Scheme")
-      (description
-       "Scsh is a Unix shell embedded in Scheme.  Scsh has two main
-components: a process notation for running programs and setting up pipelines
-and redirections, and a complete syscall library for low-level access to the
-operating system.")
-      (license license:bsd-3))))