style: use `guix style --whole-file` to make package definition style more consistent

pull/1/head
anemofilia 2023-09-24 10:26:16 -03:00
parent a09a647e7f
commit 14ba573d53
No known key found for this signature in database
GPG Key ID: 5A8F3D62C87A2B33
8 changed files with 232 additions and 213 deletions

View File

@ -3,7 +3,8 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system copy) #:use-module (guix build-system copy)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses)
#:prefix license:)
#:export (zzz)) #:export (zzz))
(define-public zzz (define-public zzz
@ -12,26 +13,22 @@
(package (package
(name "zzz") (name "zzz")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
(source (source (origin
(origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/void-linux/void-runit")
(url "https://github.com/void-linux/void-runit") (commit commit)))
(commit commit))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "1lgf3maqw2j9hjzq0bkrvbl7vbh4zpppm9cdl9hvf54kbxcn2v9i"))))
"1lgf3maqw2j9hjzq0bkrvbl7vbh4zpppm9cdl9hvf54kbxcn2v9i"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan #~'(("zzz" "bin/")
#~'(("zzz" "bin/") ("zzz.8" "share/man/man8/"))))
("zzz.8" "share/man/man8/"))))
(home-page "https://github.com/void-linux/void-runit") (home-page "https://github.com/void-linux/void-runit")
(synopsis (synopsis "Simple script to suspend or hibernate your computer.")
"Simple script to suspend or hibernate your computer.") (description "Simple script to suspend or hibernate your computer. It
(description
"Simple script to suspend or hibernate your computer. It
suports hooks before and after suspending.") suports hooks before and after suspending.")
(license license:cc0)))) (license license:cc0))))

View File

@ -3,36 +3,50 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system font) #:use-module (guix build-system font)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module ((guix licenses) #:prefix license:)) #:use-module ((guix licenses)
#:prefix license:))
(define-public font-meslo-lg (define-public font-meslo-lg
(package (package
(name "font-meslo-lg") (name "font-meslo-lg")
(version "1.2.1") (version "1.2.1")
(source (source (origin
(origin (file-name "font-meslo-lg")
(file-name "font-meslo-lg") (method url-fetch/zipbomb)
(method url-fetch/zipbomb) (uri (string-append
(uri (string-append "https://github.com/andreberg/Meslo-Font/raw/master/" "https://github.com/andreberg/Meslo-Font/raw/master/"
"dist/v" version "Meslo%20LG%20v" version ".zip")) "dist/v"
(sha256 (base32 "1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h")))) version
(build-system font-build-system) "Meslo%20LG%20v"
(native-inputs (list unzip)) version
(home-page "https://github.com/andreberg/Meslo-Font") ".zip"))
(synopsis "Font for dyslexics and high readability") (sha256
(description "Meslo LG is a customized version of Apples Menlo-Regular font (base32
"1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"))))
(build-system font-build-system)
(native-inputs (list unzip))
(home-page "https://github.com/andreberg/Meslo-Font")
(synopsis "Font for dyslexics and high readability")
(description
"Meslo LG is a customized version of Apples Menlo-Regular font
(which is a customized Bitstream Vera Sans Mono).") (which is a customized Bitstream Vera Sans Mono).")
(license license:silofl1.1))) (license license:silofl1.1)))
(define-public font-meslo-lg-dz (define-public font-meslo-lg-dz
(package (package
(inherit font-meslo-lg) (inherit font-meslo-lg)
(name "font-meslo-lg-dz") (name "font-meslo-lg-dz")
(version (package-version font-meslo-lg)) (version (package-version font-meslo-lg))
(source (source (origin
(origin (file-name "font-meslo-lg-dz")
(file-name "font-meslo-lg-dz") (method url-fetch/zipbomb)
(method url-fetch/zipbomb) (uri (string-append
(uri (string-append "https://github.com/andreberg/Meslo-Font/raw/master/" "https://github.com/andreberg/Meslo-Font/raw/master/"
"dist/v" version "Meslo%20LG%20DZ%20v" version ".zip")) "dist/v"
(sha256 (base32 "0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875")))))) version
"Meslo%20LG%20DZ%20v"
version
".zip"))
(sha256
(base32
"0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"))))))

View File

@ -5,7 +5,8 @@
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (guix build-system guile) #:use-module (guix build-system guile)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module ((guix licenses) #:prefix license:)) #:use-module ((guix licenses)
#:prefix license:))
;; This srfi was originally packaged by Nikita Domnitskii on ;; This srfi was originally packaged by Nikita Domnitskii on
;; https://git.sr.ht/~krevedkokun/dotfiles/tree/master/item/channel/packages/guile.scm ;; https://git.sr.ht/~krevedkokun/dotfiles/tree/master/item/channel/packages/guile.scm
@ -13,121 +14,127 @@
(let ((commit "78ced23a1af519ee2969939138b3ffff442f339a") (let ((commit "78ced23a1af519ee2969939138b3ffff442f339a")
(revision "0")) (revision "0"))
(package (package
(name "guile-srfi-197") (name "guile-srfi-197")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
(source (source (origin
(origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url "https://github.com/ar-nelson/srfi-197")
(url "https://github.com/ar-nelson/srfi-197") (commit commit)))
(commit commit))) (file-name (git-file-name name version))
(file-name (git-file-name name version)) (sha256
(sha256 (base32
(base32 "19kh6zwad6bmhj0wabgbsbkk8l48s6lrgn701afjaab2w0gb30qg")) "19kh6zwad6bmhj0wabgbsbkk8l48s6lrgn701afjaab2w0gb30qg"))
(snippet (snippet #~(begin
#~(begin (use-modules (ice-9 rdelim)
(use-modules (ice-9 rdelim) (ice-9 pretty-print)
(ice-9 pretty-print) (guix build utils))
(guix build utils)) (call-with-input-file "srfi-197-syntax-case.scm"
(call-with-input-file "srfi-197-syntax-case.scm" (lambda (input-port)
(lambda (input-port) (with-output-to-file "tmp.scm"
(with-output-to-file "tmp.scm" (lambda ()
(lambda () (pretty-print '(define-module (srfi
(pretty-print srfi-197)
'(define-module (srfi srfi-197) #:use-module (rnrs base)
#:use-module (rnrs base) #:use-module (rnrs io
#:use-module (rnrs io ports) ports)
#:use-module (rnrs syntax-case) #:use-module (rnrs
#:export (chain syntax-case)
chain-when #:export (chain
chain-and chain-when
chain-lambda chain-and
nest chain-lambda
nest-reverse))) nest
(newline) nest-reverse)))
(let loop () (newline)
(let ((line (read-line input-port))) (let loop
(unless (eof-object? line) ()
(write-line line) (let ((line (read-line input-port)))
(loop)))))))) (unless (eof-object? line)
(mkdir "srfi") (write-line line)
(rename-file "tmp.scm" "srfi/srfi-197.scm") (loop))))))))
(for-each delete-file (mkdir "srfi")
'("srfi-197-syntax-case.scm" (rename-file "tmp.scm" "srfi/srfi-197.scm")
"srfi-197.scm" (for-each delete-file
"srfi-197.sld" '("srfi-197-syntax-case.scm"
"srfi-64-minimal.scm" "srfi-197.scm"
"test-kawa.scm" "srfi-197.sld"
"test-r6rs.scm" "srfi-64-minimal.scm"
"test-r7rs.scm" "test-kawa.scm"
"test.scm")))))) "test-r6rs.scm"
(build-system guile-build-system) "test-r7rs.scm"
(inputs "test.scm"))))))
(list guile-3.0)) (build-system guile-build-system)
(home-page "https://github.com/ar-nelson/srfi-197") (inputs (list guile-3.0))
(synopsis "SRFI 197 pipeline operators port for Guile") (home-page "https://github.com/ar-nelson/srfi-197")
(description (synopsis "SRFI 197 pipeline operators port for Guile")
"This package provides an implementation of SRFI 197 for Guile. (description
"This package provides an implementation of SRFI 197 for Guile.
SRFI 197 defines a large set of clojure-like threading macros for SRFI 197 defines a large set of clojure-like threading macros for
representing nested data structures and code in a more readable way.") representing nested data structures and code in a more readable way.")
(license license:expat)))) (license license:expat))))
(define-public guile-srfi-171 (define-public guile-srfi-171
(let ((commit "40eb284ae54e510013054453890052df603a3a7f") (let ((commit "40eb284ae54e510013054453890052df603a3a7f")
(revision "0")) (revision "0"))
(package (package
(name "guile-srfi-171") (name "guile-srfi-171")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
(source (source (origin
(origin (method git-fetch)
(method git-fetch) (uri (git-reference
(uri (git-reference (url (string-append
(url "https://github.com/scheme-requests-for-implementation/srfi-171") "https://github.com"
(commit commit))) "/scheme-requests-for-implementation/srfi-171"))
(file-name (git-file-name name version)) (commit commit)))
(sha256 (base32 "1w2x5mwvzb2xrp6j2drigay885ni5dag8y2iiak4s96v863wyh5l")) (file-name (git-file-name name version))
(snippet (sha256
#~(begin (base32
(use-modules (ice-9 rdelim) "1w2x5mwvzb2xrp6j2drigay885ni5dag8y2iiak4s96v863wyh5l"))
(ice-9 pretty-print) (snippet #~(begin
(guix build utils)) (use-modules (ice-9 rdelim)
(with-output-to-file "tmp.scm" (ice-9 pretty-print)
(lambda () (guix build utils))
(call-with-input-file "srfi/srfi-171.scm" (with-output-to-file "tmp.scm"
(lambda (input-port) (lambda ()
(let loop ((i 0)) (call-with-input-file "srfi/srfi-171.scm"
(let ((line (read-line input-port))) (lambda (input-port)
(unless (equal? line "(include \"171-impl.scm\")") (let loop
(unless (< i 13) (write-line line)) ((i 0))
(loop (1+ i))))))) (let ((line (read-line input-port)))
(call-with-input-file "srfi/171-impl.scm" (unless (equal? line
(lambda (input-port) "(include \"171-impl.scm\")")
(let loop ((i 0)) (unless (< i 13)
(let ((line (read-line input-port))) (write-line line))
(unless (eof-object? line) (loop (1+ i)))))))
(unless (< i 13) (write-line line)) (call-with-input-file "srfi/171-impl.scm"
(loop (1+ i))))))))) (lambda (input-port)
(delete-file-recursively "srfi") (let loop
(mkdir "srfi") ((i 0))
(rename-file "tmp.scm" "srfi/srfi-171.scm") (let ((line (read-line input-port)))
(for-each delete-file (unless (eof-object? line)
'("compose.scm" (unless (< i 13)
"srfi-171.html" (write-line line))
"transducers.md" (loop (1+ i)))))))))
"README.org" (delete-file-recursively "srfi")
"index.html" (mkdir "srfi")
"tests-guile.scm" (rename-file "tmp.scm" "srfi/srfi-171.scm")
"tests-r7rs.scm" (for-each delete-file
"tests.scm")))))) '("compose.scm" "srfi-171.html"
(build-system guile-build-system) "transducers.md"
(inputs "README.org"
(list guile-3.0)) "index.html"
(home-page "tests-guile.scm"
"https://github.com/scheme-requests-for-implementation/srfi-171") "tests-r7rs.scm"
(synopsis "SRFI 171 transducers implementation for Guile") "tests.scm"))))))
(description (build-system guile-build-system)
"This package provides an implementation of SRFI 171 for Guile. (inputs (list guile-3.0))
(home-page
"https://github.com/scheme-requests-for-implementation/srfi-171")
(synopsis "SRFI 171 transducers implementation for Guile")
(description
"This package provides an implementation of SRFI 171 for Guile.
SRFI 171 defines transducers that generalize common list operations like SRFI 171 defines transducers that generalize common list operations like
map, filter, take and so on for other types. The traditional Scheme map, filter, take and so on for other types. The traditional Scheme
approach of having collection-specific procedures is not changed. ") approach of having collection-specific procedures is not changed. ")
(license license:expat)))) (license license:expat))))

View File

@ -5,21 +5,18 @@
(define-public thinkfan-next (define-public thinkfan-next
(package (package
(inherit thinkfan) (inherit thinkfan)
(arguments (arguments
(list #:modules '((guix build cmake-build-system) (list #:modules '((guix build cmake-build-system)
(guix build utils) (guix build utils)
(srfi srfi-26)) (srfi srfi-26))
#:tests? #f #:tests? #f
#:configure-flags #:configure-flags #~(list "-DUSE_ATASMART:BOOL=ON")
#|Enable reading temperatures from hard disks via S.M.A.R.T.|# #:phases #~(modify-phases %standard-phases
#~(list "-DUSE_ATASMART:BOOL=ON") (add-after 'unpack 'create-init-scripts
#:phases (lambda _
#~(modify-phases %standard-phases (substitute* "CMakeLists.txt"
(add-after 'unpack 'create-init-scripts (("pkg_check_modules\\((SYSTEMD|OPENRC).*" _)
#|Don't even verify for the presence of SystemD or OpenRC|# "")
(lambda _ (("/etc" directory)
(substitute* "CMakeLists.txt" (string-append #$output directory))))))))))
(("pkg_check_modules\\((SYSTEMD|OPENRC).*" _) "")
#|Fix the destinations|#
(("/etc" directory) (string-append #$output directory))))))))))

View File

@ -6,16 +6,14 @@
(define-public dash-next (define-public dash-next
(package (package
(inherit dash) (inherit dash)
(arguments (arguments
(list #:configure-flags (list #:configure-flags #~(list "--with-libedit")
#~(list "--with-libedit") #:phases #~(modify-phases %standard-phases
#:phases (add-after 'install 'create-/bin/sh
#~(modify-phases %standard-phases (lambda _
(add-after 'install 'create-/bin/sh (symlink (string-append #$output "/bin/dash")
(lambda _ (string-append #$output "/bin/sh")))))))
(symlink (string-append #$output "/bin/dash")
(string-append #$output "/bin/sh")))))))
(description (description
"Dash is a POSIX-compliant @command{/bin/sh} implementation that aims to be "Dash is a POSIX-compliant @command{/bin/sh} implementation that aims to be
as small as possible, often without sacrificing speed. It is faster than the as small as possible, often without sacrificing speed. It is faster than the
@ -23,5 +21,3 @@ GNU Bourne-Again Shell (@command{bash}) at most scripted tasks. Dash is a
direct descendant of NetBSD's Almquist Shell (@command{ash}). This package direct descendant of NetBSD's Almquist Shell (@command{ash}). This package
provides, adtionally to @command{/bin/dash} a symlink to it under provides, adtionally to @command{/bin/dash} a symlink to it under
@command{/bin/sh}."))) @command{/bin/sh}.")))
dash-next

View File

@ -15,35 +15,43 @@
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module ((guix licenses) #:prefix license:)) #:use-module ((guix licenses)
#:prefix license:))
;; Thanks to nckx, rekado and lechner for the help :) ;; Thanks to nckx, rekado and lechner for the help :)
(define-public newsraft (define-public newsraft
(package (package
(name "newsraft") (name "newsraft")
(version "0.20") (version "0.20")
(source (source (origin
(origin (method url-fetch)
(method url-fetch) (uri (string-append
(uri (string-append "https://codeberg.org/grisha/newsraft/archive/newsraft-"
"https://codeberg.org/grisha/newsraft/archive/newsraft-" version ".tar.gz"))
version ".tar.gz")) (sha256
(sha256 (base32
(base32 "0r3z8b8qwwnz7093nicxxv9cfxzg4i0mznd4vgwgpv16lm6q455w")))) "0r3z8b8qwwnz7093nicxxv9cfxzg4i0mznd4vgwgpv16lm6q455w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list gnu-make pkg-config scdoc)) (native-inputs (list gnu-make pkg-config scdoc))
(inputs (list curl expat gumbo-parser ncurses sqlite yajl)) (inputs (list curl
(arguments expat
(list #:tests? #f gumbo-parser
#:make-flags ncurses
#~(list (string-append "CC=" #$(cc-for-target)) sqlite
(string-append "PREFIX=" #$output) yajl))
"CFLAGS=-DCURL_WRITEFUNC_ERROR=0xFFFFFFFF") (arguments
#:phases (list #:tests? #f
#~(modify-phases %standard-phases #:make-flags #~(list (string-append "CC="
(delete 'configure)))) #$(cc-for-target))
(home-page "https://codeberg.org/grisha/newsraft") (string-append "PREFIX="
(synopsis "Newsraft is a ncurses feed reader greatly inspired by newsboat.") #$output)
(description "Newsraft is a feed reader with ncurses user interface. It is "CFLAGS=-DCURL_WRITEFUNC_ERROR=0xFFFFFFFF")
#:phases #~(modify-phases %standard-phases
(delete 'configure))))
(home-page "https://codeberg.org/grisha/newsraft")
(synopsis
"Newsraft is a ncurses feed reader greatly inspired by newsboat.")
(description
"Newsraft is a feed reader with ncurses user interface. It is
greatly inspired by Newsboat and tries to be its lightweight counterpart.") greatly inspired by Newsboat and tries to be its lightweight counterpart.")
(license license:isc))) (license license:isc)))

View File

@ -4,6 +4,6 @@
(define-public kakoune-next (define-public kakoune-next
((options->transformation ((options->transformation
`((with-branch . "kakoune=master") `((with-branch . "kakoune=master")
(with-git-url . "kakoune=https://github.com/mawww/kakoune"))) (with-git-url . "kakoune=https://github.com/mawww/kakoune")))
kakoune)) kakoune))

View File

@ -4,6 +4,6 @@
(define-public awesome-next (define-public awesome-next
((options->transformation ((options->transformation
`((with-branch . "awesome=master") `((with-branch . "awesome=master")
(with-git-url . "awesome=https://github.com/awesomeWM/awesome"))) (with-git-url . "awesome=https://github.com/awesomeWM/awesome")))
awesome)) awesome))