diff options
| author |  Tom Willemse | 2024-06-19 21:56:33 -0700 |
|---|---|---|
| committer | Tom Willemse | 2024-06-19 21:56:33 -0700 |
| commit | dbfce1861c6eae64ee1a8710f230c91fe20d6298 (patch) | |
| tree | 699bc69c24978165df281ba26d2241c02619855b | |
| parent | 744b191483ffa08e0cd859e7fa87062a89402f9c (diff) | |
| download | new-dotfiles-dbfce1861c6eae64ee1a8710f230c91fe20d6298.tar.gz new-dotfiles-dbfce1861c6eae64ee1a8710f230c91fe20d6298.zip | |
Remove conflicting definitions of SCSH
Changes that I made were added to Guix some time ago.
| -rw-r--r-- | oni/packages/count-emails.scm | 2 | ||||
| -rw-r--r-- | oni/packages/inbox-size.scm | 2 | ||||
| -rw-r--r-- | oni/packages/scsh.scm | 57 |
3 files changed, 2 insertions, 59 deletions
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)))) |