the hyprland has happened

1 files changed, 8 insertions, 280 deletions

diff --git a/sigils/packages/hyprland.scm b/sigils/packages/hyprland.scm
index dff78cd..35b0b85 100644
--- a/sigils/packages/hyprland.scm
+++ b/sigils/packages/hyprland.scm
@@ -47,218 +47,11 @@
                  "-Dglvnd=enabled"
                  #$flags))))))
 
-;;; Hyprland
-
-(define-public hyprutils
-  (package
-    (name "hyprutils")
-    (version "0.2.5")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/hyprutils")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "13fi64ch0d0p2ss0xw7b8axsrsp9p3ckylx866kp17brd0dzvvs8"))))
-    (build-system cmake-build-system)
-    (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config))
-    (inputs (list pixman))
-    (arguments '(#:build-type "release"))
-    (synopsis "Hyprland utilities library used across the ecosystem")
-    (description "Hyprutils is a small C++ library for utilities used across
-the Hypr* ecosystem.")
-    (license license:bsd-3)))
-
-(define-public hyprwayland-scanner
-  (package
-    (name "hyprwayland-scanner")
-    (version "0.4.2")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/hyprwayland-scanner")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "0r7ay4zjkfyr0xd73wz99qhnqjq7nma98gm51wm9lmai4igw90qw"))))
-    (build-system cmake-build-system)
-    (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config))
-    (inputs (list pugixml))
-    (arguments '(#:tests? #f ;; No tests
-                 #:build-type "release"))
-    (synopsis "A Hyprland implementation of wayland-scanner")
-    (description "Hyprwayland-scanner automatically generates properly
-RAII-ready C++ bindings for Wayland protocols, for either servers or
-clients.")
-    (license license:bsd-3)))
-
-(define-public aquamarine
-  (package
-    (name "aquamarine")
-    (version "0.4.5")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/aquamarine")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "10wkyycxwahc0n3xczp7pi63823997qpm8x7z2sfqymda9ckl6d6"))))
-    (build-system cmake-build-system)
-    (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config
-                         hyprwayland-scanner))
-    (inputs (list wayland
-                  libglvnd
-                  mesa
-                  wayland-protocols-next
-                  hyprutils
-                  libdisplay-info
-                  libinput
-                  libdrm
-                  pixman
-                  hwdata
-                  libseat))
-    (arguments (list #:cmake cmake-3.30
-                     #:tests? #f ;; TODO: tests use wayland yada yada
-                     #:build-type "release"))
-    (synopsis "Lightweight rendering library")
-    (description "Aquamarine is a very light linux rendering backend
-library. It provides basic abstractions for an application to render on a
-Wayland session (in a window) or a native DRM session.")
-    (license license:bsd-3)))
-
-(define-public hyprland-protocols
-  (package
-    (name "hyprland-protocols")
-    (version "0.4.0")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/hyprland-protocols")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "0x86w7z3415qvixfhk9a8v5fnbnxdydzx366qz0mpmfg5h86qyha"))))
-    (build-system meson-build-system)
-    (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config))
-    (arguments '(#:build-type "release"))
-    (synopsis "Wayland protocol extensions for Hyprland")
-    (description "This repository exists in an effort to bridge the gap
-between Hyprland and KDE/Gnome's functionality.
-
-Since wayland-protocols is slow to change (on top of Hyprland not being
-allowed to contribute), we have to maintain a set of protocols Hyprland uses
-to plumb some things / add a few minor features. Most of the protocols here
-are small, hyprland-exclusive plumbing protocols anyways.")
-    (license license:bsd-3)))
-
-(define-public hyprlang
-  (package
-    (name "hyprlang")
-    (version "0.5.3")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/hyprlang")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "0yvfrz3hdyxzhngzhr0bgc5279ra5fv01hbfi6pdj84pz0lpaw02"))))
-    (build-system cmake-build-system)
-    (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config))
-    (inputs (list hyprutils))
-    (arguments '(#:build-type "release"))
-    (synopsis "Hyprland configuration language")
-    (description "The hypr configuration language is a configuration language
-for linux applications.")
-    (license license:bsd-3)))
-
-(define-public hyprcursor
-  (package
-    (name "hyprcursor")
-    (version "0.1.10")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/hyprcursor")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "1rdn03ln7pqcwp8h4nmi7nc489q8y25dd3v4paq8ykvwzhvs3a1n"))))
-    (build-system cmake-build-system)
-    (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config))
-    (inputs (list hyprlang
-                  libzip
-                  cairo
-                  librsvg
-                  tomlplusplus))
-    (arguments '(#:tests? #f ;; Tests need a loaded cursor theme. TODO: fix
-                 #:build-type "release"))
-    (synopsis "The hyprland cursor format, library and utilities")
-    (description "Hyprcursor is a new cursor theme format made as a
-replacement for XCursor.")
-    (license license:bsd-3)))
-
-(define-public hyprland
-  (package
-    (name "hyprland")
-    (version "0.45.0")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/Hyprland")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "1wawqdc6wjk724b5drsh3nxhmss9ksk2ks94490lgf22wmf3ck3g"))))
-    (build-system meson-build-system)
-    (arguments (list #:configure-flags '(list "-Dxwayland=enabled"
-                                              "-Dsystemd=disabled")
-                     #:build-type "release"))
-    (native-inputs (list gcc-14 ;; TODO: remove this when GCC 14 is the default
-                         pkg-config
-                         cmake-minimal
-                         hyprwayland-scanner))
-    (propagated-inputs (list xorg-server-xwayland))
-    (inputs (list wayland
-                  aquamarine
-                  wayland-protocols-next
-                  hyprland-protocols
-                  hyprcursor
-                  hyprlang
-                  hyprutils
-                  libglvnd
-                  glib
-                  mesa
-                  cairo
-                  pango
-                  libxkbcommon
-                  libinput
-                  udis86
-                  tomlplusplus
-                  xorg-server-xwayland
-                  ;; X support
-                  libxcb
-                  xcb-util-errors
-                  xcb-util-wm
-                  libxcursor))
-    (synopsis "Independent, dynamic tiling Wayland compositor")
-    (description "Hyprland is a 100% independent, dynamic tiling Wayland compositor that doesn't sacrifice on its looks.")
-    (license license:bsd-3)))
+;;; Hyprland -- list of changes and notes about the guix version
+;;; All: (arguments '(#:build-type "release"))
+;;; All: (url "https://code.hyprland.org/hyprwm/...")
+;;; aquamarine: eudev in guix version
+;;; hyprland: binutils, pciutils, re2-next / pas glib, libxcb, tomlplusplus
 
 (define-public hyprpaper
   (package
@@ -371,71 +164,6 @@ utility.")
 @dfn{ext-idle-notify-v1} protocol.")
     (license license:bsd-3)))
 
-(define-public xdg-desktop-portal-hyprland
-  (package
-    (name "xdg-desktop-portal-hyprland")
-    (version "1.3.8")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/xdg-desktop-portal-hyprland")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "0aixrjyky2mzclnwypybpg01ihfbmwzfv09zbjis49q1clrszq2p"))))
-    (build-system cmake-build-system)
-    (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config
-                         hyprwayland-scanner))
-    (inputs (list mesa
-                  hyprland-protocols
-                  hyprlang
-                  hyprutils
-                  libdrm
-                  pipewire
-                  sdbus-c++-next
-                  qtbase
-                  wayland
-                  wayland-protocols-next))
-    (arguments '(#:tests? #f ;; No tests
-                 #:build-type "release"))
-    (synopsis "XDG desktop portal backend for Hyprland")
-    (description "xdg-desktop-portal-hyprland is Hyprland’s xdg-desktop-portal
-implementation. It allows for screensharing, global shortcuts, etc.")
-    (license license:bsd-3)))
-
-(define-public hyprpicker
-  (package
-    (name "hyprpicker")
-    (version "0.4.1")
-    (home-page "https://hyprland.org/")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://code.hyprland.org/hyprwm/hyprpicker")
-             (commit (string-append "v" version))))
-       (sha256
-        (base32 "11r06c62dqj81r27qhf36f3smnjyk3vz8naa655m8khv4qqvmvc2"))))
-    (build-system cmake-build-system)
-    (native-inputs (list gcc-13 ;; TODO: remove this when GCC 13 is the default
-                         pkg-config
-                         hyprwayland-scanner))
-    (inputs (list wayland
-                  wayland-protocols-next
-                  libxkbcommon
-                  cairo
-                  pango
-                  libjpeg-turbo
-                  hyprutils))
-    (arguments '(#:tests? #f ;; No tests
-                 #:build-type "release"))
-    (synopsis "wlroots-compatible Wayland color picker")
-    (description "hyprpicker is an utility for picking a color from your
-screen on Hyprland.")
-    (license license:bsd-3)))
-
 (define-public hyprsunset
   (package
     (name "hyprsunset")
@@ -477,7 +205,7 @@ for your system.")
              (url "https://github.com/shezdy/hyprsplit")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "16jnzz0kskq0yqafw99nr1lqbxp491sphzbb6x0wdc5qzj5cil52"))))
+        (base32 "0pfp8b3qjvigf4wrxn7l2q98y44bpfpg9jx5rdwqk4cd677f1rqv"))))
     (build-system meson-build-system)
     ;; Hyprland plugins need the same inputs as Hyprland, and Hyprland itself
     (native-inputs (package-native-inputs hyprland))
@@ -491,7 +219,7 @@ for your system.")
 (define (hyprland-plugins plugin syn)
   (package
     (name plugin)
-    (version (package-version hyprland))
+    (version "0.46.0") ;; 0.46.2 not there yet
     (home-page "https://hyprland.org/")
     (source
      (origin
@@ -500,7 +228,7 @@ for your system.")
              (url "https://code.hyprland.org/hyprwm/hyprland-plugins")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "0nfxcr6mxjvrja0jdsrrlyixfaaqdnfszp7bh8x8cqz9qp167sc4"))))
+        (base32 "1nh6x6gwbhsljfhpvqn85n9s1l0xlrljlm2xy5msrikssxbxgmj3"))))
     (build-system meson-build-system)
     ;; Hyprland plugins need the same inputs as Hyprland, and Hyprland itself
     (native-inputs (package-native-inputs hyprland))