diff --git a/modules/radix/packages/admin.scm b/modules/radix/packages/admin.scm index 3375b0a..4dda530 100644 --- a/modules/radix/packages/admin.scm +++ b/modules/radix/packages/admin.scm @@ -3,7 +3,8 @@ #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system copy) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:export (zzz)) (define-public zzz @@ -12,26 +13,22 @@ (package (name "zzz") (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/void-linux/void-runit") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1lgf3maqw2j9hjzq0bkrvbl7vbh4zpppm9cdl9hvf54kbxcn2v9i")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/void-linux/void-runit") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lgf3maqw2j9hjzq0bkrvbl7vbh4zpppm9cdl9hvf54kbxcn2v9i")))) (build-system copy-build-system) (arguments - (list #:install-plan - #~'(("zzz" "bin/") - ("zzz.8" "share/man/man8/")))) + (list #:install-plan #~'(("zzz" "bin/") + ("zzz.8" "share/man/man8/")))) (home-page "https://github.com/void-linux/void-runit") - (synopsis - "Simple script to suspend or hibernate your computer.") - (description - "Simple script to suspend or hibernate your computer. It + (synopsis "Simple script to suspend or hibernate your computer.") + (description "Simple script to suspend or hibernate your computer. It suports hooks before and after suspending.") (license license:cc0)))) diff --git a/modules/radix/packages/fonts.scm b/modules/radix/packages/fonts.scm index ff19e3e..c62fd5f 100644 --- a/modules/radix/packages/fonts.scm +++ b/modules/radix/packages/fonts.scm @@ -3,36 +3,50 @@ #:use-module (guix download) #:use-module (guix build-system font) #:use-module (gnu packages compression) - #:use-module ((guix licenses) #:prefix license:)) + #:use-module ((guix licenses) + #:prefix license:)) (define-public font-meslo-lg (package - (name "font-meslo-lg") - (version "1.2.1") - (source - (origin - (file-name "font-meslo-lg") - (method url-fetch/zipbomb) - (uri (string-append "https://github.com/andreberg/Meslo-Font/raw/master/" - "dist/v" version "Meslo%20LG%20v" version ".zip")) - (sha256 (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 Apple’s Menlo-Regular font + (name "font-meslo-lg") + (version "1.2.1") + (source (origin + (file-name "font-meslo-lg") + (method url-fetch/zipbomb) + (uri (string-append + "https://github.com/andreberg/Meslo-Font/raw/master/" + "dist/v" + version + "Meslo%20LG%20v" + version + ".zip")) + (sha256 + (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 Apple’s Menlo-Regular font (which is a customized Bitstream Vera Sans Mono).") - (license license:silofl1.1))) + (license license:silofl1.1))) (define-public font-meslo-lg-dz (package - (inherit font-meslo-lg) - (name "font-meslo-lg-dz") - (version (package-version font-meslo-lg)) - (source - (origin - (file-name "font-meslo-lg-dz") - (method url-fetch/zipbomb) - (uri (string-append "https://github.com/andreberg/Meslo-Font/raw/master/" - "dist/v" version "Meslo%20LG%20DZ%20v" version ".zip")) - (sha256 (base32 "0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875")))))) + (inherit font-meslo-lg) + (name "font-meslo-lg-dz") + (version (package-version font-meslo-lg)) + (source (origin + (file-name "font-meslo-lg-dz") + (method url-fetch/zipbomb) + (uri (string-append + "https://github.com/andreberg/Meslo-Font/raw/master/" + "dist/v" + version + "Meslo%20LG%20DZ%20v" + version + ".zip")) + (sha256 + (base32 + "0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875")))))) diff --git a/modules/radix/packages/guile-xyz.scm b/modules/radix/packages/guile-xyz.scm index 4b4732e..ac09994 100644 --- a/modules/radix/packages/guile-xyz.scm +++ b/modules/radix/packages/guile-xyz.scm @@ -5,7 +5,8 @@ #:use-module (gnu packages guile) #:use-module (guix build-system guile) #: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 ;; https://git.sr.ht/~krevedkokun/dotfiles/tree/master/item/channel/packages/guile.scm @@ -13,121 +14,127 @@ (let ((commit "78ced23a1af519ee2969939138b3ffff442f339a") (revision "0")) (package - (name "guile-srfi-197") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ar-nelson/srfi-197") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "19kh6zwad6bmhj0wabgbsbkk8l48s6lrgn701afjaab2w0gb30qg")) - (snippet - #~(begin - (use-modules (ice-9 rdelim) - (ice-9 pretty-print) - (guix build utils)) - (call-with-input-file "srfi-197-syntax-case.scm" - (lambda (input-port) - (with-output-to-file "tmp.scm" - (lambda () - (pretty-print - '(define-module (srfi srfi-197) - #:use-module (rnrs base) - #:use-module (rnrs io ports) - #:use-module (rnrs syntax-case) - #:export (chain - chain-when - chain-and - chain-lambda - nest - nest-reverse))) - (newline) - (let loop () - (let ((line (read-line input-port))) - (unless (eof-object? line) - (write-line line) - (loop)))))))) - (mkdir "srfi") - (rename-file "tmp.scm" "srfi/srfi-197.scm") - (for-each delete-file - '("srfi-197-syntax-case.scm" - "srfi-197.scm" - "srfi-197.sld" - "srfi-64-minimal.scm" - "test-kawa.scm" - "test-r6rs.scm" - "test-r7rs.scm" - "test.scm")))))) - (build-system guile-build-system) - (inputs - (list guile-3.0)) - (home-page "https://github.com/ar-nelson/srfi-197") - (synopsis "SRFI 197 pipeline operators port for Guile") - (description - "This package provides an implementation of SRFI 197 for Guile. + (name "guile-srfi-197") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ar-nelson/srfi-197") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19kh6zwad6bmhj0wabgbsbkk8l48s6lrgn701afjaab2w0gb30qg")) + (snippet #~(begin + (use-modules (ice-9 rdelim) + (ice-9 pretty-print) + (guix build utils)) + (call-with-input-file "srfi-197-syntax-case.scm" + (lambda (input-port) + (with-output-to-file "tmp.scm" + (lambda () + (pretty-print '(define-module (srfi + srfi-197) + #:use-module (rnrs base) + #:use-module (rnrs io + ports) + #:use-module (rnrs + syntax-case) + #:export (chain + chain-when + chain-and + chain-lambda + nest + nest-reverse))) + (newline) + (let loop + () + (let ((line (read-line input-port))) + (unless (eof-object? line) + (write-line line) + (loop)))))))) + (mkdir "srfi") + (rename-file "tmp.scm" "srfi/srfi-197.scm") + (for-each delete-file + '("srfi-197-syntax-case.scm" + "srfi-197.scm" + "srfi-197.sld" + "srfi-64-minimal.scm" + "test-kawa.scm" + "test-r6rs.scm" + "test-r7rs.scm" + "test.scm")))))) + (build-system guile-build-system) + (inputs (list guile-3.0)) + (home-page "https://github.com/ar-nelson/srfi-197") + (synopsis "SRFI 197 pipeline operators port 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 representing nested data structures and code in a more readable way.") - (license license:expat)))) + (license license:expat)))) (define-public guile-srfi-171 (let ((commit "40eb284ae54e510013054453890052df603a3a7f") (revision "0")) (package - (name "guile-srfi-171") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/scheme-requests-for-implementation/srfi-171") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 (base32 "1w2x5mwvzb2xrp6j2drigay885ni5dag8y2iiak4s96v863wyh5l")) - (snippet - #~(begin - (use-modules (ice-9 rdelim) - (ice-9 pretty-print) - (guix build utils)) - (with-output-to-file "tmp.scm" - (lambda () - (call-with-input-file "srfi/srfi-171.scm" - (lambda (input-port) - (let loop ((i 0)) - (let ((line (read-line input-port))) - (unless (equal? line "(include \"171-impl.scm\")") - (unless (< i 13) (write-line line)) - (loop (1+ i))))))) - (call-with-input-file "srfi/171-impl.scm" - (lambda (input-port) - (let loop ((i 0)) - (let ((line (read-line input-port))) - (unless (eof-object? line) - (unless (< i 13) (write-line line)) - (loop (1+ i))))))))) - (delete-file-recursively "srfi") - (mkdir "srfi") - (rename-file "tmp.scm" "srfi/srfi-171.scm") - (for-each delete-file - '("compose.scm" - "srfi-171.html" - "transducers.md" - "README.org" - "index.html" - "tests-guile.scm" - "tests-r7rs.scm" - "tests.scm")))))) - (build-system guile-build-system) - (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. + (name "guile-srfi-171") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append + "https://github.com" + "/scheme-requests-for-implementation/srfi-171")) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w2x5mwvzb2xrp6j2drigay885ni5dag8y2iiak4s96v863wyh5l")) + (snippet #~(begin + (use-modules (ice-9 rdelim) + (ice-9 pretty-print) + (guix build utils)) + (with-output-to-file "tmp.scm" + (lambda () + (call-with-input-file "srfi/srfi-171.scm" + (lambda (input-port) + (let loop + ((i 0)) + (let ((line (read-line input-port))) + (unless (equal? line + "(include \"171-impl.scm\")") + (unless (< i 13) + (write-line line)) + (loop (1+ i))))))) + (call-with-input-file "srfi/171-impl.scm" + (lambda (input-port) + (let loop + ((i 0)) + (let ((line (read-line input-port))) + (unless (eof-object? line) + (unless (< i 13) + (write-line line)) + (loop (1+ i))))))))) + (delete-file-recursively "srfi") + (mkdir "srfi") + (rename-file "tmp.scm" "srfi/srfi-171.scm") + (for-each delete-file + '("compose.scm" "srfi-171.html" + "transducers.md" + "README.org" + "index.html" + "tests-guile.scm" + "tests-r7rs.scm" + "tests.scm")))))) + (build-system guile-build-system) + (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 map, filter, take and so on for other types. The traditional Scheme approach of having collection-specific procedures is not changed. ") - (license license:expat)))) + (license license:expat)))) diff --git a/modules/radix/packages/linux.scm b/modules/radix/packages/linux.scm index 3797922..81b5385 100644 --- a/modules/radix/packages/linux.scm +++ b/modules/radix/packages/linux.scm @@ -5,21 +5,18 @@ (define-public thinkfan-next (package - (inherit thinkfan) - (arguments - (list #:modules '((guix build cmake-build-system) - (guix build utils) - (srfi srfi-26)) - #:tests? #f - #:configure-flags - #|Enable reading temperatures from hard disks via S.M.A.R.T.|# - #~(list "-DUSE_ATASMART:BOOL=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'create-init-scripts - #|Don't even verify for the presence of SystemD or OpenRC|# - (lambda _ - (substitute* "CMakeLists.txt" - (("pkg_check_modules\\((SYSTEMD|OPENRC).*" _) "") - #|Fix the destinations|# - (("/etc" directory) (string-append #$output directory)))))))))) + (inherit thinkfan) + (arguments + (list #:modules '((guix build cmake-build-system) + (guix build utils) + (srfi srfi-26)) + #:tests? #f + #:configure-flags #~(list "-DUSE_ATASMART:BOOL=ON") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'create-init-scripts + (lambda _ + (substitute* "CMakeLists.txt" + (("pkg_check_modules\\((SYSTEMD|OPENRC).*" _) + "") + (("/etc" directory) + (string-append #$output directory)))))))))) diff --git a/modules/radix/packages/shells.scm b/modules/radix/packages/shells.scm index be896e5..db6e2b5 100644 --- a/modules/radix/packages/shells.scm +++ b/modules/radix/packages/shells.scm @@ -6,16 +6,14 @@ (define-public dash-next (package - (inherit dash) - (arguments - (list #:configure-flags - #~(list "--with-libedit") - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'create-/bin/sh - (lambda _ - (symlink (string-append #$output "/bin/dash") - (string-append #$output "/bin/sh"))))))) + (inherit dash) + (arguments + (list #:configure-flags #~(list "--with-libedit") + #:phases #~(modify-phases %standard-phases + (add-after 'install 'create-/bin/sh + (lambda _ + (symlink (string-append #$output "/bin/dash") + (string-append #$output "/bin/sh"))))))) (description "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 @@ -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 provides, adtionally to @command{/bin/dash} a symlink to it under @command{/bin/sh}."))) - -dash-next diff --git a/modules/radix/packages/syndication.scm b/modules/radix/packages/syndication.scm index 865cbe2..5eaa475 100644 --- a/modules/radix/packages/syndication.scm +++ b/modules/radix/packages/syndication.scm @@ -15,35 +15,43 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #: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 :) (define-public newsraft (package - (name "newsraft") - (version "0.20") - (source - (origin - (method url-fetch) - (uri (string-append - "https://codeberg.org/grisha/newsraft/archive/newsraft-" - version ".tar.gz")) - (sha256 - (base32 "0r3z8b8qwwnz7093nicxxv9cfxzg4i0mznd4vgwgpv16lm6q455w")))) - (build-system gnu-build-system) - (native-inputs (list gnu-make pkg-config scdoc)) - (inputs (list curl expat gumbo-parser ncurses sqlite yajl)) - (arguments - (list #:tests? #f - #:make-flags - #~(list (string-append "CC=" #$(cc-for-target)) - (string-append "PREFIX=" #$output) - "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 + (name "newsraft") + (version "0.20") + (source (origin + (method url-fetch) + (uri (string-append + "https://codeberg.org/grisha/newsraft/archive/newsraft-" + version ".tar.gz")) + (sha256 + (base32 + "0r3z8b8qwwnz7093nicxxv9cfxzg4i0mznd4vgwgpv16lm6q455w")))) + (build-system gnu-build-system) + (native-inputs (list gnu-make pkg-config scdoc)) + (inputs (list curl + expat + gumbo-parser + ncurses + sqlite + yajl)) + (arguments + (list #:tests? #f + #:make-flags #~(list (string-append "CC=" + #$(cc-for-target)) + (string-append "PREFIX=" + #$output) + "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.") - (license license:isc))) + (license license:isc))) diff --git a/modules/radix/packages/text-editors.scm b/modules/radix/packages/text-editors.scm index ef4945f..ea4f5f5 100644 --- a/modules/radix/packages/text-editors.scm +++ b/modules/radix/packages/text-editors.scm @@ -4,6 +4,6 @@ (define-public kakoune-next ((options->transformation - `((with-branch . "kakoune=master") + `((with-branch . "kakoune=master") (with-git-url . "kakoune=https://github.com/mawww/kakoune"))) kakoune)) diff --git a/modules/radix/packages/wm.scm b/modules/radix/packages/wm.scm index 7f1a950..8f35353 100644 --- a/modules/radix/packages/wm.scm +++ b/modules/radix/packages/wm.scm @@ -4,6 +4,6 @@ (define-public awesome-next ((options->transformation - `((with-branch . "awesome=master") - (with-git-url . "awesome=https://github.com/awesomeWM/awesome"))) + `((with-branch . "awesome=master") + (with-git-url . "awesome=https://github.com/awesomeWM/awesome"))) awesome))