commit d134bcf77db70b31f887176ebc6a3f0a8e6b9b52
parent dc25ee46b225149b4368c0091d16e46f1664e64d
Author: Yuval Langer <yuval.langer@gmail.com>
Date: Thu, 30 May 2024 22:57:51 +0300
Fix some badly defined home-pages and git urls and run `guix style -f kakafarm/packages/*.scm`.
Diffstat:
4 files changed, 147 insertions(+), 136 deletions(-)
diff --git a/kakafarm/packages/emacs-xyz.scm b/kakafarm/packages/emacs-xyz.scm
@@ -18,7 +18,8 @@
;;; <http://www.gnu.org/licenses/>.
(define-module (kakafarm packages emacs-xyz)
- #:use-module ((guix licenses) #:prefix license:)
+ #:use-module ((guix licenses)
+ #:prefix license:)
#:use-module (gnu packages speech)
#:use-module (gnu packages)
#:use-module (guix build-system emacs)
@@ -29,10 +30,13 @@
(define-public emacs-nano-tts-minor-mode
(let ((commit "52a3ffa5833bdda79eb36e5048fe97c1b59eb9f2")
(base32-string "15lzcd95zadd8wbzl5zdn72rad41mga2qqz34dc0sp8xgfwg3krh")
- (git-repository-url "https://codeberg.org/kakafarm/emacs-nano-tts-minor-mode"))
+ (version "1.0.0")
+ (revision "1")
+ (git-repository-url
+ "https://codeberg.org/kakafarm/emacs-nano-tts-minor-mode"))
(package
(name "emacs-nano-tts-minor-mode")
- (version "1.0.0")
+ (version (git-version version revision commit))
(source
(origin
(method git-fetch)
@@ -45,7 +49,8 @@
(build-system emacs-build-system)
(inputs (list espeak-ng))
(home-page git-repository-url)
- (synopsis "Text-to-speech accessibility tool which reads aloud the active region")
+ (synopsis
+ "Text-to-speech accessibility tool which reads aloud the active region")
(description
"A text-to-speech accessibility tool which reads aloud the active region.
@@ -54,27 +59,31 @@ Speaking is done using espeak-ng.")
(define-public emacs-greader-mode
(let ((commit "336b9b3608cf24c7cd20f7d32e2fe05e3c9f5150")
- (revision "1" ))
+ (revision "1")
+ (git-repository-url
+ "https://gitlab.com/michelangelo-rodriguez/greader"))
(package
(name "emacs-greader-mode")
(version (git-version "0.9.21" revision commit))
- (home-page "https://gitlab.com/michelangelo-rodriguez/greader")
+ (home-page git-repository-url)
(source
(origin
- (uri (git-reference
- (url home-page)
- (commit commit)))
- (method git-fetch)
- (patches (search-patches "kakafarm/packages/patches/emacs-greader-mode-0.9.21-require-greader-espeaker.patch"))
- (file-name (git-file-name name version))
- (sha256
- (base32 "14gkx685nkkf1jad7rg4ybl13p64piljxjba8xp3n0zzq6g7dnrc"))))
+ (uri (git-reference
+ (url git-repository-url)
+ (commit commit)))
+ (method git-fetch)
+ (patches (search-patches
+ "kakafarm/packages/patches/emacs-greader-mode-0.9.21-require-greader-espeaker.patch"))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "14gkx685nkkf1jad7rg4ybl13p64piljxjba8xp3n0zzq6g7dnrc"))))
(build-system emacs-build-system)
(inputs (list espeak-ng))
- (synopsis "greader - gnamù reader, send buffer contents to a speech engine")
+ (synopsis
+ "Gnamù Reader - greader-mode, send buffer contents to a speech engine")
(description
"Greader is a module that allows you to send any emacs buffer to a TTS.
-A text-to-speech like engine `espeak-ng' or `speech-dispatcher'are
+A text-to-speech like engine @code{espeak-ng} or @code{speech-dispatcher} are
already supported, plus limited bakend support native to macOS. The
mode supports timer reading, automatic scrolling of buffers in modes
like `info-mode', repeating reading of regions or the whole buffer,
@@ -84,10 +93,12 @@ pronunciations, and other features.")
(define-public emacs-super-duper-yes-or-no
(let ((commit "26eeb8655d20c10847437e985f021ab0772e76dd")
- (git-repository-url "https://codeberg.org/kakafarm/emacs-super-duper-yes-or-no"))
+ (revision "1")
+ (git-repository-url
+ "https://codeberg.org/kakafarm/emacs-super-duper-yes-or-no"))
(package
(name "emacs-super-duper-yes-or-no")
- (version "1.0.0")
+ (version (git-version "1.0.0" revision commit))
(source
(origin
(method git-fetch)
diff --git a/kakafarm/packages/guile-xyz.scm b/kakafarm/packages/guile-xyz.scm
@@ -46,7 +46,7 @@
#:use-module (guix packages))
(define-public guile-clipboard-speaker
- (let ((commit-string "ba5fa866087b93fae966640eed37387ea5a74e32")
+ (let ((commit "ba5fa866087b93fae966640eed37387ea5a74e32")
(base32-string "1q8c1x0ansx9519lry9spl923bzc9yrs675fyjmxkhyrwi52i8p2")
(git-repository-url
"https://codeberg.org/kakafarm/guile-clipboard-speaker/"))
@@ -57,7 +57,7 @@
(origin
(uri (git-reference
(url git-repository-url)
- (commit commit-string)))
+ (commit commit)))
(method git-fetch)
(file-name (git-file-name name version))
(sha256
@@ -186,34 +186,39 @@ 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)
+ (let ((version "0.0.1")
+ (revision "1")
+ (commit "db81a114cd3e23375f024baec15482614ec90453")
+ (git-repository-url
+ "https://github.com/scheme-requests-for-implementation/srfi-133"))
+ (package
+ (name "guile-srfi-133")
+ (version (git-version version revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/scheme-requests-for-implementation/srfi-133")
+ (commit commit)))
+ (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
@@ -246,56 +251,60 @@ demonstrated in 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 gnu:packages:guile: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 gnu:packages:guile:guile-3.0))
+ (home-page git-repository-url)
+ (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)
+ (let ((version "0.0.1")
+ (revision "1")
+ (commit "c3f580d220778cd71492aba4fdd0c7040968e705")
+ (git-repository-url
+ "https://github.com/scheme-requests-for-implementation/srfi-232"))
+ (package
+ (name "guile-srfi-232")
+ (version (git-version version revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/scheme-requests-for-implementation/srfi-232")
+ (commit commit)))
+ (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 gnu:packages:guile: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 gnu:packages:guile:guile-3.0))
+ (home-page git-repository-url)
+ (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,
@@ -303,7 +312,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.
diff --git a/kakafarm/packages/rust-apps.scm b/kakafarm/packages/rust-apps.scm
@@ -20,7 +20,8 @@
(define-module (kakafarm packages rust-apps)
#:use-module (guix build-system cargo)
#:use-module (guix download)
- #:use-module ((guix licenses) #:prefix license:)
+ #:use-module ((guix licenses)
+ #:prefix license:)
#:use-module (guix packages)
#:use-module (gnu packages crates-io))
@@ -32,11 +33,9 @@
(origin
(method url-fetch)
(uri (crate-uri "diceware_wordlists" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "1sx1lbw5z0bvm9d1z0mkpz5d0k7b6f2wwga2il78jfnk7j2f6sw2"))))
+ (base32 "1sx1lbw5z0bvm9d1z0mkpz5d0k7b6f2wwga2il78jfnk7j2f6sw2"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-serde" ,rust-serde-1))))
@@ -56,18 +55,15 @@ Featuring the Reinhold and Beale Diceware wordlists, the EFF wordlists, and Mini
(origin
(method url-fetch)
(uri (crate-uri "diceware" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "082l4a444qq9scmnc25kqp11v02gv3yms1q8ysrhsirb04fvjy6y"))))
+ (base32 "082l4a444qq9scmnc25kqp11v02gv3yms1q8ysrhsirb04fvjy6y"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
- (("rust-rusty-diceware-wordlists" ,rust-rusty-diceware-wordlists)
- ("rust-getopts" ,rust-getopts-0.2)
- ("rust-rand" ,rust-rand-0.8)
- ("rust-rand-chacha" ,rust-rand-chacha-0.3))))
+ `(#:cargo-inputs (("rust-rusty-diceware-wordlists" ,rust-rusty-diceware-wordlists)
+ ("rust-getopts" ,rust-getopts-0.2)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rand-chacha" ,rust-rand-chacha-0.3))))
(home-page "https://gitlab.com/yuvallangerontheroad/rusty-diceware")
(synopsis "A command line diceware, with or without dice")
(description
diff --git a/kakafarm/packages/texinfo-documents.scm b/kakafarm/packages/texinfo-documents.scm
@@ -19,8 +19,11 @@
(define-module (kakafarm packages texinfo-documents)
#:use-module (gnu packages base)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages bash)
#:use-module (gnu packages perl-compression)
+ #:use-module (gnu packages perl)
#:use-module (gnu packages tex)
#:use-module (gnu packages texinfo)
@@ -33,15 +36,16 @@
(define-public (r7rs-small-texinfo target-format)
(let ((commit "38a703976ea6353e32b52a5187dbdaf77fb2f050")
- (revision "3"))
+ (revision "3")
+ (git-repository-url "https://codeberg.org/Zipheir/r7rs-small-texinfo/"))
(package
(name (string-append "r7rs-small-" target-format))
(version (git-version "0.1.0" revision commit))
- (home-page "https://codeberg.org/Zipheir/r7rs-small-texinfo/")
+ (home-page git-repository-url)
(source
(origin
(uri (git-reference
- (url home-page)
+ (url git-repository-url)
(commit commit)))
(method git-fetch)
(file-name (git-file-name name version))
@@ -52,7 +56,13 @@
perl-archive-zip
texinfo
texlive-scheme-small
- texlive-texinfo))
+ texlive-texinfo
+ sed
+ grep
+ perl
+ which
+ pkg-config
+ gettext-minimal))
(inputs '())
(build-system copy-build-system)
(arguments
@@ -63,40 +73,25 @@
#$target-format
"/")))
#:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'compile-the-files
+ (add-after 'patch-source-shebangs 'compile-the-files
(lambda _
- (let* ((source-directory-path (string-append (getcwd)
- "/doc/r7rs-small"))
- (target-directory-path (string-append #$output
- "/share/"
- #$target-format)))
- (chdir source-directory-path)
- (system* "bash" "build.sh"
- #$target-format)
- (mkdir-p target-directory-path)
- (copy-file (string-append "r7rs-small."
- #$target-format)
- (string-append target-directory-path
- "/r7rs-small."
- #$target-format))))))))
+ (chdir "doc/r7rs-small")
+ (system* "makeinfo" "--help")
+ (system* "bash" "build.sh"
+ #$target-format))))))
(synopsis (string-append
"R7RS Small standard of the Scheme programming language in "
target-format " format"))
(description (string-append
- "Revised^7 Report of the Algorithmic Language Scheme adapted to Texinfo format.
-
-This package installs the "
+ "Revised^7 Report of the Algorithmic Language Scheme adapted to Texinfo format. This package installs the "
target-format " version of the document."))
(license (non-copyleft "file://COPYING")))))
+(define-public r7rs-small-epub
+ (r7rs-small-texinfo "epub"))
+(define-public r7rs-small-html
+ (r7rs-small-texinfo "html"))
(define-public r7rs-small-info
(r7rs-small-texinfo "info"))
-
(define-public r7rs-small-pdf
(r7rs-small-texinfo "pdf"))
-
-(define-public r7rs-small-html
- (r7rs-small-texinfo "html"))
-
-(define-public r7rs-small-epub
- (r7rs-small-texinfo "epub"))
