From c6ca83ba2939718254013d19b798ddb6699611b4 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Wed, 31 Jan 2024 09:45:24 +0100 Subject: [PATCH] . --- zilti/packages/hyprland.scm | 99 +++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 38 deletions(-) diff --git a/zilti/packages/hyprland.scm b/zilti/packages/hyprland.scm index 1ff5f4a..83a6481 100644 --- a/zilti/packages/hyprland.scm +++ b/zilti/packages/hyprland.scm @@ -36,48 +36,70 @@ #:use-module (gnu packages wm) #:use-module (gnu packages xorg)) +(define-public tomlplusplus + (package + (name "tomlplusplus") + (version "3.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/marzer/tomlplusplus") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1hvbifzcc97r9jwjzpnq31ynqnj5y93cjz4frmgddnkg8hxmp6w7")))) + (build-system cmake-build-system) + (native-inputs + (list python)) + (arguments + (list #:tests? #f)) + (home-page "https://marzer.github.io/tomlplusplus/") + (synopsis "Header-only TOML config file parser and serializer for C++17") + (description "Header-only TOML config file parser and serializer for C++17.") + (license license:expat))) + (define-public hwdata (package - (name "hwdata") - (version "0.377") ;updated monthly - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/vcrhonek/hwdata") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0pfnghr9i6aazhmhm4chia6bpnqvmrc60q62dx5561av7zkgsdhq")))) - (build-system gnu-build-system) - (native-inputs - (list pkg-config)) - (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) - (arguments - ;; Tests require pciutils, python, podman. Disable to avoid recursive dep. - (list - #:tests? #f - ;; Do not cross-compile, since the package only contains data. - #:target #f - #:configure-flags #~(list (string-append "--datadir=" #$output "/share")) - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'post-install - (lambda _ - (install-file "iab.txt" (string-append #$output:iab "/share/hwdata")) - (install-file "oui.txt" (string-append #$output:oui "/share/hwdata")) - (install-file "pci.ids" (string-append #$output:pci "/share/hwdata")) - (install-file "pnp.ids" (string-append #$output:pnp "/share/hwdata")) - (install-file "usb.ids" (string-append #$output:usb "/share/hwdata"))))))) - (home-page "https://github.com/vcrhonek/hwdata") - (synopsis "Hardware identification and configuration data") - (description "@code{hwdata} contains various hardware identification and + (name "hwdata") + (version "0.377") ;updated monthly + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vcrhonek/hwdata") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pfnghr9i6aazhmhm4chia6bpnqvmrc60q62dx5561av7zkgsdhq")))) + (build-system gnu-build-system) + (native-inputs + (list pkg-config)) + (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) + (arguments + ;; Tests require pciutils, python, podman. Disable to avoid recursive dep. + (list + #:tests? #f + ;; Do not cross-compile, since the package only contains data. + #:target #f + #:configure-flags #~(list (string-append "--datadir=" #$output "/share")) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'post-install + (lambda _ + (install-file "iab.txt" (string-append #$output:iab "/share/hwdata")) + (install-file "oui.txt" (string-append #$output:oui "/share/hwdata")) + (install-file "pci.ids" (string-append #$output:pci "/share/hwdata")) + (install-file "pnp.ids" (string-append #$output:pnp "/share/hwdata")) + (install-file "usb.ids" (string-append #$output:usb "/share/hwdata"))))))) + (home-page "https://github.com/vcrhonek/hwdata") + (synopsis "Hardware identification and configuration data") + (description "@code{hwdata} contains various hardware identification and configuration data, such as the @file{pci.ids} and @file{usb.ids} databases. Each database is contained in a specific package output, such as the @code{pci} output for @file{pci.ids}, the @code{usb} output for @file{usb.ids}, etc.") - (license (list license:gpl2+ - license:expat)))) ;XFree86 1.0 + (license (list license:gpl2+ + license:expat)))) ;XFree86 1.0 (define-public libinput-1.24 ;; Updating this will rebuild over 700 packages through libinput-minimal. @@ -323,7 +345,7 @@ Wayland compositor based on wlroots") (description "Hyprland.") (define-public hyprland (package (name "hyprland") - (version "0.33.1") + (version "0.34.0") (source (origin (method git-fetch) @@ -333,7 +355,7 @@ Wayland compositor based on wlroots") (description "Hyprland.") (file-name (git-file-name name version)) (sha256 (base32 - "1b4d6r68cqx09blf5xdr1c23hw7axr8sx21wsxjjygqrhkkabdx7")) + "0jsqfg8yk2b1z52fmqw1jjn6b8qkfh5x0xk1j0zx7ng4il2f6ajr")) (modules '((guix build utils))) (snippet #~(begin @@ -376,6 +398,7 @@ Wayland compositor based on wlroots") (description "Hyprland.") libxkbcommon libdrm-2.4.118 mesa + tomlplusplus wayland wayland-protocols pango