diff options
Diffstat (limited to 'modules/ryan-packages')
| -rw-r--r-- | modules/ryan-packages/bootloaders.scm | 6 | ||||
| -rw-r--r-- | modules/ryan-packages/linux.scm | 18 | ||||
| -rw-r--r-- | 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 @@ | |||
| 18 | #:use-module (guix build-system meson) | 18 | #:use-module (guix build-system meson) |
| 19 | #:use-module (guix build-system python)) | 19 | #:use-module (guix build-system python)) |
| 20 | 20 | ||
| 21 | (define systemd-version "255") | 21 | (define systemd-version "258") |
| 22 | (define systemd-source | 22 | (define systemd-source |
| 23 | (origin | 23 | (origin |
| 24 | (method git-fetch) | 24 | (method git-fetch) |
| @@ -28,7 +28,7 @@ | |||
| 28 | (file-name (git-file-name "systemd" systemd-version)) | 28 | (file-name (git-file-name "systemd" systemd-version)) |
| 29 | (sha256 | 29 | (sha256 |
| 30 | (base32 | 30 | (base32 |
| 31 | "1qdyw9g3jgvsbc1aryr11gpc3075w5pg00mqv4pyf3hwixxkwaq6")))) | 31 | "18gnp45gl1154jra6qv95k8y7ny6phdm87yqi5jdq13cadlrklf6")))) |
| 32 | 32 | ||
| 33 | (define-public (systemd-stub-name) | 33 | (define-public (systemd-stub-name) |
| 34 | (let ((arch (cond ((target-x86-32?) "ia32") | 34 | (let ((arch (cond ((target-x86-32?) "ia32") |
| @@ -54,7 +54,7 @@ | |||
| 54 | ,(string-append "-Dsbat-distro-pkgname=" name) | 54 | ,(string-append "-Dsbat-distro-pkgname=" name) |
| 55 | ,(string-append "-Dsbat-distro-version=" version)) | 55 | ,(string-append "-Dsbat-distro-version=" version)) |
| 56 | #:phases | 56 | #:phases |
| 57 | #~(let ((stub #$(string-append "src/boot/efi/" (systemd-stub-name)))) | 57 | #~(let ((stub #$(string-append "src/boot/" (systemd-stub-name)))) |
| 58 | (modify-phases %standard-phases | 58 | (modify-phases %standard-phases |
| 59 | (replace 'build | 59 | (replace 'build |
| 60 | (lambda* (#:key parallel-build? #:allow-other-keys) | 60 | (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 @@ | |||
| 54 | (base32 | 54 | (base32 |
| 55 | "0arypdiycmss5g9wav21hfdc384v1ly82jnsc32zincl2y3f628q")))) | 55 | "0arypdiycmss5g9wav21hfdc384v1ly82jnsc32zincl2y3f628q")))) |
| 56 | (native-inputs (modify-inputs (package-native-inputs neovim) (prepend gcc-14))) | 56 | (native-inputs (modify-inputs (package-native-inputs neovim) (prepend gcc-14))) |
| 57 | (inputs (modify-inputs (package-inputs neovim) (append utf8proc-2.10.0) (replace "tree-sitter" treesitter-ryan))))) | 57 | (inputs (modify-inputs (package-inputs neovim) (append utf8proc) (replace "tree-sitter" treesitter-ryan))))) |
| 58 | 58 | ||
| 59 | (define-public treesitter-ryan | 59 | (define-public treesitter-ryan |
| 60 | (package | 60 | (package |
| @@ -73,20 +73,4 @@ | |||
| 73 | (snippet #~(begin | 73 | (snippet #~(begin |
| 74 | (delete-file-recursively "lib/src/unicode"))))))) | 74 | (delete-file-recursively "lib/src/unicode"))))))) |
| 75 | 75 | ||
| 76 | (define-public utf8proc-2.10.0 | ||
| 77 | (package | ||
| 78 | (inherit utf8proc-2.7.0) | ||
| 79 | (version "2.10.0") | ||
| 80 | (source (origin | ||
| 81 | (method git-fetch) | ||
| 82 | (uri (git-reference | ||
| 83 | (url "https://github.com/JuliaStrings/utf8proc") | ||
| 84 | (commit (string-append "v" version)))) | ||
| 85 | (file-name (git-file-name "utf8proc" version)) | ||
| 86 | (sha256 | ||
| 87 | (base32 | ||
| 88 | "1n1k67x39sk8xnza4w1xkbgbvgb1g7w2a7j2qrqzqaw1lyilqsy2")))) | ||
| 89 | (native-inputs (modify-inputs (package-native-inputs utf8proc-2.7.0) (prepend julia))) | ||
| 90 | (arguments (append (package-arguments utf8proc-2.7.0) (list #:tests? #f))))) | ||
| 91 | |||
| 92 | neovim-ryan | 76 | 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 @@ | |||
| 108 | (arguments | 108 | (arguments |
| 109 | (list | 109 | (list |
| 110 | #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=on") | 110 | #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=on") |
| 111 | #:tests? #f | ||
| 111 | #:phases | 112 | #:phases |
| 112 | #~(modify-phases %standard-phases | 113 | #~(modify-phases %standard-phases |
| 113 | (add-after 'unpack 'enter-build-directory | 114 | (add-after 'unpack 'enter-build-directory |
| @@ -135,6 +136,9 @@ | |||
| 135 | (sha256 | 136 | (sha256 |
| 136 | (base32 "0d15b50cf9jgvh3w99xh6crh03bn2dmv9bdyvzq6knsk2diql1dj")))) | 137 | (base32 "0d15b50cf9jgvh3w99xh6crh03bn2dmv9bdyvzq6knsk2diql1dj")))) |
| 137 | (build-system cmake-build-system) | 138 | (build-system cmake-build-system) |
| 139 | (arguments | ||
| 140 | (list | ||
| 141 | #:tests? #f)) | ||
| 138 | (home-page "https://github.com/ToruNiina/toml11") | 142 | (home-page "https://github.com/ToruNiina/toml11") |
| 139 | (synopsis "TODO") | 143 | (synopsis "TODO") |
| 140 | (description "TODO") | 144 | (description "TODO") |
