style: use `guix style --whole-file` to make package definition style more consistent
parent
a09a647e7f
commit
14ba573d53
|
@ -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,8 +13,7 @@
|
||||||
(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")
|
||||||
|
@ -24,14 +24,11 @@
|
||||||
"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))))
|
||||||
|
|
||||||
|
|
|
@ -3,24 +3,32 @@
|
||||||
#: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 "https://github.com/andreberg/Meslo-Font/raw/master/"
|
(uri (string-append
|
||||||
"dist/v" version "Meslo%20LG%20v" version ".zip"))
|
"https://github.com/andreberg/Meslo-Font/raw/master/"
|
||||||
(sha256 (base32 "1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"))))
|
"dist/v"
|
||||||
|
version
|
||||||
|
"Meslo%20LG%20v"
|
||||||
|
version
|
||||||
|
".zip"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"))))
|
||||||
(build-system font-build-system)
|
(build-system font-build-system)
|
||||||
(native-inputs (list unzip))
|
(native-inputs (list unzip))
|
||||||
(home-page "https://github.com/andreberg/Meslo-Font")
|
(home-page "https://github.com/andreberg/Meslo-Font")
|
||||||
(synopsis "Font for dyslexics and high readability")
|
(synopsis "Font for dyslexics and high readability")
|
||||||
(description "Meslo LG is a customized version of Apple’s Menlo-Regular font
|
(description
|
||||||
|
"Meslo LG is a customized version of Apple’s 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)))
|
||||||
|
|
||||||
|
@ -29,10 +37,16 @@
|
||||||
(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 "https://github.com/andreberg/Meslo-Font/raw/master/"
|
(uri (string-append
|
||||||
"dist/v" version "Meslo%20LG%20DZ%20v" version ".zip"))
|
"https://github.com/andreberg/Meslo-Font/raw/master/"
|
||||||
(sha256 (base32 "0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"))))))
|
"dist/v"
|
||||||
|
version
|
||||||
|
"Meslo%20LG%20DZ%20v"
|
||||||
|
version
|
||||||
|
".zip"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"))))))
|
||||||
|
|
|
@ -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
|
||||||
|
@ -15,17 +16,16 @@
|
||||||
(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 "19kh6zwad6bmhj0wabgbsbkk8l48s6lrgn701afjaab2w0gb30qg"))
|
(base32
|
||||||
(snippet
|
"19kh6zwad6bmhj0wabgbsbkk8l48s6lrgn701afjaab2w0gb30qg"))
|
||||||
#~(begin
|
(snippet #~(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))
|
||||||
|
@ -33,11 +33,13 @@
|
||||||
(lambda (input-port)
|
(lambda (input-port)
|
||||||
(with-output-to-file "tmp.scm"
|
(with-output-to-file "tmp.scm"
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(pretty-print
|
(pretty-print '(define-module (srfi
|
||||||
'(define-module (srfi srfi-197)
|
srfi-197)
|
||||||
#:use-module (rnrs base)
|
#:use-module (rnrs base)
|
||||||
#:use-module (rnrs io ports)
|
#:use-module (rnrs io
|
||||||
#:use-module (rnrs syntax-case)
|
ports)
|
||||||
|
#:use-module (rnrs
|
||||||
|
syntax-case)
|
||||||
#:export (chain
|
#:export (chain
|
||||||
chain-when
|
chain-when
|
||||||
chain-and
|
chain-and
|
||||||
|
@ -45,7 +47,8 @@
|
||||||
nest
|
nest
|
||||||
nest-reverse)))
|
nest-reverse)))
|
||||||
(newline)
|
(newline)
|
||||||
(let loop ()
|
(let loop
|
||||||
|
()
|
||||||
(let ((line (read-line input-port)))
|
(let ((line (read-line input-port)))
|
||||||
(unless (eof-object? line)
|
(unless (eof-object? line)
|
||||||
(write-line line)
|
(write-line line)
|
||||||
|
@ -62,8 +65,7 @@
|
||||||
"test-r7rs.scm"
|
"test-r7rs.scm"
|
||||||
"test.scm"))))))
|
"test.scm"))))))
|
||||||
(build-system guile-build-system)
|
(build-system guile-build-system)
|
||||||
(inputs
|
(inputs (list guile-3.0))
|
||||||
(list guile-3.0))
|
|
||||||
(home-page "https://github.com/ar-nelson/srfi-197")
|
(home-page "https://github.com/ar-nelson/srfi-197")
|
||||||
(synopsis "SRFI 197 pipeline operators port for Guile")
|
(synopsis "SRFI 197 pipeline operators port for Guile")
|
||||||
(description
|
(description
|
||||||
|
@ -78,16 +80,18 @@ representing nested data structures and code in a more readable way.")
|
||||||
(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 "https://github.com/scheme-requests-for-implementation/srfi-171")
|
(url (string-append
|
||||||
|
"https://github.com"
|
||||||
|
"/scheme-requests-for-implementation/srfi-171"))
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256 (base32 "1w2x5mwvzb2xrp6j2drigay885ni5dag8y2iiak4s96v863wyh5l"))
|
(sha256
|
||||||
(snippet
|
(base32
|
||||||
#~(begin
|
"1w2x5mwvzb2xrp6j2drigay885ni5dag8y2iiak4s96v863wyh5l"))
|
||||||
|
(snippet #~(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))
|
||||||
|
@ -95,24 +99,28 @@ representing nested data structures and code in a more readable way.")
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(call-with-input-file "srfi/srfi-171.scm"
|
(call-with-input-file "srfi/srfi-171.scm"
|
||||||
(lambda (input-port)
|
(lambda (input-port)
|
||||||
(let loop ((i 0))
|
(let loop
|
||||||
|
((i 0))
|
||||||
(let ((line (read-line input-port)))
|
(let ((line (read-line input-port)))
|
||||||
(unless (equal? line "(include \"171-impl.scm\")")
|
(unless (equal? line
|
||||||
(unless (< i 13) (write-line line))
|
"(include \"171-impl.scm\")")
|
||||||
|
(unless (< i 13)
|
||||||
|
(write-line line))
|
||||||
(loop (1+ i)))))))
|
(loop (1+ i)))))))
|
||||||
(call-with-input-file "srfi/171-impl.scm"
|
(call-with-input-file "srfi/171-impl.scm"
|
||||||
(lambda (input-port)
|
(lambda (input-port)
|
||||||
(let loop ((i 0))
|
(let loop
|
||||||
|
((i 0))
|
||||||
(let ((line (read-line input-port)))
|
(let ((line (read-line input-port)))
|
||||||
(unless (eof-object? line)
|
(unless (eof-object? line)
|
||||||
(unless (< i 13) (write-line line))
|
(unless (< i 13)
|
||||||
|
(write-line line))
|
||||||
(loop (1+ i)))))))))
|
(loop (1+ i)))))))))
|
||||||
(delete-file-recursively "srfi")
|
(delete-file-recursively "srfi")
|
||||||
(mkdir "srfi")
|
(mkdir "srfi")
|
||||||
(rename-file "tmp.scm" "srfi/srfi-171.scm")
|
(rename-file "tmp.scm" "srfi/srfi-171.scm")
|
||||||
(for-each delete-file
|
(for-each delete-file
|
||||||
'("compose.scm"
|
'("compose.scm" "srfi-171.html"
|
||||||
"srfi-171.html"
|
|
||||||
"transducers.md"
|
"transducers.md"
|
||||||
"README.org"
|
"README.org"
|
||||||
"index.html"
|
"index.html"
|
||||||
|
@ -120,8 +128,7 @@ representing nested data structures and code in a more readable way.")
|
||||||
"tests-r7rs.scm"
|
"tests-r7rs.scm"
|
||||||
"tests.scm"))))))
|
"tests.scm"))))))
|
||||||
(build-system guile-build-system)
|
(build-system guile-build-system)
|
||||||
(inputs
|
(inputs (list guile-3.0))
|
||||||
(list guile-3.0))
|
|
||||||
(home-page
|
(home-page
|
||||||
"https://github.com/scheme-requests-for-implementation/srfi-171")
|
"https://github.com/scheme-requests-for-implementation/srfi-171")
|
||||||
(synopsis "SRFI 171 transducers implementation for Guile")
|
(synopsis "SRFI 171 transducers implementation for Guile")
|
||||||
|
|
|
@ -11,15 +11,12 @@
|
||||||
(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")
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'create-init-scripts
|
(add-after 'unpack 'create-init-scripts
|
||||||
#|Don't even verify for the presence of SystemD or OpenRC|#
|
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "CMakeLists.txt"
|
(substitute* "CMakeLists.txt"
|
||||||
(("pkg_check_modules\\((SYSTEMD|OPENRC).*" _) "")
|
(("pkg_check_modules\\((SYSTEMD|OPENRC).*" _)
|
||||||
#|Fix the destinations|#
|
"")
|
||||||
(("/etc" directory) (string-append #$output directory))))))))))
|
(("/etc" directory)
|
||||||
|
(string-append #$output directory))))))))))
|
||||||
|
|
|
@ -8,10 +8,8 @@
|
||||||
(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
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-after 'install 'create-/bin/sh
|
(add-after 'install 'create-/bin/sh
|
||||||
(lambda _
|
(lambda _
|
||||||
(symlink (string-append #$output "/bin/dash")
|
(symlink (string-append #$output "/bin/dash")
|
||||||
|
@ -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
|
|
||||||
|
|
|
@ -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 "0r3z8b8qwwnz7093nicxxv9cfxzg4i0mznd4vgwgpv16lm6q455w"))))
|
(base32
|
||||||
|
"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
|
||||||
|
expat
|
||||||
|
gumbo-parser
|
||||||
|
ncurses
|
||||||
|
sqlite
|
||||||
|
yajl))
|
||||||
(arguments
|
(arguments
|
||||||
(list #:tests? #f
|
(list #:tests? #f
|
||||||
#:make-flags
|
#:make-flags #~(list (string-append "CC="
|
||||||
#~(list (string-append "CC=" #$(cc-for-target))
|
#$(cc-for-target))
|
||||||
(string-append "PREFIX=" #$output)
|
(string-append "PREFIX="
|
||||||
|
#$output)
|
||||||
"CFLAGS=-DCURL_WRITEFUNC_ERROR=0xFFFFFFFF")
|
"CFLAGS=-DCURL_WRITEFUNC_ERROR=0xFFFFFFFF")
|
||||||
#:phases
|
#:phases #~(modify-phases %standard-phases
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(delete 'configure))))
|
(delete 'configure))))
|
||||||
(home-page "https://codeberg.org/grisha/newsraft")
|
(home-page "https://codeberg.org/grisha/newsraft")
|
||||||
(synopsis "Newsraft is a ncurses feed reader greatly inspired by newsboat.")
|
(synopsis
|
||||||
(description "Newsraft is a feed reader with ncurses user interface. It is
|
"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)))
|
||||||
|
|
Loading…
Reference in New Issue