freya/sakura
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix spacing

Browse source
This commit is contained in:
Freya Murphy 2024-10-28 15:35:30 -04:00
parent 97e71e1b4c
commit 5e7f3b97a3
Signed by: freya
GPG key ID: 9FBC6FFD6D2DBF17
5 changed files with 79 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
sakura/packages/crates-io.scm
View file

@ -125,12 +125,12 @@
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:cargo-inputs (("rust-darling" ,rust-darling-0.20) #:cargo-inputs (("rust-darling" ,rust-darling-0.20)
("rust-itertools" ,rust-itertools-0.12) ("rust-itertools" ,rust-itertools-0.12)
("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote-1" ,rust-quote-1) ("rust-quote-1" ,rust-quote-1)
("rust-syn" ,rust-syn-2) ("rust-syn" ,rust-syn-2)
("rust-synstructure" ,rust-synstructure-0.13)))) ("rust-synstructure" ,rust-synstructure-0.13))))
(home-page "https://github.com/panicbit/custom_debug") (home-page "https://github.com/panicbit/custom_debug")
(synopsis "Derive Debug with a custom format per field") (synopsis "Derive Debug with a custom format per field")
(description "todo") (description "todo")
@ -152,7 +152,7 @@
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:cargo-inputs (("rust-custom-debug-derive" ,rust-custom-debug-derive-0.6)))) #:cargo-inputs (("rust-custom-debug-derive" ,rust-custom-debug-derive-0.6))))
(home-page "https://github.com/panicbit/custom_debug") (home-page "https://github.com/panicbit/custom_debug")
(synopsis "Derive Debug with a custom format per field") (synopsis "Derive Debug with a custom format per field")
(description "todo") (description "todo")
@ -161,47 +161,47 @@
(define-public rust-bluer-0.17 (define-public rust-bluer-0.17
(package (package
(name "rust-bluer") (name "rust-bluer")
(version "0.17.3") (version "0.17.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (crate-uri "bluer" version)) (uri (crate-uri "bluer" version))
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ysgxnkijfly78kf9rxg827a9qbndpfdc65cndybc51cv1f6mvz9")))) "1ysgxnkijfly78kf9rxg827a9qbndpfdc65cndybc51cv1f6mvz9"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:cargo-inputs (("rust-futures" ,rust-futures-0.3) #:cargo-inputs (("rust-futures" ,rust-futures-0.3)
("rust-hex" ,rust-hex-0.4) ("rust-hex" ,rust-hex-0.4)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-macaddr" ,rust-macaddr-1) ("rust-macaddr" ,rust-macaddr-1)
("rust-nix" ,rust-nix-0.29) ("rust-nix" ,rust-nix-0.29)
("rust-num-derive" ,rust-num-derive-0.4) ("rust-num-derive" ,rust-num-derive-0.4)
("rust-num-traits" ,rust-num-traits-0.2) ("rust-num-traits" ,rust-num-traits-0.2)
("rust-strum" ,rust-strum-0.26) ("rust-strum" ,rust-strum-0.26)
("rust-tokio" ,rust-tokio-1) ("rust-tokio" ,rust-tokio-1)
("rust-uuid" ,rust-uuid-1) ("rust-uuid" ,rust-uuid-1)
("rust-custom-debug" ,rust-custom-debug-0.6) ("rust-custom-debug" ,rust-custom-debug-0.6)
("rust-dbus" ,rust-dbus-0.9) ("rust-dbus" ,rust-dbus-0.9)
("rust-dbus-crossroads" ,rust-dbus-crossroads-0.5) ("rust-dbus-crossroads" ,rust-dbus-crossroads-0.5)
("rust-dbus-tokio" ,rust-dbus-tokio-0.7) ("rust-dbus-tokio" ,rust-dbus-tokio-0.7)
("rust-displaydoc" ,rust-displaydoc-0.2) ("rust-displaydoc" ,rust-displaydoc-0.2)
("rust-lazy-static" ,rust-lazy-static-1) ("rust-lazy-static" ,rust-lazy-static-1)
("rust-pin-project" ,rust-pin-project-1) ("rust-pin-project" ,rust-pin-project-1)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1) ("rust-serde-json" ,rust-serde-json-1)
("rust-tokio-stream" ,rust-tokio-stream-0.1)) ("rust-tokio-stream" ,rust-tokio-stream-0.1))
#:cargo-development-inputs (("rust-clap" ,rust-clap-4) #:cargo-development-inputs (("rust-clap" ,rust-clap-4)
("rust-env-logger" ,rust-env-logger-0.11) ("rust-env-logger" ,rust-env-logger-0.11)
("rust-rand" ,rust-rand-0.8) ("rust-rand" ,rust-rand-0.8)
("rust-tokio" ,rust-tokio-1)))) ("rust-tokio" ,rust-tokio-1))))
(inputs (inputs
(list bluez)) (list bluez))
(home-page "https://github.com/bluez/bluer") (home-page "https://github.com/bluez/bluer")
(synopsis "Official Rust interface to the Linux Bluetooth protocol stack (BlueZ)") (synopsis "Official Rust interface to the Linux Bluetooth protocol stack (BlueZ)")
(description "todo") (description "todo")
(license license:bsd-2))) (license license:bsd-2)))

20
sakura/packages/networking.scm
View file

@ -32,8 +32,8 @@
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/kaii-lb/overskride" (uri (string-append "https://github.com/kaii-lb/overskride"
"/archive/refs/tags/v" overskride-version ".tar.gz")) "/archive/refs/tags/v" overskride-version ".tar.gz"))
(file-name (string-append "overskride-" overskride-version ".tar.gz")) (file-name (string-append "overskride-" overskride-version ".tar.gz"))
(patches (sakura-patches "overskride-fix-meson.patch")) (patches (sakura-patches "overskride-fix-meson.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -62,10 +62,10 @@
(propagated-inputs (propagated-inputs
(list gtk (list gtk
libadwaita)) libadwaita))
(home-page "https://github.com/kaii-lb/overskride") (home-page "https://github.com/kaii-lb/overskride")
(synopsis "A simple yet powerful bluetooth client.") (synopsis "A simple yet powerful bluetooth client.")
(description "Provides the glib components of the overskride pacakge") (description "Provides the glib components of the overskride pacakge")
(license license:gpl3+))) (license license:gpl3+)))
(define-public overskride (define-public overskride
@ -120,7 +120,7 @@
libadwaita libadwaita
pulseaudio pulseaudio
bluez)) bluez))
(home-page "https://github.com/kaii-lb/overskride") (home-page "https://github.com/kaii-lb/overskride")
(synopsis "A simple yet powerful bluetooth client.") (synopsis "A simple yet powerful bluetooth client.")
(description "todo") (description "todo")
(license license:gpl3+))) (license license:gpl3+)))

32
sakura/packages/qt.scm
View file

@ -74,19 +74,18 @@
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gtk2 (assoc-ref inputs "gtk+")) (gtk2 (assoc-ref inputs "gtk+"))
(x11 (assoc-ref inputs "libx11"))) (x11 (assoc-ref inputs "libx11")))
(substitute* "qt6gtk2.pri" (substitute* "qt6gtk2.pri"
(("UI_DIR") (string-append (("UI_DIR") (string-append
"PKG_CONFIG = " "PKG_CONFIG = "
(assoc-ref inputs "pkg-config") (assoc-ref inputs "pkg-config")
"/bin/pkg-config" "/bin/pkg-config"
"\nPKG_CONFIG_PATH = " "\nPKG_CONFIG_PATH = "
gtk2 "/include" ":" x11 "/include" gtk2 "/include" ":" x11 "/include"
"\nUI_DIR"))) "\nUI_DIR")))
(invoke "qmake" (invoke "qmake"
(string-append "prefix=" out)) (string-append "prefix=" out)))))
)))
(replace 'install (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -94,17 +93,16 @@
(invoke "make" (string-append "INSTALL_ROOT=\"" out "\"") "install") (invoke "make" (string-append "INSTALL_ROOT=\"" out "\"") "install")
(let ((lib (string-append out qt5 "/lib"))) (let ((lib (string-append out qt5 "/lib")))
(invoke "mv" lib out) (invoke "mv" lib out)
(invoke "rm" "-fr" (string-append out "/gnu")))))) (invoke "rm" "-fr" (string-append out "/gnu")))))))))
)))
(native-inputs (native-inputs
(list pkg-config (list pkg-config
qttools qttools
coreutils)) coreutils))
(inputs (inputs
(list qtbase (list qtbase
gtk+-2 gtk+-2
libx11 libx11
libxkbcommon)) libxkbcommon))
(home-page "") (home-page "")
(synopsis "") (synopsis "")
(description "") (description "")

12
sakura/packages/yarn.scm
View file

@ -1,10 +1,10 @@
(define-module (sakura packages yarn) (define-module (sakura packages yarn)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages node)) #:use-module (gnu packages node))
(define-public yarn (define-public yarn
(package (package

6
sakura/services/cow.scm
View file

@ -1,7 +1,7 @@
(define-module (sakura services cow) (define-module (sakura services cow)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (guix modules) #:use-module (guix modules)
#:use-module (gnu)) #:use-module (gnu))
; repackage the cow store from guix since ; repackage the cow store from guix since
; guix doesnt export it ; guix doesnt export it