upstreamed sdbus-c++ and removed libinput-next

2 files changed, 34 insertions, 49 deletions

diff --git a/sigils/packages/hyprland.scm b/sigils/packages/hyprland.scm
index 7824fc1..9e75516 100644
--- a/sigils/packages/hyprland.scm
+++ b/sigils/packages/hyprland.scm
@@ -31,25 +31,11 @@
   #:use-module (gnu packages wm)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages xorg)
+  #:use-module (sigils packages upstream))
 
 ;;; To upstream before the heat death of the universe
 
-(define-public libinput-next
-  (package
-    (inherit libinput)
-    (name "libinput")
-    (version "1.26.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://gitlab.freedesktop.org/libinput/libinput.git")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "010bqvic471prhja1j5xqni9dhqc36ikqpxi8ih0fs13wph70p4s"))))))
-
 (define-public udis86
   (let ((commit "5336633af70f3917760a6d441ff02d93477b0c86")
         (revision "1"))
@@ -82,36 +68,6 @@
 instruction set architectures.")
       (license license:bsd-2))))
 
-(define-public sdbus-c++-next
-  (package
-    (inherit sdbus-c++)
-    (name "sdbus-c++")
-    (version "2.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/Kistler-Group/sdbus-cpp")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1s6vhzln0rvac2r3v8nq08hsjhyz3y46fsy18i23ppjm30apkiav"))))
-    (arguments
-     (list
-      ;; Avoid the integration test, which requires a system bus.
-      #:test-target "sdbus-c++-unit-tests"
-      #:configure-flags #~(list "-DSDBUSCPP_BUILD_CODE_GEN=ON"
-                                "-DSDBUSCPP_BUILD_TESTS=ON"
-                                ;; Do not install tests.
-                                "-DSDBUSCPP_TESTS_INSTALL_PATH=/tmp"
-                                "-DCMAKE_VERBOSE_MAKEFILE=ON")
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'do-not-install-tests
-            (lambda _
-              (substitute* "tests/CMakeLists.txt"
-                (("/etc/dbus-1/system.d") "/tmp")))))))))
-
 ;;; Hyprland
 
 (define hyprland-version "0.44.1")
@@ -185,7 +141,7 @@ clients.")
                   wayland-protocols-next
                   hyprutils
                   libdisplay-info
-                  libinput-next
+                  libinput
                   libdrm
                   pixman
                   hwdata
@@ -307,7 +263,7 @@ replacement for XCursor.")
                   cairo
                   pango
                   libxkbcommon
-                  libinput-next
+                  libinput
                   udis86
                   tomlplusplus
                   xorg-server-xwayland
diff --git a/sigils/packages/upstream.scm b/sigils/packages/upstream.scm
index 053e402..c08548f 100644
--- a/sigils/packages/upstream.scm
+++ b/sigils/packages/upstream.scm
@@ -80,7 +80,6 @@ information such as the command that it would use, the detected MIME-type, etc."
    (description "An ncurses mixer for PulseAudio inspired by pavucontrol.")
    (license license:expat)))
 
-
 (define-public lnav
   (package
    (name "lnav")
@@ -115,3 +114,33 @@ information such as the command that it would use, the detected MIME-type, etc."
    (arguments
     '(#:tests? #f)) ;tests fail on the beta
    (license license:bsd-2)))
+
+(define-public sdbus-c++-next
+  (package
+    (inherit sdbus-c++)
+    (name "sdbus-c++")
+    (version "2.0.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Kistler-Group/sdbus-cpp")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1s6vhzln0rvac2r3v8nq08hsjhyz3y46fsy18i23ppjm30apkiav"))))
+    (arguments
+     (list
+      ;; Avoid the integration test, which requires a system bus.
+      #:test-target "sdbus-c++-unit-tests"
+      #:configure-flags #~(list "-DSDBUSCPP_BUILD_CODE_GEN=ON"
+                                "-DSDBUSCPP_BUILD_TESTS=ON"
+                                ;; Do not install tests.
+                                "-DSDBUSCPP_TESTS_INSTALL_PATH=/tmp"
+                                "-DCMAKE_VERBOSE_MAKEFILE=ON")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'do-not-install-tests
+            (lambda _
+              (substitute* "tests/CMakeLists.txt"
+                (("/etc/dbus-1/system.d") "/tmp")))))))))