commit 44322284643c916c8cc62b3387c5e304a7cb7b04
parent 0bb30caa43d4187aaaf4ccca9654fb7a1bac2f98
Author: Yuval Langer <yuval.langer@gmail.com>
Date: Sat, 10 Feb 2024 13:27:39 +0200
Add some more contact data to `README.md`. Update guile-rsv package definition and fix indentation.
Diffstat:
2 files changed, 189 insertions(+), 183 deletions(-)
diff --git a/README.md b/README.md
@@ -1,5 +1,9 @@
# Kaka Farm's contributions to the world of GNU Guix.
+## Contributions:
+
Tips, bug reports, suggestions, death threats, love letters, and
theories of global (or local) conspiracies go to
-<mailto:yuval.langer@gmail.com>.
+<mailto:yuval.langer@gmail.com>. You can also bug me on
+<https://libera.chat/> where I go by `cow_2001` or on the Matrix
+federation where I go by `@falconstinker:matrix.org`
diff --git a/kakafarm/packages/guile-xyz.scm b/kakafarm/packages/guile-xyz.scm
@@ -19,161 +19,163 @@
(base32-string "1q8c1x0ansx9519lry9spl923bzc9yrs675fyjmxkhyrwi52i8p2")
(git-repository-url "https://codeberg.org/kakafarm/guile-clipboard-speaker/"))
(package
- (name "guile-clipboard-speaker")
- (version "1.0.1")
- (source
- (origin
- (uri (git-reference
- (url git-repository-url)
- (commit commit-string)))
- (method git-fetch)
- (file-name (git-file-name name version))
- (sha256 (base32 base32-string))))
- (native-inputs
- (list guile-3.0))
- (inputs
- (list bash
- coreutils
- espeak-ng
- guile-3.0
- guile-config
- guile-srfi-145
- guile-srfi-180
- util-linux
- xsel))
- (build-system guile-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases
- %standard-phases
- (add-after 'install 'link-and-wrap-executable
- (lambda _
- (let* ((bin (string-append #$output "/bin"))
- (script (string-append bin "/clipboard-speaker"))
- (site-version (target-guile-effective-version))
- (scm (string-append "/share/guile/site/"
- site-version))
- (go (string-append "/lib/guile/"
- site-version
- "/site-ccache"))
- (guile-config #$(this-package-input "guile-config"))
- (guile-srfi-145 #$(this-package-input "guile-srfi-145"))
- (guile-srfi-180 #$(this-package-input "guile-srfi-180")))
- (mkdir-p bin)
- (symlink (string-append #$output scm "/clipboard-speaker.scm")
- script)
- (wrap-program script #:sh (which "bash")
- `("GUILE_LOAD_PATH" prefix
- (,(string-append #$output scm)
- ,(string-append guile-config scm)
- ,(string-append guile-srfi-145 scm)
- ,(string-append guile-srfi-180 scm)))
- `("GUILE_LOAD_COMPILED_PATH" prefix
- (,(string-append #$output go)
- ,(string-append guile-config go)
- ,(string-append guile-srfi-145 go)
- ,(string-append guile-srfi-180 go))))))))))
- (home-page git-repository-url)
- (synopsis "Accessibility tool that reads the contents of your clipboard buffer")
- (description "This package installs the clipboard-speaker executable.
+ (name "guile-clipboard-speaker")
+ (version "1.0.1")
+ (source
+ (origin
+ (uri (git-reference
+ (url git-repository-url)
+ (commit commit-string)))
+ (method git-fetch)
+ (file-name (git-file-name name version))
+ (sha256 (base32 base32-string))))
+ (native-inputs
+ (list guile-3.0))
+ (inputs
+ (list bash
+ coreutils
+ espeak-ng
+ guile-3.0
+ guile-config
+ guile-srfi-145
+ guile-srfi-180
+ util-linux
+ xsel))
+ (build-system guile-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases
+ %standard-phases
+ (add-after 'install 'link-and-wrap-executable
+ (lambda _
+ (let* ((bin (string-append #$output "/bin"))
+ (script (string-append bin "/clipboard-speaker"))
+ (site-version (target-guile-effective-version))
+ (scm (string-append "/share/guile/site/"
+ site-version))
+ (go (string-append "/lib/guile/"
+ site-version
+ "/site-ccache"))
+ (guile-config #$(this-package-input "guile-config"))
+ (guile-srfi-145 #$(this-package-input "guile-srfi-145"))
+ (guile-srfi-180 #$(this-package-input "guile-srfi-180")))
+ (mkdir-p bin)
+ (symlink (string-append #$output scm "/clipboard-speaker.scm")
+ script)
+ (wrap-program script #:sh (which "bash")
+ `("GUILE_LOAD_PATH" prefix
+ (,(string-append #$output scm)
+ ,(string-append guile-config scm)
+ ,(string-append guile-srfi-145 scm)
+ ,(string-append guile-srfi-180 scm)))
+ `("GUILE_LOAD_COMPILED_PATH" prefix
+ (,(string-append #$output go)
+ ,(string-append guile-config go)
+ ,(string-append guile-srfi-145 go)
+ ,(string-append guile-srfi-180 go))))))))))
+ (home-page git-repository-url)
+ (synopsis "Accessibility tool that reads the contents of your clipboard buffer")
+ (description "This package installs the clipboard-speaker executable.
An accessibility tool that reads the contents of the clipboard. I can
read the current selection or the clipboard. Select a bunch of text,
press a keybinding / shortcut you've set in the windows manager, and
clipboard-speaker would read that aloud.")
- (license license:agpl3+))))
+ (license license:agpl3+))))
(define-public guile-rsv
- (let ((commit-string "68837a803097567f1739c045745aeb08c93ae0dd")
- (base32-string "11zjmxgwhnbf193af9yxv9g3qb80haca1qm4gbkxnyv6409g2882")
+ (let ((commit "41b04c85eef31d4d51001c6d66e8fd339fcc614c")
+ (revision "1")
+ (base32-string "1w9jbkpmh13zrxkj915nm3l537smm0jsrdzrzcxylb6w59vqpw6l")
(git-repository-url "https://codeberg.org/kakafarm/guile-rsv/"))
(package
(name "guile-rsv")
- (version "0.2.0")
+ (version (git-version "0.2.0" revision commit))
(source
(origin
(uri (git-reference
(url git-repository-url)
- (commit commit-string)))
+ (commit commit)))
(method git-fetch)
(file-name (git-file-name name version))
- (sha256 (base32 base32-string))))
- (inputs
- (list guile-3.0
- bash))
+ (sha256
+ (base32 base32-string))))
+ (inputs (list guile-3.0 bash))
(build-system guile-build-system)
(arguments
(list
- #:phases
- #~(modify-phases
- %standard-phases
- (add-after 'install 'link-and-wrap-executable
- (lambda _
- (let* ([bin (string-append #$output
- "/bin")] ;; bin directory for PATH.
- [site-version (target-guile-effective-version)]
- [scm (string-append "/share/guile/site/"
- site-version)]
- [go (string-append "/lib/guile/"
- site-version
- "/site-ccache")])
- (mkdir-p bin)
- (for-each (lambda (command-name)
- (let ((source-script (string-append
- #$output
- scm
- "/"
- command-name
- ".scm"))
- (target-command (string-append
- bin
- "/"
- command-name)))
- (symlink source-script target-command)
- (wrap-program target-command
- #:sh (which "bash")
- `("GUILE_LOAD_PATH" prefix
- (,(string-append #$output scm)))
- `("GUILE_LOAD_COMPILED_PATH" prefix
- (,(string-append #$output go))))))
- (list "scm2rsv" "rsv2scm"))))))))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'link-and-wrap-executable
+ (lambda _
+ (let* ((bin (string-append #$output "/bin"))
+ ;; bin directory for PATH.
+ (site-version (target-guile-effective-version))
+ (scm (string-append "/share/guile/site/"
+ site-version))
+ (go (string-append "/lib/guile/" site-version
+ "/site-ccache")))
+ (mkdir-p bin)
+ (for-each (lambda (command-name)
+ (let ((source-script (string-append #$output
+ scm "/"
+ command-name
+ ".scm"))
+ (target-command (string-append
+ bin "/"
+ command-name)))
+ (symlink source-script target-command)
+ (wrap-program target-command
+ #:sh (which "bash")
+ `("GUILE_LOAD_PATH" prefix
+ (,(string-append #$output scm)))
+ `("GUILE_LOAD_COMPILED_PATH" prefix
+ (,(string-append #$output go))))))
+ (list "scm2rsv" "rsv2scm"))))))))
(home-page git-repository-url)
- (synopsis "R7RS Scheme library for reading and writing RSV data format")
- (description "R7RS Scheme library for reading and writing RSV (Rows of String
-Values) data format. Specified in
-https://github.com/Stenway/RSV-Specification and demonstrated in
-https://www.youtube.com/watch?v=tb_70o6ohMA.")
- (license (list license:gpl3+
- license:expat-0)))))
+ (synopsis
+ "Library for reading and writing Rows of String Values data format")
+ (description
+ "R7RS-small Scheme library for reading and writing RSV (Rows of String
+Values) data format, a very simple binary format for storing tables of
+strings. It is a competitor for e.g. CSV (Comma Seperated Values),
+and TSV (Tab Separated Values). Its main benefit is that the strings
+are represented as Unicode encoded as UTF-8, and the value and row
+separators are byte values that are never used in UTF-8, so the
+strings do not need any error prone escaping and thus can be written
+and read verbatim.
+
+Specified in https://github.com/Stenway/RSV-Specification and
+demonstrated in https://www.youtube.com/watch?v=tb_70o6ohMA.")
+ (license (list license:gpl3+ license:expat-0)))))
(define-public guile-srfi-133
(package
- (name "guile-srfi-133")
- (version "0.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/scheme-requests-for-implementation/srfi-133")
- (commit "db81a114cd3e23375f024baec15482614ec90453")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0a7srl72291yah0aj6rwddhj041v2spximhknjj7hczlparsrm7f"))))
- (build-system guile-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases
- %standard-phases
- (add-after 'unpack 'move-create-and-delete-files
- (lambda _
- (rename-file "vectors" "srfi")
- (rename-file "srfi/vectors-test.scm" "srfi/srfi-test.scm")
- (rename-file "srfi/vectors-impl.scm" "srfi/srfi-impl.scm")
- (with-output-to-file "srfi/srfi-133.scm"
- (lambda ()
- (display "(define-module (srfi srfi-133)
+ (name "guile-srfi-133")
+ (version "0.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/scheme-requests-for-implementation/srfi-133")
+ (commit "db81a114cd3e23375f024baec15482614ec90453")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0a7srl72291yah0aj6rwddhj041v2spximhknjj7hczlparsrm7f"))))
+ (build-system guile-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases
+ %standard-phases
+ (add-after 'unpack 'move-create-and-delete-files
+ (lambda _
+ (rename-file "vectors" "srfi")
+ (rename-file "srfi/vectors-test.scm" "srfi/srfi-test.scm")
+ (rename-file "srfi/vectors-impl.scm" "srfi/srfi-impl.scm")
+ (with-output-to-file "srfi/srfi-133.scm"
+ (lambda ()
+ (display "(define-module (srfi srfi-133)
#:replace (;; Constructors
vector-copy
@@ -206,61 +208,61 @@ https://www.youtube.com/watch?v=tb_70o6ohMA.")
vector->string string->vector))
(include \"srfi-impl.scm\")")))
- (for-each (lambda (filename)
- (delete-file filename))
- '("tests/run.scm"
- "srfi/vectors.sld"
- "srfi/vectors.scm")))))))
- (native-inputs
- (list guile-3.0))
- (home-page "https://github.com/scheme-requests-for-implementation/srfi-133")
- (synopsis "Vector Library (R7RS-compatible)")
- (description
- "A comprehensive library of vector operations.")
- (license license:expat)))
+ (for-each (lambda (filename)
+ (delete-file filename))
+ '("tests/run.scm"
+ "srfi/vectors.sld"
+ "srfi/vectors.scm")))))))
+ (native-inputs
+ (list guile-3.0))
+ (home-page "https://github.com/scheme-requests-for-implementation/srfi-133")
+ (synopsis "Vector Library (R7RS-compatible)")
+ (description
+ "A comprehensive library of vector operations.")
+ (license license:expat)))
(define-public guile-srfi-232
(package
- (name "guile-srfi-232")
- (version "0.0.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/scheme-requests-for-implementation/srfi-232")
- (commit "c3f580d220778cd71492aba4fdd0c7040968e705")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0lp4zcqjjj6hwfh3ix71wak1nffgg4npzsg7cdxfn9hf6iwf9xby"))))
- (build-system guile-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases
- %standard-phases
- (add-after 'unpack 'move-and-delete-things
- (lambda _
- (let* ((srfi-directory (string-append #$output "/srfi")))
- (mkdir-p "srfi")
- (with-output-to-file "srfi/srfi-232.scm"
- (lambda ()
- (display "(define-library (srfi srfi-232)
+ (name "guile-srfi-232")
+ (version "0.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/scheme-requests-for-implementation/srfi-232")
+ (commit "c3f580d220778cd71492aba4fdd0c7040968e705")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0lp4zcqjjj6hwfh3ix71wak1nffgg4npzsg7cdxfn9hf6iwf9xby"))))
+ (build-system guile-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases
+ %standard-phases
+ (add-after 'unpack 'move-and-delete-things
+ (lambda _
+ (let* ((srfi-directory (string-append #$output "/srfi")))
+ (mkdir-p "srfi")
+ (with-output-to-file "srfi/srfi-232.scm"
+ (lambda ()
+ (display "(define-library (srfi srfi-232)
(export curried define-curried)
(import (only (guile) import)
(scheme base))
(include \"../srfi-232.scm\"))")))
- (for-each (lambda (filename)
- (delete-file filename))
- '("test-body.scm"
- "test-chibi.scm"
- "test-srfi-64.scm"))))))))
- (native-inputs
- (list guile-3.0))
- (home-page "https://github.com/scheme-requests-for-implementation/srfi-232")
- (synopsis "Flexible curried procedures")
- (description
- "Scheme lacks a flexible way to create and apply curried
+ (for-each (lambda (filename)
+ (delete-file filename))
+ '("test-body.scm"
+ "test-chibi.scm"
+ "test-srfi-64.scm"))))))))
+ (native-inputs
+ (list guile-3.0))
+ (home-page "https://github.com/scheme-requests-for-implementation/srfi-232")
+ (synopsis "Flexible curried procedures")
+ (description
+ "Scheme lacks a flexible way to create and apply curried
procedures. This SRFI describes curried, a variant of lambda that
creates true curried procedures which also behave just like ordinary
Scheme procedures. They can be applied to their arguments one by one,
@@ -268,7 +270,7 @@ all at once, or anywhere in between, without any novel syntax.
curried also supports nullary and variadic procedures, and procedures
created with it have predictable behavior when applied to surplus
arguments.")
- (license license:expat)))
+ (license license:expat)))
;;; This allows you to run guix shell -f example.scm.
;;; Remove this line if you just want to define a package.
