summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2024-10-28 15:35:30 -0400
committerFreya Murphy <freya@freyacat.org>2024-10-28 15:35:30 -0400
commit5e7f3b97a347ad3f7a9401fd66a49ad7c4e1b607 (patch)
tree443ee640299c72526f9d67fc3c6efcde810cb03a
parentadd wl-clip-persist (diff)
downloadsakura-5e7f3b97a347ad3f7a9401fd66a49ad7c4e1b607.tar.gz
sakura-5e7f3b97a347ad3f7a9401fd66a49ad7c4e1b607.tar.bz2
sakura-5e7f3b97a347ad3f7a9401fd66a49ad7c4e1b607.zip
fix spacing
-rw-r--r--sakura/packages/crates-io.scm90
-rw-r--r--sakura/packages/networking.scm20
-rw-r--r--sakura/packages/qt.scm32
-rw-r--r--sakura/packages/yarn.scm12
-rw-r--r--sakura/services/cow.scm6
5 files changed, 79 insertions, 81 deletions
diff --git a/sakura/packages/crates-io.scm b/sakura/packages/crates-io.scm
index 2c41706..502da2e 100644
--- a/sakura/packages/crates-io.scm
+++ b/sakura/packages/crates-io.scm
@@ -125,12 +125,12 @@
(build-system cargo-build-system)
(arguments
`(#:tests? #f
- #:cargo-inputs (("rust-darling" ,rust-darling-0.20)
- ("rust-itertools" ,rust-itertools-0.12)
- ("rust-proc-macro2" ,rust-proc-macro2-1)
- ("rust-quote-1" ,rust-quote-1)
- ("rust-syn" ,rust-syn-2)
- ("rust-synstructure" ,rust-synstructure-0.13))))
+ #:cargo-inputs (("rust-darling" ,rust-darling-0.20)
+ ("rust-itertools" ,rust-itertools-0.12)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote-1" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-2)
+ ("rust-synstructure" ,rust-synstructure-0.13))))
(home-page "https://github.com/panicbit/custom_debug")
(synopsis "Derive Debug with a custom format per field")
(description "todo")
@@ -152,7 +152,7 @@
(build-system cargo-build-system)
(arguments
`(#: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")
(synopsis "Derive Debug with a custom format per field")
(description "todo")
@@ -161,47 +161,47 @@
(define-public rust-bluer-0.17
(package
- (name "rust-bluer")
- (version "0.17.3")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "bluer" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1ysgxnkijfly78kf9rxg827a9qbndpfdc65cndybc51cv1f6mvz9"))))
- (build-system cargo-build-system)
- (arguments
- `(#:tests? #f
- #:cargo-inputs (("rust-futures" ,rust-futures-0.3)
- ("rust-hex" ,rust-hex-0.4)
- ("rust-libc" ,rust-libc-0.2)
- ("rust-log" ,rust-log-0.4)
- ("rust-macaddr" ,rust-macaddr-1)
- ("rust-nix" ,rust-nix-0.29)
- ("rust-num-derive" ,rust-num-derive-0.4)
- ("rust-num-traits" ,rust-num-traits-0.2)
- ("rust-strum" ,rust-strum-0.26)
- ("rust-tokio" ,rust-tokio-1)
- ("rust-uuid" ,rust-uuid-1)
- ("rust-custom-debug" ,rust-custom-debug-0.6)
- ("rust-dbus" ,rust-dbus-0.9)
- ("rust-dbus-crossroads" ,rust-dbus-crossroads-0.5)
- ("rust-dbus-tokio" ,rust-dbus-tokio-0.7)
- ("rust-displaydoc" ,rust-displaydoc-0.2)
- ("rust-lazy-static" ,rust-lazy-static-1)
- ("rust-pin-project" ,rust-pin-project-1)
- ("rust-serde" ,rust-serde-1)
- ("rust-serde-json" ,rust-serde-json-1)
- ("rust-tokio-stream" ,rust-tokio-stream-0.1))
+ (name "rust-bluer")
+ (version "0.17.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bluer" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ysgxnkijfly78kf9rxg827a9qbndpfdc65cndybc51cv1f6mvz9"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f
+ #:cargo-inputs (("rust-futures" ,rust-futures-0.3)
+ ("rust-hex" ,rust-hex-0.4)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-macaddr" ,rust-macaddr-1)
+ ("rust-nix" ,rust-nix-0.29)
+ ("rust-num-derive" ,rust-num-derive-0.4)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-strum" ,rust-strum-0.26)
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-uuid" ,rust-uuid-1)
+ ("rust-custom-debug" ,rust-custom-debug-0.6)
+ ("rust-dbus" ,rust-dbus-0.9)
+ ("rust-dbus-crossroads" ,rust-dbus-crossroads-0.5)
+ ("rust-dbus-tokio" ,rust-dbus-tokio-0.7)
+ ("rust-displaydoc" ,rust-displaydoc-0.2)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-pin-project" ,rust-pin-project-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-tokio-stream" ,rust-tokio-stream-0.1))
#:cargo-development-inputs (("rust-clap" ,rust-clap-4)
("rust-env-logger" ,rust-env-logger-0.11)
("rust-rand" ,rust-rand-0.8)
("rust-tokio" ,rust-tokio-1))))
(inputs
(list bluez))
- (home-page "https://github.com/bluez/bluer")
- (synopsis "Official Rust interface to the Linux Bluetooth protocol stack (BlueZ)")
- (description "todo")
- (license license:bsd-2)))
+ (home-page "https://github.com/bluez/bluer")
+ (synopsis "Official Rust interface to the Linux Bluetooth protocol stack (BlueZ)")
+ (description "todo")
+ (license license:bsd-2)))
diff --git a/sakura/packages/networking.scm b/sakura/packages/networking.scm
index 6a50ea7..01fef38 100644
--- a/sakura/packages/networking.scm
+++ b/sakura/packages/networking.scm
@@ -32,8 +32,8 @@
(method url-fetch)
(uri (string-append "https://github.com/kaii-lb/overskride"
"/archive/refs/tags/v" overskride-version ".tar.gz"))
- (file-name (string-append "overskride-" overskride-version ".tar.gz"))
- (patches (sakura-patches "overskride-fix-meson.patch"))
+ (file-name (string-append "overskride-" overskride-version ".tar.gz"))
+ (patches (sakura-patches "overskride-fix-meson.patch"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -62,10 +62,10 @@
(propagated-inputs
(list gtk
libadwaita))
- (home-page "https://github.com/kaii-lb/overskride")
- (synopsis "A simple yet powerful bluetooth client.")
- (description "Provides the glib components of the overskride pacakge")
- (license license:gpl3+)))
+ (home-page "https://github.com/kaii-lb/overskride")
+ (synopsis "A simple yet powerful bluetooth client.")
+ (description "Provides the glib components of the overskride pacakge")
+ (license license:gpl3+)))
(define-public overskride
@@ -120,7 +120,7 @@
libadwaita
pulseaudio
bluez))
- (home-page "https://github.com/kaii-lb/overskride")
- (synopsis "A simple yet powerful bluetooth client.")
- (description "todo")
- (license license:gpl3+)))
+ (home-page "https://github.com/kaii-lb/overskride")
+ (synopsis "A simple yet powerful bluetooth client.")
+ (description "todo")
+ (license license:gpl3+)))
diff --git a/sakura/packages/qt.scm b/sakura/packages/qt.scm
index 4eed653..34e57c4 100644
--- a/sakura/packages/qt.scm
+++ b/sakura/packages/qt.scm
@@ -74,19 +74,18 @@
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
- (gtk2 (assoc-ref inputs "gtk+"))
- (x11 (assoc-ref inputs "libx11")))
- (substitute* "qt6gtk2.pri"
- (("UI_DIR") (string-append
- "PKG_CONFIG = "
- (assoc-ref inputs "pkg-config")
- "/bin/pkg-config"
- "\nPKG_CONFIG_PATH = "
- gtk2 "/include" ":" x11 "/include"
- "\nUI_DIR")))
+ (gtk2 (assoc-ref inputs "gtk+"))
+ (x11 (assoc-ref inputs "libx11")))
+ (substitute* "qt6gtk2.pri"
+ (("UI_DIR") (string-append
+ "PKG_CONFIG = "
+ (assoc-ref inputs "pkg-config")
+ "/bin/pkg-config"
+ "\nPKG_CONFIG_PATH = "
+ gtk2 "/include" ":" x11 "/include"
+ "\nUI_DIR")))
(invoke "qmake"
- (string-append "prefix=" out))
- )))
+ (string-append "prefix=" out)))))
(replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
@@ -94,17 +93,16 @@
(invoke "make" (string-append "INSTALL_ROOT=\"" out "\"") "install")
(let ((lib (string-append out qt5 "/lib")))
(invoke "mv" lib out)
- (invoke "rm" "-fr" (string-append out "/gnu"))))))
- )))
+ (invoke "rm" "-fr" (string-append out "/gnu")))))))))
(native-inputs
(list pkg-config
- qttools
+ qttools
coreutils))
(inputs
(list qtbase
gtk+-2
- libx11
- libxkbcommon))
+ libx11
+ libxkbcommon))
(home-page "")
(synopsis "")
(description "")
diff --git a/sakura/packages/yarn.scm b/sakura/packages/yarn.scm
index 03ee719..1d0a11f 100644
--- a/sakura/packages/yarn.scm
+++ b/sakura/packages/yarn.scm
@@ -1,10 +1,10 @@
(define-module (sakura packages yarn)
- #:use-module (guix packages)
- #:use-module (guix download)
- #:use-module (guix build-system gnu)
- #:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix utils)
- #:use-module (gnu packages node))
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix utils)
+ #:use-module (gnu packages node))
(define-public yarn
(package
diff --git a/sakura/services/cow.scm b/sakura/services/cow.scm
index 9893abf..5d85212 100644
--- a/sakura/services/cow.scm
+++ b/sakura/services/cow.scm
@@ -1,7 +1,7 @@
(define-module (sakura services cow)
- #:use-module (gnu services shepherd)
- #:use-module (guix modules)
- #:use-module (gnu))
+ #:use-module (gnu services shepherd)
+ #:use-module (guix modules)
+ #:use-module (gnu))
; repackage the cow store from guix since
; guix doesnt export it