From 412c2ffdc923e2759741e0c62b424cf74eb61ce6 Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Fri, 28 Nov 2025 21:27:32 -0500
Subject: Fixed neovim and systemd-stub

---
 modules/ryan-packages/bootloaders.scm        |  6 +++---
 modules/ryan-packages/linux.scm              | 18 +-----------------
 modules/ryan-packages/package-management.scm |  4 ++++
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/modules/ryan-packages/bootloaders.scm b/modules/ryan-packages/bootloaders.scm
index 10f38d1..4cbb8da 100644
--- a/modules/ryan-packages/bootloaders.scm
+++ b/modules/ryan-packages/bootloaders.scm
@@ -18,7 +18,7 @@
   #:use-module (guix build-system meson)
   #:use-module (guix build-system python))
 
-(define systemd-version "255")
+(define systemd-version "258")
 (define systemd-source
   (origin
     (method git-fetch)
@@ -28,7 +28,7 @@
     (file-name (git-file-name "systemd" systemd-version))
     (sha256
       (base32
-        "1qdyw9g3jgvsbc1aryr11gpc3075w5pg00mqv4pyf3hwixxkwaq6"))))
+        "18gnp45gl1154jra6qv95k8y7ny6phdm87yqi5jdq13cadlrklf6"))))
 
 (define-public (systemd-stub-name)
   (let ((arch (cond ((target-x86-32?) "ia32")
@@ -54,7 +54,7 @@
                ,(string-append "-Dsbat-distro-pkgname=" name)
                ,(string-append "-Dsbat-distro-version=" version))
         #:phases
-        #~(let ((stub #$(string-append "src/boot/efi/" (systemd-stub-name))))
+        #~(let ((stub #$(string-append "src/boot/" (systemd-stub-name))))
             (modify-phases %standard-phases
               (replace 'build
                 (lambda* (#:key parallel-build? #:allow-other-keys)
diff --git a/modules/ryan-packages/linux.scm b/modules/ryan-packages/linux.scm
index d5b215c..272280c 100644
--- a/modules/ryan-packages/linux.scm
+++ b/modules/ryan-packages/linux.scm
@@ -54,7 +54,7 @@
                 (base32
                   "0arypdiycmss5g9wav21hfdc384v1ly82jnsc32zincl2y3f628q"))))
     (native-inputs (modify-inputs (package-native-inputs neovim) (prepend gcc-14)))
-    (inputs (modify-inputs (package-inputs neovim) (append utf8proc-2.10.0) (replace "tree-sitter" treesitter-ryan)))))
+    (inputs (modify-inputs (package-inputs neovim) (append utf8proc) (replace "tree-sitter" treesitter-ryan)))))
 
 (define-public treesitter-ryan
   (package
@@ -73,20 +73,4 @@
               (snippet #~(begin
                            (delete-file-recursively "lib/src/unicode")))))))
 
-(define-public utf8proc-2.10.0
-  (package
-    (inherit utf8proc-2.7.0)
-    (version "2.10.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/JuliaStrings/utf8proc")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name "utf8proc" version))
-              (sha256
-                (base32
-                  "1n1k67x39sk8xnza4w1xkbgbvgb1g7w2a7j2qrqzqaw1lyilqsy2"))))
-    (native-inputs (modify-inputs (package-native-inputs utf8proc-2.7.0) (prepend julia)))
-    (arguments (append (package-arguments utf8proc-2.7.0) (list #:tests? #f)))))
-
 neovim-ryan
diff --git a/modules/ryan-packages/package-management.scm b/modules/ryan-packages/package-management.scm
index dac8929..18c7be4 100644
--- a/modules/ryan-packages/package-management.scm
+++ b/modules/ryan-packages/package-management.scm
@@ -108,6 +108,7 @@
     (arguments
       (list
         #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=on")
+        #:tests? #f
         #:phases
         #~(modify-phases %standard-phases
             (add-after 'unpack 'enter-build-directory
@@ -135,6 +136,9 @@
         (sha256
           (base32 "0d15b50cf9jgvh3w99xh6crh03bn2dmv9bdyvzq6knsk2diql1dj"))))
     (build-system cmake-build-system)
+    (arguments
+      (list
+        #:tests? #f))
     (home-page "https://github.com/ToruNiina/toml11")
     (synopsis "TODO")
     (description "TODO")
-- 
cgit v1.2.3