mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Compare commits
415 commits
3936754153
...
7d1d1d1f7c
Author | SHA1 | Date | |
---|---|---|---|
|
7d1d1d1f7c | ||
|
b9e46d0503 | ||
|
9debe9ecee | ||
|
8e8681b28b | ||
|
7679fdc8d4 | ||
|
34778811bb | ||
|
3ba037d943 | ||
|
d914359191 | ||
|
c3be000890 | ||
|
db0fdc19ab | ||
|
b03b8d23e0 | ||
|
d759207ff9 | ||
|
1fc71fd013 | ||
|
c82011112e | ||
|
72f1f55961 | ||
|
2ff3cdf8aa | ||
|
4660273f00 | ||
|
a68bcfd2f5 | ||
|
ef4e77e76d | ||
|
7365e16db8 | ||
|
ea4eeeed03 | ||
|
7d10553db7 | ||
|
6a57156e97 | ||
|
d9e2ee3e99 | ||
|
d12c4452a4 | ||
|
5b218cd2b9 | ||
|
66463356ce | ||
|
0a670987c7 | ||
|
b6a739465d | ||
|
c87a9b855e | ||
|
d042111c9e | ||
|
96d87b4747 | ||
|
eb893dbdd5 | ||
|
1aa6da547d | ||
|
642083da2b | ||
|
7bf508edfe | ||
|
3300dba9eb | ||
|
5ca1fc21b1 | ||
|
f662d53406 | ||
|
624a9d203c | ||
|
57eddd2821 | ||
|
c03d68ca62 | ||
|
afaaee573d | ||
|
ff94136614 | ||
|
0d4718bd4a | ||
|
937d4be4ce | ||
|
24d74bc19c | ||
|
fcd22bcca1 | ||
|
961fe736aa | ||
|
ed5f5d471f | ||
|
7ae8fe9cf3 | ||
|
f61e85cb07 | ||
|
63567c6e3e | ||
|
a8ab69d273 | ||
|
c1ef6dc237 | ||
|
c0e31bbb7c | ||
|
24701a21e8 | ||
|
87af8a9809 | ||
|
12699cf858 | ||
|
9a70af56e0 | ||
|
970f7477ba | ||
|
8118eb0b5a | ||
|
ec13537053 | ||
|
f2c3ff8cba | ||
|
afca847fe3 | ||
|
e1cf791ddd | ||
|
2a42babb2b | ||
|
4ed3c827c6 | ||
|
3799b786f2 | ||
|
1567529b91 | ||
|
9de6ed0a7e | ||
|
9db8fe9779 | ||
|
5f2dcf1688 | ||
|
f5214fd999 | ||
|
7972e721be | ||
|
3cc286dee7 | ||
|
b1fe9aa142 | ||
|
987ad77492 | ||
|
5b85b61ba6 | ||
|
be6112c4c0 | ||
|
f29d9529bc | ||
|
08be16a5c9 | ||
|
7b06ed4683 | ||
|
56218935a5 | ||
|
51bb7e3ab8 | ||
|
895c1399b3 | ||
|
bd85b798b1 | ||
|
d416e18d4a | ||
|
46b13a7cb5 | ||
|
7f8d776399 | ||
|
e6afe9ca0b | ||
|
54ef10659a | ||
|
9400c490fa | ||
|
8c420e7026 | ||
|
25eecd8f38 | ||
|
21b9ac33b7 | ||
|
1ce1dfb223 | ||
|
1c772405a8 | ||
|
92db83c0e3 | ||
|
bdcfce5451 | ||
|
ee678d4a67 | ||
|
7f4a856e6b | ||
|
eda020d26d | ||
|
90e7d46b82 | ||
|
07cb5eb31c | ||
|
3d7108bb1f | ||
|
814c296e27 | ||
|
17d6ea555a | ||
|
1aec87681f | ||
|
326148184a | ||
|
94ad220fc7 | ||
|
41a9e0c833 | ||
|
f23831c6f1 | ||
|
8aaccca456 | ||
|
12a442075b | ||
|
03d9638d6b | ||
|
6b174324fd | ||
|
ba51df44a0 | ||
|
a84739f836 | ||
|
9a1f372a34 | ||
|
017e72f21b | ||
|
cb5d44b7ea | ||
|
21ea91f8d7 | ||
|
072e6e7693 | ||
|
0730e2575e | ||
|
fcff2bbd1d | ||
|
d773593a92 | ||
|
2bc5b3e528 | ||
|
68a19a98ae | ||
|
5264e9639f | ||
|
021f383da0 | ||
|
0826fb4b4b | ||
|
81435d8fe8 | ||
|
ad2094192d | ||
|
946a5e5ef1 | ||
|
551e9ee920 | ||
|
206e3a3b70 | ||
|
b7d276c95f | ||
|
9b5d0dd089 | ||
|
5f5e9800a7 | ||
|
514fcd5de1 | ||
|
62cc713b0f | ||
|
c3e0d76346 | ||
|
f5b3b375e5 | ||
|
a57c4bde89 | ||
|
d74d4d9a2a | ||
|
c69b54b2fa | ||
|
7b240f554d | ||
|
28ada12608 | ||
|
5fc7a9968c | ||
|
56931676cc | ||
|
2797d82c2c | ||
|
5b4e843ce5 | ||
|
10a569fe1b | ||
|
b7d3e55b48 | ||
|
9acd7ea835 | ||
|
b5c3d802e5 | ||
|
79ee655238 | ||
|
c47f2c89a2 | ||
|
29b443230c | ||
|
43e5e856e1 | ||
|
3559381d6e | ||
|
20253429f2 | ||
|
2557871b20 | ||
|
3981573ee2 | ||
|
1b11494467 | ||
|
a7451a7700 | ||
|
8f57e6c996 | ||
|
14e0bca6dd | ||
|
13ef35140f | ||
|
5f891fed27 | ||
|
2025ddad29 | ||
|
212b2b5ee0 | ||
|
c5fa4b1495 | ||
|
302f532b5c | ||
|
d75aa2a52b | ||
|
959fed3a9c | ||
|
eace43ea7b | ||
|
a4f89fbd7f | ||
|
dc63eb7d5c | ||
|
aea04883d0 | ||
|
b1a5b04045 | ||
|
7177f24858 | ||
|
65c30b7b8a | ||
|
88aa4e9e2c | ||
|
6667e98fd9 | ||
|
bf3b751699 | ||
|
03f59b6f29 | ||
|
a878d3ceab | ||
|
f8d692617f | ||
|
ec1995734d | ||
|
5fc4252026 | ||
|
bb07d7c1b2 | ||
|
738d971d7e | ||
|
0a85a0ee9d | ||
|
e204bb5f1d | ||
|
b4e5a7bfd4 | ||
|
8d94240589 | ||
|
6ff714dfb1 | ||
|
11dcc36d5e | ||
|
3dc53ee3e7 | ||
|
b08fea7497 | ||
|
9570059354 | ||
|
24582bf8e2 | ||
|
59a1048555 | ||
|
dc959be641 | ||
|
76aebf2139 | ||
|
8860d76d78 | ||
|
fe355fa142 | ||
|
eb46ec7813 | ||
|
8e43073171 | ||
|
713501d840 | ||
|
6f8e11ad48 | ||
|
c3d4d79f52 | ||
|
1c73ab126d | ||
|
79127b953d | ||
|
1254705b89 | ||
|
57d23870c5 | ||
|
14ca201bc3 | ||
|
c91b01f1df | ||
|
d300b9f7f3 | ||
|
fa832b8a8e | ||
|
9fd1794a6a | ||
|
d8ec0c6ce4 | ||
|
0a7738536b | ||
|
86fab16adb | ||
|
94e8fe6a16 | ||
|
ffafaef8d5 | ||
|
75e243cc15 | ||
|
63f0d10810 | ||
|
b06afc5805 | ||
|
877610c1ce | ||
|
b9b7351a1d | ||
|
7445776b7e | ||
|
19deb9b658 | ||
|
3a64c0352b | ||
|
592e637b37 | ||
|
26ddcca4a8 | ||
|
d486103d3c | ||
|
1ebb697487 | ||
|
fbde0292f9 | ||
|
f62206ecd8 | ||
|
3d0496e48e | ||
|
ee88eb6a85 | ||
|
aa47a27f9a | ||
|
9cba4234eb | ||
|
54b5356488 | ||
|
10482f731e | ||
|
a7db92d9b3 | ||
|
22613ce2a0 | ||
|
d0d87a744d | ||
|
bd3c19763a | ||
|
4540b7bb67 | ||
|
66f134b636 | ||
|
267ac92abd | ||
|
881038ccdc | ||
|
09e7d188dd | ||
|
ea92fb0c49 | ||
|
2e84388780 | ||
|
045588eba8 | ||
|
891023ed6e | ||
|
ed80b51de2 | ||
|
973dea10e2 | ||
|
db3e51169c | ||
|
2b321e7a86 | ||
|
22f944e478 | ||
|
009ca1c72f | ||
|
a365e9f4ad | ||
|
1e05dcfbd0 | ||
|
271e67201a | ||
|
5bc29e79ac | ||
|
05fc558fb2 | ||
|
036e8fada3 | ||
|
362f9ee4da | ||
|
798ccec7b2 | ||
|
332d125d00 | ||
|
152450668f | ||
|
1e0c99eaca | ||
|
6d552d2ad1 | ||
|
5c9649091a | ||
|
6b32feee0f | ||
|
1c9be166c1 | ||
|
a480ab6908 | ||
|
117cd790d8 | ||
|
105e76302d | ||
|
d124612ee3 | ||
|
4a5b0dc5f8 | ||
|
7e1b139cdd | ||
|
26c4e0341e | ||
|
6219f1f657 | ||
|
ac30258bf9 | ||
|
2eb1801934 | ||
|
5d58cb25bc | ||
|
2c47027d02 | ||
|
80065cbaa9 | ||
|
f24f49e36c | ||
|
035d1b0a63 | ||
|
75e45d4eea | ||
|
b71c347e3c | ||
|
c52a9cee53 | ||
|
6d242496db | ||
|
64c35295f5 | ||
|
19b98ac19e | ||
|
f12d117de8 | ||
|
440280ea6b | ||
|
bf294bd4c1 | ||
|
5f3d9a5662 | ||
|
d970689f80 | ||
|
7c5054876a | ||
|
d7cb3fcd5f | ||
|
dada1500ea | ||
|
33ac981c50 | ||
|
644fb575dd | ||
|
bb3e97f6e6 | ||
|
829d136a90 | ||
|
f4c332b925 | ||
|
e25bd0a15b | ||
|
3ba54dd24a | ||
|
95dd640b7e | ||
|
9a8fb2cfc4 | ||
|
863a8b3906 | ||
|
ba2f9748f7 | ||
|
91188fc691 | ||
|
7841acc422 | ||
|
ebe032d51d | ||
|
6e583023ab | ||
|
85e8036412 | ||
|
03c2629750 | ||
|
bd8fe75dc3 | ||
|
18198de00c | ||
|
f89ac5af6a | ||
|
51e1f76574 | ||
|
4b67e24126 | ||
|
f45e3ec6d8 | ||
|
f797586635 | ||
|
0fabca25f7 | ||
|
fd61cab6ae | ||
|
2ed4446602 | ||
|
90387339cb | ||
|
3c2c910f58 | ||
|
25e0b40ddf | ||
|
57b5cadc79 | ||
|
9e006becbb | ||
|
50ee5c34be | ||
|
4ab38d110a | ||
|
5543bd8177 | ||
|
fc286ab261 | ||
|
8bda15e99a | ||
|
3d3ae727d6 | ||
|
ea4a3af739 | ||
|
5d8332a282 | ||
|
23dd2a4091 | ||
|
bf6a41e235 | ||
|
e29efb3123 | ||
|
2b70a3d191 | ||
|
4fbf920dc1 | ||
|
d00c933611 | ||
|
a2cfacbb2a | ||
|
3fd8b69c7c | ||
|
d2ebfb5394 | ||
|
7984b5e387 | ||
|
b260b32f09 | ||
|
a1bbe3aa81 | ||
|
d8d86377fb | ||
|
881fcbb5fa | ||
|
01f4402f53 | ||
|
c47bbc300b | ||
|
c750bcf19b | ||
|
e0ba5d8a9e | ||
|
7a2404540a | ||
|
e47c746bd9 | ||
|
3031ab4d1e | ||
|
277198b033 | ||
|
7542a08e7f | ||
|
c26067be8b | ||
|
c3f96b1360 | ||
|
910aa445a8 | ||
|
4d92cf9a0d | ||
|
841b455ed4 | ||
|
1783452af7 | ||
|
6777e6aff1 | ||
|
8041e69123 | ||
|
9278f3fcd6 | ||
|
225fbe4d64 | ||
|
50cc84e04c | ||
|
509a07cd75 | ||
|
21975070fb | ||
|
bbac4cafc8 | ||
|
55b19df0d6 | ||
|
aeacaa97eb | ||
|
d0a3b258b7 | ||
|
b203c5c29d | ||
|
41ef2b3870 | ||
|
9b6b8ba530 | ||
|
b347762569 | ||
|
4105d39d1c | ||
|
c1fec8920e | ||
|
e4a6f8aec7 | ||
|
c8ebbc4cf6 | ||
|
4c6b48a69f | ||
|
0f51f478ff | ||
|
0d44a8c65a | ||
|
a46c3bca7f | ||
|
6d974ff475 | ||
|
abbd89285a | ||
|
78d2261524 | ||
|
f4d36798f3 | ||
|
1bafae93f7 | ||
|
245be4a6d8 | ||
|
9247dcc997 | ||
|
b913a87ee9 | ||
|
ea5df9318d | ||
|
69e90e7db7 | ||
|
d6bc217808 | ||
|
de41613d27 |
386 changed files with 8759 additions and 7354 deletions
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2017 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2018-2020 Caleb Ristvedt <caleb.ristvedt@cune.org>
|
||||
;;; Copyright © 2020-2023,2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020-2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
|
||||
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
|
@ -98,27 +98,9 @@
|
|||
((indent-tabs-mode . nil)
|
||||
|
||||
;; Emacs 28 changed the behavior of 'lisp-fill-paragraph', which causes the
|
||||
;; first line of package descriptions to extrude past 'fill-column', and
|
||||
;; somehow that is deemed more correct upstream (see:
|
||||
;; https://issues.guix.gnu.org/56197).
|
||||
(eval . (progn
|
||||
(require 'lisp-mode)
|
||||
(defun emacs27-lisp-fill-paragraph (&optional justify)
|
||||
(interactive "P")
|
||||
(or (fill-comment-paragraph justify)
|
||||
(let ((paragraph-start
|
||||
(concat paragraph-start
|
||||
"\\|\\s-*\\([(;\"]\\|\\s-:\\|`(\\|#'(\\)"))
|
||||
(paragraph-separate
|
||||
(concat paragraph-separate "\\|\\s-*\".*[,\\.]$"))
|
||||
(fill-column (if (and (integerp emacs-lisp-docstring-fill-column)
|
||||
(derived-mode-p 'emacs-lisp-mode))
|
||||
emacs-lisp-docstring-fill-column
|
||||
fill-column)))
|
||||
(fill-paragraph justify))
|
||||
;; Never return nil.
|
||||
t))
|
||||
(setq-local fill-paragraph-function #'emacs27-lisp-fill-paragraph)))
|
||||
;; first line of package descriptions to extrude past 'fill-column'. The
|
||||
;; following variable reverts its behavior to the previous one.
|
||||
(lisp-fill-paragraphs-as-doc-string nil)
|
||||
|
||||
;; This notably allows '(' in Paredit to not insert a space when the
|
||||
;; preceding symbol is one of these.
|
||||
|
|
|
@ -98,6 +98,8 @@
|
|||
;; <https://lists.gnu.org/archive/html/guix-devel/2020-01/msg00499.html>.
|
||||
"1EFB 0909 1F17 D28C CBF9 B13A 53D4 57B2 D636 EE82"
|
||||
(name "roptat"))
|
||||
("EAD1 89E4 799B 5E5E B20A 2A19 CDBC 0BD9 5943 A706"
|
||||
(name "SameExpert"))
|
||||
(;; primary: "D6B0 C593 DA8C 5EDC A44C 7A58 C336 91F7 1188 B004"
|
||||
"A02C 2D82 0EF4 B25B A6B5 1D90 2AC6 A5EC 1C35 7C59"
|
||||
(name "samplet"))
|
||||
|
|
1
.mailmap
1
.mailmap
|
@ -57,6 +57,7 @@ Mathieu Othacehe <m.othacehe@gmail.com>
|
|||
Mathieu Othacehe <mathieu.othacehe@parrot.com>
|
||||
Mathieu Othacehe <othacehe@gnu.org>
|
||||
Matthew James Kraai <kraai@ftbfs.org>
|
||||
Maxim Cournoyer <maxim@guixotic.coop> <maxim.cournoyer@gmail.com>
|
||||
Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
|
||||
nikita <nikita@n0.is>
|
||||
nikita <nikita@n0.is> ng0 <ng0@n0.is>
|
||||
|
|
|
@ -126,10 +126,10 @@ gnu/system/examples/bare-bones\.tmpl @guix/documentation
|
|||
gnu/system/examples/lightweight-desktop\.tmpl @guix/documentation
|
||||
gnu/system/examples/desktop\.tmpl @guix/documentation
|
||||
|
||||
gnu/packages/fpga\.scm @guix/electronics
|
||||
gnu/packages/electronics\.scm @guix/electronics
|
||||
gnu/packages/libftdi\.scm @guix/electronics
|
||||
gnu/packages/engineering\.scm @guix/electronics
|
||||
gnu/packages/flashing-tools\.scm @guix/electronics
|
||||
|
||||
gnu/packages/aux-files/emacs/guix-emacs\.el @guix/emacs
|
||||
gnu/packages/aux-files/emacs/comp-integrity\.el @guix/emacs
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
# Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
# Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
# Copyright © 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
# Copyright © 2020, 2021, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
|
||||
# Copyright © 2021 Andrew Tropin <andrew@trop.in>
|
||||
# Copyright © 2023 Clément Lassieur <clement@lassieur.org>
|
||||
|
|
2
NEWS
2
NEWS
|
@ -4,7 +4,7 @@
|
|||
|
||||
Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
Copyright © 2021, 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
Copyright © 2021, 2022, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
|
||||
|
||||
Copying and distribution of this file, with or without modification,
|
||||
|
|
8
README
8
README
|
@ -56,11 +56,11 @@ behalf. The RPCs are implemented in the (guix store) module.
|
|||
|
||||
* Contact
|
||||
|
||||
GNU Guix is hosted at https://savannah.gnu.org/projects/guix/.
|
||||
GNU Guix is hosted at https://codeberg.org/guix/guix/.
|
||||
|
||||
Please email <help-guix@gnu.org> for questions and <bug-guix@gnu.org> for bug
|
||||
reports; email <gnu-system-discuss@gnu.org> for general issues regarding the
|
||||
GNU system.
|
||||
Please email mailto:help-guix@gnu.org for questions. Bug reports should be
|
||||
submitted via https://codeberg.org/guix/guix/issues/. Email
|
||||
mailto:gnu-system-discuss@gnu.org for general issues regarding the GNU system.
|
||||
|
||||
Join #guix on irc.libera.chat.
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ exec guile --no-auto-compile -e main -s "$0" "$@"
|
|||
(define script-version "2023-12-08.14") ;UTC
|
||||
|
||||
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This program is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017-2018, 2025 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020, 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# Copyright © 2018 nikita <nikita@n0.is>
|
||||
# Copyright © 2018, 2021 Julien Lepiller <julien@lepiller.eu>
|
||||
# Copyright © 2017-2018 Eric Bavier <bavier@posteo.net>
|
||||
# Copyright © 2020-2021, 2023-204 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
# Copyright © 2020-2021, 2023-204 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
# Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
# Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019-2025 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -2873,8 +2873,10 @@ Codeberg, a member of the ``Owners'' team can run:
|
|||
@end example
|
||||
|
||||
@noindent
|
||||
... where @var{token} is a token created on the Codeberg interface
|
||||
granting access to the relevant settings.
|
||||
... where @var{token} is a token created via the
|
||||
@url{https://codeberg.org/user/settings/applications, Codeberg
|
||||
applications settings page}, granting read/write access to the
|
||||
@samp{organization} permission.
|
||||
|
||||
@node Making Decisions
|
||||
@section Making Decisions
|
||||
|
@ -2926,12 +2928,9 @@ access by following these steps:
|
|||
|
||||
@enumerate
|
||||
@item
|
||||
Find three committers who would vouch for you. You can view the list of
|
||||
committers at
|
||||
@url{https://codeberg.org/guix/guix/settings/collaboration}. Each
|
||||
of them should email a statement to @email{guix-maintainers@@gnu.org} (a
|
||||
private alias for the collective of maintainers), signed with their
|
||||
OpenPGP key.
|
||||
Find three committers who would vouch for you. Each of them should
|
||||
email a statement to @email{guix-maintainers@@gnu.org} (a private alias
|
||||
for the collective of maintainers), signed with their OpenPGP key.
|
||||
|
||||
Committers are expected to have had some interactions with you as a
|
||||
contributor and to be able to judge whether you are sufficiently
|
||||
|
|
|
@ -22096,6 +22096,9 @@ resolver:
|
|||
@end lisp
|
||||
@end defvar
|
||||
|
||||
|
||||
@c %start of fragment
|
||||
|
||||
@deftp {Data Type} dhcpcd-configuration
|
||||
Available @code{dhcpcd-configuration} fields are:
|
||||
|
||||
|
@ -22150,11 +22153,15 @@ refer to @uref{https://www.rfc-editor.org/rfc/rfc2132#section-9.13,RFC
|
|||
|
||||
@item @code{client-id} (type: maybe-string)
|
||||
Use the interface hardware address or the given string as a client
|
||||
identifier, this is matually exclusive with the @code{duid} option.
|
||||
identifier, this is mutually exclusive with the @code{duid} option.
|
||||
|
||||
@item @code{extra-content} (type: maybe-string)
|
||||
Extra content to append to the configuration as-is.
|
||||
|
||||
@item @code{shepherd-provision} (default: @code{(networking)}) (type: list-of-symbols)
|
||||
This is a list of symbols naming Shepherd services provided by this
|
||||
service.
|
||||
|
||||
@item @code{shepherd-requirement} (default: @code{()}) (type: list-of-symbols)
|
||||
This is a list of symbols naming Shepherd services that this service
|
||||
will depend on.
|
||||
|
@ -22163,6 +22170,9 @@ will depend on.
|
|||
|
||||
@end deftp
|
||||
|
||||
|
||||
@c %end of fragment
|
||||
|
||||
@cindex NetworkManager
|
||||
|
||||
@defvar network-manager-service-type
|
||||
|
@ -43618,8 +43628,8 @@ Service type for binding a directory in multiple places on the file
|
|||
system.
|
||||
|
||||
The access rights are either the same in source and destination
|
||||
(@code{'bind}), or writes are translated back to the sources as if made
|
||||
by the destination's owner (@code{'translate}), or kept in an overlay
|
||||
(@code{'bind}), or writes are translated back to the source as if made
|
||||
by the source's owner (@code{'translate}), or kept in an overlay
|
||||
directory near the destination (@code{'overlay}). The service's value
|
||||
must be a @code{vfs-mapping-configuration} object.
|
||||
@end defvar
|
||||
|
@ -44867,7 +44877,7 @@ is @code{#f}, the service has to be started manually with @command{herd start}.
|
|||
Whether to have Shepherd restart the service when it stops, for instance when
|
||||
the underlying process dies.
|
||||
|
||||
@item @code{shepherd-actions} (default: @code{'()}) (type: list-of-symbols)
|
||||
@item @code{shepherd-actions} (default: @code{'()}) (type: list-of-shepherd-actions)
|
||||
This is a list of @code{shepherd-action} records defining actions supported
|
||||
by the service.
|
||||
|
||||
|
@ -46432,8 +46442,7 @@ user need to enter a passphrase or use the REPL, this happens using the
|
|||
intended keyboard layout.
|
||||
|
||||
When @var{qemu-networking?} is true, set up networking with the standard QEMU
|
||||
parameters. When @var{virtio?} is true, load additional modules so that the
|
||||
initrd can be used as a QEMU guest with para-virtualized I/O drivers.
|
||||
parameters.
|
||||
|
||||
When @var{volatile-root?} is true, the root file system is writable but any changes
|
||||
to it are lost.
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
|
||||
# Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
|
||||
# Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
# Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
# Copyright © 2022 Prafulla Giri <prafulla.giri@protonmail.com>
|
||||
# Copyright © 2023 Andrew Tropin <andrew@trop.in>
|
||||
# Copyright © 2020 David A. Redick <david.a.redick@gmail.com>
|
||||
|
@ -293,6 +293,9 @@ chk_sys_arch()
|
|||
ppc64le | powerpc64le)
|
||||
local arch=powerpc64le
|
||||
;;
|
||||
riscv64)
|
||||
local arch=riscv64
|
||||
;;
|
||||
*)
|
||||
die "Unsupported CPU type: ${arch}"
|
||||
esac
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
|
||||
;; Copyright © 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;; Copyright © 2020-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;; Copyright © 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;; Copyright © 2021–2023 Leo Famulari <leo@famulari.name>
|
||||
;; Copyright © 2021 Zhu Zihao <all_but_last@163.com>
|
||||
;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
|
||||
|
|
|
@ -10,7 +10,7 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@"
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2022-2024 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
|
||||
;;; Copyright © 2022, 2023, 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023, 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com>
|
||||
;;; Copyright © 2025 Jelle Licht <jlicht@fsfe.org>
|
||||
;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
|
||||
|
@ -601,10 +601,10 @@ already exists. Lookup team IDs among CURRENT-TEAMS."
|
|||
(team 'electronics
|
||||
#:name "Electronics team"
|
||||
#:description "Electronics and hardware related packages."
|
||||
#:scope (list "gnu/packages/fpga.scm"
|
||||
"gnu/packages/electronics.scm"
|
||||
#:scope (list "gnu/packages/electronics.scm"
|
||||
"gnu/packages/libftdi.scm"
|
||||
"gnu/packages/engineering.scm")))
|
||||
"gnu/packages/engineering.scm"
|
||||
"gnu/packages/flashing-tools.scm")))
|
||||
|
||||
(define-team emacs
|
||||
(team 'emacs
|
||||
|
@ -1068,7 +1068,8 @@ the \"texlive\" importer."
|
|||
bootstrap core-packages lxqt science tex)
|
||||
|
||||
(define-member (person "Tanguy Le Carrour"
|
||||
"tanguy@bioneland.org")
|
||||
"tanguy@bioneland.org"
|
||||
"tanguybl")
|
||||
python home)
|
||||
|
||||
(define-member (person "Tobias Geerinckx-Rice"
|
||||
|
@ -1142,7 +1143,8 @@ the \"texlive\" importer."
|
|||
home emacs)
|
||||
|
||||
(define-member (person "pukkamustard"
|
||||
"pukkamustard@posteo.net")
|
||||
"pukkamustard@posteo.net"
|
||||
"pukkamustard")
|
||||
ocaml)
|
||||
|
||||
(define-member (person "Josselin Poiret"
|
||||
|
@ -1173,7 +1175,7 @@ the \"texlive\" importer."
|
|||
reproduciblebuilds)
|
||||
|
||||
(define-member (person "Maxim Cournoyer"
|
||||
"maxim.cournoyer@gmail.com"
|
||||
"maxim@guixotic.coop"
|
||||
"apteryx")
|
||||
documentation gnome qt telephony electronics)
|
||||
|
||||
|
@ -1254,8 +1256,9 @@ the \"texlive\" importer."
|
|||
core-packages qt kde)
|
||||
|
||||
(define-member (person "Sughosha"
|
||||
"sughosha@disroot.org")
|
||||
kde)
|
||||
"sughosha@disroot.org"
|
||||
"SameExpert")
|
||||
audio kde)
|
||||
|
||||
(define-member (person "Jelle Licht"
|
||||
"jlicht@fsfe.org"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env -S guix repl --
|
||||
!# ;-*- mode: scheme; -*-
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019, 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
|
||||
;;; Copyright © 2022 Karl Hallsby <karl@hallsby.com>
|
||||
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2023-2024 Herman Rimm <herman@rimm.ee>
|
||||
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
|
||||
|
@ -47,6 +47,7 @@
|
|||
u-boot-pinebook-bootloader
|
||||
u-boot-pinebook-pro-rk3399-bootloader
|
||||
u-boot-puma-rk3399-bootloader
|
||||
u-boot-rock-4c-plus-rk3399-bootloader
|
||||
u-boot-rock64-rk3328-bootloader
|
||||
u-boot-rockpro64-rk3399-bootloader
|
||||
u-boot-sifive-unmatched-bootloader
|
||||
|
@ -252,6 +253,11 @@ is BLOCK-SIZE * COUNT, or FILE size if COUNT is not given."
|
|||
(package u-boot-puma-rk3399)
|
||||
(disk-image-installer install-puma-rk3399-u-boot)))
|
||||
|
||||
(define u-boot-rock-4c-plus-rk3399-bootloader
|
||||
(bootloader
|
||||
(inherit u-boot-rockchip-bootloader)
|
||||
(package u-boot-rock-4c-plus-rk3399)))
|
||||
|
||||
(define u-boot-rock64-rk3328-bootloader
|
||||
(bootloader
|
||||
(inherit u-boot-rockchip-bootloader)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2019–2021, 2024 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 David C. Trudgian <dave@trudgian.net>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>
|
||||
|
@ -286,14 +286,14 @@ unmounted."
|
|||
(define %page-size 4096)
|
||||
|
||||
(define (linux-swap-superblock? sblock)
|
||||
"Return #t when SBLOCK is an linux-swap superblock."
|
||||
"Return #t when SBLOCK is a linux-swap superblock."
|
||||
(and (= (bytevector-length sblock) %page-size)
|
||||
(bytevector=? (sub-bytevector sblock (- %page-size 10) 10)
|
||||
%linux-swap-magic)))
|
||||
|
||||
(define (read-linux-swap-superblock device)
|
||||
"Return the raw contents of DEVICE's linux-swap superblock as a bytevector, or #f
|
||||
if DEVICE does not contain an linux-swap file system."
|
||||
if DEVICE does not contain a linux-swap file system."
|
||||
(read-superblock device 0 %page-size linux-swap-superblock?))
|
||||
|
||||
;; See 'union swap_header' in 'include/linux/swap.h'.
|
||||
|
@ -336,6 +336,39 @@ negative, defaulting to 0.~%") p)
|
|||
0))
|
||||
(logior prio-flag delayed-flag))
|
||||
|
||||
|
||||
;;;
|
||||
;;; Linux swap, after hibernation.
|
||||
;;;
|
||||
|
||||
;; Linux swap space header is rewritten with a swsusp_header on
|
||||
;; hibernate, which takes the HIBERNATE_SIG signature, which is this
|
||||
;; string; see function mark_swapfiles in kernel/power/swap.c. In the
|
||||
;; linux kernel the comparison is always done on 10 bytes, which
|
||||
;; include the trailing zero in the case of HIBERNATE_SIG while not
|
||||
;; including it for %linux-swap-magic.
|
||||
(define %linux-swsuspend-magic
|
||||
(string->utf8 "S1SUSPEND\0"))
|
||||
|
||||
;; The kernel structure swsusp_header is duplicated from the swap header, in
|
||||
;; kernel/power/swap.c.
|
||||
(define (linux-swsuspend-superblock? sblock)
|
||||
"Return #t when SBLOCK is a linux-swap superblock we can resume from."
|
||||
(and (= (bytevector-length sblock) %page-size)
|
||||
(bytevector=? (sub-bytevector sblock (- %page-size 10) 10)
|
||||
%linux-swsuspend-magic)))
|
||||
|
||||
;; If we want to resume through UUID and/or LABEL from swap partitions, we
|
||||
;; need to fetch UUID/LABEL from partitions with such magics.
|
||||
(define (read-linux-swsuspend-superblock device)
|
||||
"Return the raw contents of DEVICE's linux-swsuspend superblock as a
|
||||
bytevector, or #f if DEVICE does not contain an linux-swap file system with an
|
||||
hibernation image from which we can resume."
|
||||
(read-superblock device 0 %page-size linux-swsuspend-superblock?))
|
||||
|
||||
;; Label and UUID information are otherwise left untouched, therefore, swap
|
||||
;; functions are reused.
|
||||
|
||||
|
||||
|
||||
;;;
|
||||
|
@ -349,7 +382,7 @@ negative, defaulting to 0.~%") p)
|
|||
(identifier-syntax (endianness little)))
|
||||
|
||||
(define (bcachefs-superblock? sblock)
|
||||
"Return #t when SBLOCK is an bcachefs superblock."
|
||||
"Return #t when SBLOCK is a bcachefs superblock."
|
||||
(bytevector=? (sub-bytevector sblock 24 16)
|
||||
#vu8(#xc6 #x85 #x73 #xf6 #x4e #x1a #x45 #xca
|
||||
#x82 #x65 #xf5 #x7f #x48 #xba #x6d #x81)))
|
||||
|
@ -1052,6 +1085,8 @@ partition field reader that returned a value."
|
|||
ext2-superblock-volume-name)
|
||||
(partition-field-reader read-linux-swap-superblock
|
||||
linux-swap-superblock-volume-name)
|
||||
(partition-field-reader read-linux-swsuspend-superblock
|
||||
linux-swap-superblock-volume-name)
|
||||
(partition-field-reader read-bcachefs-superblock
|
||||
bcachefs-superblock-volume-name)
|
||||
(partition-field-reader read-btrfs-superblock
|
||||
|
@ -1076,6 +1111,8 @@ partition field reader that returned a value."
|
|||
ext2-superblock-uuid)
|
||||
(partition-field-reader read-linux-swap-superblock
|
||||
linux-swap-superblock-uuid)
|
||||
(partition-field-reader read-linux-swsuspend-superblock
|
||||
linux-swap-superblock-uuid)
|
||||
(partition-field-reader read-bcachefs-superblock
|
||||
bcachefs-superblock-external-uuid)
|
||||
(partition-field-reader read-btrfs-superblock
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013-2020, 2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2016, 2017, 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
unprivileged-user-namespace-supported?
|
||||
setgroups-supported?
|
||||
%namespaces
|
||||
%writable-/tmp
|
||||
run-container
|
||||
call-with-container
|
||||
container-excursion
|
||||
|
@ -387,6 +388,16 @@ if there are no child processes left."
|
|||
(+ 128 (or (status:term-sig status)
|
||||
(status:stop-sig status)))))
|
||||
|
||||
(define %writable-/tmp
|
||||
;; Writable and volatile /tmp.
|
||||
(file-system
|
||||
(device "none")
|
||||
(mount-point "/tmp")
|
||||
(type "tmpfs")
|
||||
(flags '(no-suid no-dev))
|
||||
(options "mode=755,size=10%")
|
||||
(check? #f)))
|
||||
|
||||
(define* (call-with-container mounts thunk #:key (namespaces %namespaces)
|
||||
(host-uids 1) (guest-uid 0) (guest-gid 0)
|
||||
(lock-mounts? #t)
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2023 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016-2022, 2024 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020-2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020-2023, 2025 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -18,8 +18,12 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu build secret-service)
|
||||
#:autoload (fibers io-wakeup) (wait-until-port-readable-operation)
|
||||
#:autoload (fibers operations) (perform-operation
|
||||
choice-operation
|
||||
wrap-operation)
|
||||
#:autoload (fibers timers) (sleep-operation)
|
||||
#:use-module (guix build utils)
|
||||
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (rnrs bytevectors)
|
||||
#:use-module (ice-9 binary-ports)
|
||||
|
@ -33,6 +37,9 @@
|
|||
;;;
|
||||
;;; Utility procedures for copying secrets into a VM.
|
||||
;;;
|
||||
;;; Note: This code runs within the 'shepherd' process, hence the use of
|
||||
;;; Fibers.
|
||||
;;;
|
||||
;;; Code:
|
||||
|
||||
(define-syntax log
|
||||
|
@ -47,51 +54,15 @@
|
|||
;; to syslog.
|
||||
#'(format (current-output-port) fmt args ...))))))
|
||||
|
||||
(define-syntax with-modules
|
||||
(syntax-rules ()
|
||||
"Dynamically load the given MODULEs at run time, making the chosen
|
||||
bindings available within the lexical scope of BODY."
|
||||
((_ ((module #:select (bindings ...)) rest ...) body ...)
|
||||
(let* ((iface (resolve-interface 'module))
|
||||
(bindings (module-ref iface 'bindings))
|
||||
...)
|
||||
(with-modules (rest ...) body ...)))
|
||||
((_ () body ...)
|
||||
(begin body ...))))
|
||||
|
||||
(define (wait-for-readable-fd port timeout)
|
||||
"Wait until PORT has data available for reading or TIMEOUT has expired.
|
||||
Return #t in the former case and #f in the latter case."
|
||||
(match (resolve-module '(fibers) #f #:ensure #f) ;using Fibers?
|
||||
(#f
|
||||
(log "blocking on socket...~%")
|
||||
(match (select (list port) '() '() timeout)
|
||||
(((_) () ()) #t)
|
||||
((() () ()) #f)))
|
||||
(fibers
|
||||
;; We're running on the Shepherd 0.9+ with Fibers. Arrange to make a
|
||||
;; non-blocking wait so that other fibers can be scheduled in while we
|
||||
;; wait for PORT.
|
||||
(with-modules (((fibers) #:select (spawn-fiber sleep))
|
||||
((fibers channels)
|
||||
#:select (make-channel put-message get-message)))
|
||||
;; Make PORT non-blocking.
|
||||
(let ((flags (fcntl port F_GETFL)))
|
||||
(fcntl port F_SETFL (logior O_NONBLOCK flags)))
|
||||
|
||||
(let ((channel (make-channel)))
|
||||
(spawn-fiber
|
||||
(lambda ()
|
||||
(sleep timeout) ;suspends the fiber
|
||||
(put-message channel 'timeout)))
|
||||
(spawn-fiber
|
||||
(lambda ()
|
||||
(lookahead-u8 port) ;suspends the fiber
|
||||
(put-message channel 'readable)))
|
||||
(log "suspending fiber on socket...~%")
|
||||
(match (get-message channel)
|
||||
('readable #t)
|
||||
('timeout #f)))))))
|
||||
(perform-operation
|
||||
(choice-operation
|
||||
(wrap-operation (wait-until-port-readable-operation port)
|
||||
(const #t))
|
||||
(wrap-operation (sleep-operation timeout)
|
||||
(const #f)))))
|
||||
|
||||
(define (socket-address->string address)
|
||||
"Return a human-readable representation of ADDRESS, an object as returned by
|
||||
|
@ -135,10 +106,10 @@ HANDSHAKE-TIMEOUT seconds for handshake to complete. Return #f on failure."
|
|||
|
||||
(log "sending secrets to ~a~%" (socket-address->string address))
|
||||
|
||||
(let ((sock (socket AF_INET (logior SOCK_CLOEXEC SOCK_STREAM) 0))
|
||||
(sleep (if (resolve-module '(fibers) #f)
|
||||
(module-ref (resolve-interface '(fibers)) 'sleep)
|
||||
sleep)))
|
||||
(let ((sock (socket AF_INET
|
||||
(logior SOCK_CLOEXEC SOCK_NONBLOCK SOCK_STREAM)
|
||||
0))
|
||||
(sleep (module-ref (resolve-interface '(fibers)) 'sleep)))
|
||||
;; Connect to QEMU on the forwarded port. The 'connect' call succeeds as
|
||||
;; soon as QEMU is ready, even if there's no server listening on the
|
||||
;; forward port inside the guest.
|
||||
|
@ -185,23 +156,26 @@ HANDSHAKE-TIMEOUT seconds for handshake to complete. Return #f on failure."
|
|||
(unless (= ENOENT (system-error-errno args))
|
||||
(apply throw args)))))
|
||||
|
||||
(define (secret-service-receive-secrets address)
|
||||
(define* (secret-service-receive-secrets address
|
||||
#:key (timeout 60))
|
||||
"Listen to ADDRESS, an address returned by 'make-socket-address', and wait
|
||||
for a secret service client to send secrets. Write them to the file system.
|
||||
Return the list of files installed on success, and #f otherwise."
|
||||
Return the list of files installed on success, and #f if TIMEOUT seconds
|
||||
passed without receiving any files or if some other failure occurred."
|
||||
|
||||
(define (wait-for-client address)
|
||||
;; Wait for a connection on ADDRESS. Note: virtio-serial ports are safer
|
||||
;; than TCP connections but they are (presumably) unsupported on GNU/Hurd.
|
||||
(let ((sock (socket AF_INET (logior SOCK_CLOEXEC SOCK_STREAM) 0)))
|
||||
(let ((sock (socket AF_INET
|
||||
(logior SOCK_CLOEXEC SOCK_NONBLOCK SOCK_STREAM)
|
||||
0)))
|
||||
(bind sock address)
|
||||
(listen sock 1)
|
||||
(log "waiting for secrets on ~a...~%"
|
||||
(socket-address->string address))
|
||||
|
||||
(match (select (list sock) '() '() 60)
|
||||
(((_) () ())
|
||||
(match (accept sock)
|
||||
(if (wait-for-readable-fd sock timeout)
|
||||
(match (accept sock (logior SOCK_CLOEXEC SOCK_NONBLOCK))
|
||||
((client . address)
|
||||
(log "client connection from ~a~%"
|
||||
(inet-ntop (sockaddr:fam address)
|
||||
|
@ -213,29 +187,12 @@ Return the list of files installed on success, and #f otherwise."
|
|||
(write '(secret-service-server (version 0)) client)
|
||||
(force-output client)
|
||||
(close-port sock)
|
||||
client)))
|
||||
((() () ())
|
||||
client))
|
||||
(begin
|
||||
(log "did not receive any secrets; time out~%")
|
||||
(close-port sock)
|
||||
#f))))
|
||||
|
||||
;; TODO: Remove when (@ (guix build utils) dump-port) has a 'size'
|
||||
;; parameter.
|
||||
(define (dump in out size)
|
||||
;; Copy SIZE bytes from IN to OUT.
|
||||
(define buf-size 65536)
|
||||
(define buf (make-bytevector buf-size))
|
||||
|
||||
(let loop ((left size))
|
||||
(if (<= left 0)
|
||||
0
|
||||
(let ((read (get-bytevector-n! in buf 0 (min left buf-size))))
|
||||
(if (eof-object? read)
|
||||
left
|
||||
(begin
|
||||
(put-bytevector out buf 0 read)
|
||||
(loop (- left read))))))))
|
||||
|
||||
(define (read-secrets port)
|
||||
;; Read secret files from PORT and install them.
|
||||
(match (false-if-exception (read port))
|
||||
|
@ -253,7 +210,7 @@ Return the list of files installed on success, and #f otherwise."
|
|||
|
||||
(call-with-output-file file
|
||||
(lambda (output)
|
||||
(dump port output size)
|
||||
(dump-port port output size)
|
||||
(chmod file mode))))
|
||||
files sizes modes)
|
||||
(log "received ~a secret files~%" (length files))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2021, 2023 Andrew Tropin <andrew@trop.in>
|
||||
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
@ -34,15 +34,62 @@
|
|||
|
||||
;; Configuration records.
|
||||
sway-configuration
|
||||
sway-configuration-keybindings
|
||||
sway-configuration-gestures
|
||||
sway-configuration-packages
|
||||
sway-configuration-variables
|
||||
sway-configuration-inputs
|
||||
sway-configuration-outputs
|
||||
sway-configuration-bar
|
||||
sway-configuration-modes
|
||||
sway-configuration-startup+reload-programs
|
||||
sway-configuration-startup-programs
|
||||
sway-configuration-extra-content
|
||||
sway-bar
|
||||
sway-bar-identifier
|
||||
sway-bar-position
|
||||
sway-bar-hidden-state
|
||||
sway-bar-binding-mode-indicator
|
||||
sway-bar-colors
|
||||
sway-bar-status-command
|
||||
sway-bar-mouse-bindings
|
||||
sway-bar-extra-content
|
||||
sway-output
|
||||
sway-output-identifier
|
||||
sway-output-resolution
|
||||
sway-output-position
|
||||
sway-output-background
|
||||
sway-output-extra-content
|
||||
sway-input
|
||||
point
|
||||
sway-input-identifier
|
||||
sway-input-layout
|
||||
sway-input-disable-while-typing
|
||||
sway-input-disable-while-trackpointing
|
||||
sway-input-tap
|
||||
sway-input-extra-content
|
||||
sway-color
|
||||
sway-color-background
|
||||
sway-color-statusline
|
||||
sway-color-focused-background
|
||||
sway-color-focused-statusline
|
||||
sway-color-focused-workspace
|
||||
sway-color-active-workspace
|
||||
sway-color-inactive-workspace
|
||||
sway-color-urgent-workspace
|
||||
sway-color-binding-mode
|
||||
sway-border-color
|
||||
sway-border-color-border
|
||||
sway-border-color-background
|
||||
sway-border-color-text
|
||||
sway-mode
|
||||
sway-mode-mode-name
|
||||
sway-mode-keybindings
|
||||
sway-mode-mouse-bindings
|
||||
point
|
||||
|
||||
;; Service type and helper function.
|
||||
home-sway-service-type
|
||||
sway-configuration->file
|
||||
sway-mode
|
||||
|
||||
;; Default values.
|
||||
%sway-default-variables
|
||||
|
|
37
gnu/local.mk
37
gnu/local.mk
|
@ -17,7 +17,7 @@
|
|||
# Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
# Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com>
|
||||
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||
# Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
# Copyright © 2018, 2019, 2020, 2021, 2022, 2024, 2025 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
|
||||
# Copyright © 2018, 2020-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
# Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant <glv@posteo.net>
|
||||
|
@ -291,7 +291,6 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/fluidplug.scm \
|
||||
%D%/packages/fonts.scm \
|
||||
%D%/packages/fontutils.scm \
|
||||
%D%/packages/fpga.scm \
|
||||
%D%/packages/forth.scm \
|
||||
%D%/packages/fortran-check.scm \
|
||||
%D%/packages/fortran-xyz.scm \
|
||||
|
@ -484,6 +483,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/mpd.scm \
|
||||
%D%/packages/mp3.scm \
|
||||
%D%/packages/mpi.scm \
|
||||
%D%/packages/mruby-xyz.scm \
|
||||
%D%/packages/multiprecision.scm \
|
||||
%D%/packages/music.scm \
|
||||
%D%/packages/musl.scm \
|
||||
|
@ -562,10 +562,8 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/pth.scm \
|
||||
%D%/packages/pulseaudio.scm \
|
||||
%D%/packages/pumpio.scm \
|
||||
%D%/packages/presentation.scm \
|
||||
%D%/packages/pretty-print.scm \
|
||||
%D%/packages/protobuf.scm \
|
||||
%D%/packages/pure.scm \
|
||||
%D%/packages/purescript.scm \
|
||||
%D%/packages/pv.scm \
|
||||
%D%/packages/pypy.scm \
|
||||
|
@ -808,6 +806,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/system/images/pine64.scm \
|
||||
%D%/system/images/pinebook-pro.scm \
|
||||
%D%/system/images/rock64.scm \
|
||||
%D%/system/images/rock-4c-plus.scm \
|
||||
%D%/system/images/unmatched.scm \
|
||||
%D%/system/images/visionfive2.scm \
|
||||
%D%/system/images/wsl2.scm \
|
||||
|
@ -961,8 +960,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/abcl-fix-build-xml.patch \
|
||||
%D%/packages/patches/ableton-link-system-libraries-debian.patch \
|
||||
%D%/packages/patches/abiword-explictly-cast-bools.patch \
|
||||
%D%/packages/patches/abseil-cpp-20200923.3-adjust-sysinfo.patch \
|
||||
%D%/packages/patches/abseil-cpp-20200923.3-duration-test.patch \
|
||||
%D%/packages/patches/abseil-cpp-20220623.1-no-kepsilon-i686.patch \
|
||||
%D%/packages/patches/abseil-cpp-fix-strerror_test.patch \
|
||||
%D%/packages/patches/adb-add-libraries.patch \
|
||||
|
@ -1015,6 +1012,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/audiofile-CVE-2015-7747.patch \
|
||||
%D%/packages/patches/audiofile-CVE-2018-13440.patch \
|
||||
%D%/packages/patches/audiofile-CVE-2018-17095.patch \
|
||||
%D%/packages/patches/audiofile-CVE-2022-24599.patch \
|
||||
%D%/packages/patches/audiofile-check-number-of-coefficients.patch \
|
||||
%D%/packages/patches/audiofile-Fail-on-error-in-parseFormat.patch \
|
||||
%D%/packages/patches/audiofile-Fix-index-overflow-in-IMA.cpp.patch \
|
||||
|
@ -1072,6 +1070,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/calibre-remove-test-sqlite.patch \
|
||||
%D%/packages/patches/calibre-remove-test-unrar.patch \
|
||||
%D%/packages/patches/calibre-remove-test-import-modules.patch \
|
||||
%D%/packages/patches/calligra-qt-6.9.patch \
|
||||
%D%/packages/patches/calls-disable-application-test.patch \
|
||||
%D%/packages/patches/calls-disable-sip-test.patch \
|
||||
%D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch \
|
||||
|
@ -1090,9 +1089,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/cl-asdf-config-directories.patch \
|
||||
%D%/packages/patches/clamav-config-llvm-libs.patch \
|
||||
%D%/packages/patches/clamav-system-tomsfastmath.patch \
|
||||
%D%/packages/patches/clang-3.5-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-3.5-libsanitizer-ustat-fix.patch \
|
||||
%D%/packages/patches/clang-3.8-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-11.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-12.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-13.0-libc-search-path.patch \
|
||||
|
@ -1105,14 +1101,11 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/clang-17.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-17.0-link-dsymutil-latomic.patch \
|
||||
%D%/packages/patches/clang-18.0-libc-search-path.patch \
|
||||
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
|
||||
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
|
||||
%D%/packages/patches/clang-runtime-12-remove-crypt-interceptors.patch \
|
||||
%D%/packages/patches/clang-runtime-13-glibc-2.36-compat.patch \
|
||||
%D%/packages/patches/clang-runtime-14-glibc-2.36-compat.patch \
|
||||
%D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \
|
||||
%D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \
|
||||
%D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \
|
||||
%D%/packages/patches/clasp-hide-event-ids.patch \
|
||||
%D%/packages/patches/classpath-aarch64-support.patch \
|
||||
%D%/packages/patches/classpath-miscompilation.patch \
|
||||
|
@ -1214,7 +1207,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/elm-reactor-static-files.patch \
|
||||
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
|
||||
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
|
||||
%D%/packages/patches/emacs-elpy-dup-test-name.patch \
|
||||
%D%/packages/patches/emacs-disable-jit-compilation.patch \
|
||||
%D%/packages/patches/emacs-exec-path.patch \
|
||||
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
|
||||
|
@ -1248,9 +1240,11 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/erlang-man-path.patch \
|
||||
%D%/packages/patches/esmini-use-pkgconfig.patch \
|
||||
%D%/packages/patches/esmtp-add-lesmtp.patch \
|
||||
%D%/packages/patches/esound-c99.patch \
|
||||
%D%/packages/patches/exercism-disable-self-update.patch \
|
||||
%D%/packages/patches/extempore-unbundle-external-dependencies.patch \
|
||||
%D%/packages/patches/extundelete-e2fsprogs-1.44.patch \
|
||||
%D%/packages/patches/fail2ban-fix-sshd-filter.patch \
|
||||
%D%/packages/patches/fail2ban-paths-guix-conf.patch \
|
||||
%D%/packages/patches/faiss-tests-CMakeLists-find-googletest.patch \
|
||||
%D%/packages/patches/falcosecurity-libs-shared-build.patch \
|
||||
|
@ -1597,9 +1591,11 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/icecat-makeicecat.patch \
|
||||
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
|
||||
%D%/packages/patches/icecat-compare-paths.patch \
|
||||
%D%/packages/patches/icecat-fhs-configure-option.patch \
|
||||
%D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \
|
||||
%D%/packages/patches/icecat-use-system-media-libs.patch \
|
||||
%D%/packages/patches/icecat-use-system-wide-dir.patch \
|
||||
%D%/packages/patches/icedove-observer-fix.patch \
|
||||
%D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch \
|
||||
%D%/packages/patches/icedtea-7-hotspot-pointer-comparison.patch \
|
||||
%D%/packages/patches/icu4c-icu-22132-fix-vtimezone.patch \
|
||||
|
@ -1711,7 +1707,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
|
||||
%D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \
|
||||
%D%/packages/patches/krita-xsimd-13-compat.patch \
|
||||
%D%/packages/patches/kvmfr-linux-module-fix-build.patch \
|
||||
%D%/packages/patches/kwayland-5-fix-build.patch \
|
||||
%D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
|
||||
%D%/packages/patches/laby-make-install.patch \
|
||||
|
@ -1812,8 +1807,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/linux-pam-unix_chkpwd.patch \
|
||||
%D%/packages/patches/lirc-localstatedir.patch \
|
||||
%D%/packages/patches/lirc-reproducible-build.patch \
|
||||
%D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \
|
||||
%D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \
|
||||
%D%/packages/patches/llvm-13-gcc-14.patch \
|
||||
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \
|
||||
%D%/packages/patches/lsh-fix-x11-forwarding.patch \
|
||||
|
@ -1903,7 +1896,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mswebrtc-cmake.patch \
|
||||
%D%/packages/patches/mtools-mformat-uninitialized.patch \
|
||||
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
|
||||
%D%/packages/patches/musescore-fix-build.patch \
|
||||
%D%/packages/patches/musl-cross-locale.patch \
|
||||
%D%/packages/patches/mutt-store-references.patch \
|
||||
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
|
||||
|
@ -2003,6 +1995,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/openssl-hurd64.patch \
|
||||
%D%/packages/patches/opentaxsolver-file-browser-fix.patch \
|
||||
%D%/packages/patches/open-zwave-hidapi.patch \
|
||||
%D%/packages/patches/opusfile-CVE-2022-47021.patch \
|
||||
%D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \
|
||||
%D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
|
||||
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \
|
||||
|
@ -2078,6 +2071,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/smalltalk-multiplication-overflow.patch \
|
||||
%D%/packages/patches/soci-mysql-ddl-types.patch \
|
||||
%D%/packages/patches/sqlite-hurd.patch \
|
||||
%D%/packages/patches/stk-5.0.1-fix-typo.patch \
|
||||
%D%/packages/patches/strace-readlink-tests.patch \
|
||||
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \
|
||||
%D%/packages/patches/p11-kit-hurd.patch \
|
||||
|
@ -2231,6 +2225,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ripperx-missing-file.patch \
|
||||
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
|
||||
%D%/packages/patches/rtags-separate-rct.patch \
|
||||
%D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch \
|
||||
%D%/packages/patches/racket-chez-scheme-bin-sh.patch \
|
||||
%D%/packages/patches/racket-launcher-config-dir.patch \
|
||||
%D%/packages/patches/racket-rktio-bin-sh.patch \
|
||||
|
@ -2339,7 +2334,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/tcsh-fix-autotest.patch \
|
||||
%D%/packages/patches/teensy-loader-cli-help.patch \
|
||||
%D%/packages/patches/tensorflow-c-api-fix.patch \
|
||||
%D%/packages/patches/tensorflow-lite-unbundle.patch \
|
||||
%D%/packages/patches/texinfo-headings-single.patch \
|
||||
%D%/packages/patches/texinfo-5-perl-compat.patch \
|
||||
%D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \
|
||||
|
@ -2364,6 +2358,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/tlf-support-hamlib-4.2+.patch \
|
||||
%D%/packages/patches/tofi-32bit-compat.patch \
|
||||
%D%/packages/patches/torbrowser-compare-paths.patch \
|
||||
%D%/packages/patches/torbrowser-use-system-wide-dir.patch \
|
||||
%D%/packages/patches/torbrowsers-add-store-to-rdd-allowlist.patch \
|
||||
%D%/packages/patches/tpetra-remove-duplicate-using.patch \
|
||||
%D%/packages/patches/transcode-ffmpeg.patch \
|
||||
|
@ -2424,6 +2419,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/unzip-32bit-zipbomb-fix.patch \
|
||||
%D%/packages/patches/ustr-fix-build-with-gcc-5.patch \
|
||||
%D%/packages/patches/util-linux-tests.patch \
|
||||
%D%/packages/patches/vagrant-bin-vagrant-silence-warning-about-installer.patch \
|
||||
%D%/packages/patches/vagrant-Support-system-installed-plugins.patch \
|
||||
%D%/packages/patches/vagrant-Use-a-private-temporary-dir.patch \
|
||||
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \
|
||||
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
|
||||
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
|
||||
|
@ -2510,7 +2508,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/zsh-egrep-failing-test.patch \
|
||||
%D%/packages/patches/zuo-bin-sh.patch \
|
||||
%D%/packages/patches/zxing-cpp-1.2.0-gcc-14.patch \
|
||||
%D%/packages/patches/zynaddsubfx-3.0.6-include-cstdint.patch
|
||||
%D%/packages/patches/zynaddsubfx-3.0.6-include-cstdint.patch \
|
||||
%D%/packages/patches/zynaddsubfx-3.0.6-system-rtosc.patch
|
||||
|
||||
MISC_DISTRO_FILES = \
|
||||
%D%/packages/ld-wrapper.in
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
;;; Copyright © 2021-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021, 2023, 2024 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
|
||||
;;; Copyright © 2021 qblade <qblade@protonmail.com>
|
||||
|
@ -1250,7 +1250,8 @@ re-executing them as necessary.")
|
|||
'("--with-path-procnet-dev=/proc/net/dev")
|
||||
'())
|
||||
#$@(if (target-hurd?)
|
||||
'("--disable-rcp"
|
||||
'("--with-path-klog=/dev/klog"
|
||||
"--disable-rcp"
|
||||
"--disable-rexec"
|
||||
"--disable-rexecd"
|
||||
"--disable-rlogin"
|
||||
|
@ -4419,7 +4420,7 @@ you are running, what theme or icon set you are using, etc.")
|
|||
(define-public hyfetch
|
||||
(package
|
||||
(name "hyfetch")
|
||||
(version "2.0.1")
|
||||
(version "2.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -4428,7 +4429,7 @@ you are running, what theme or icon set you are using, etc.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1c81425jaa2i0jdkfp2v7rsb0z7vzgba3735lgf5m921618k18rr"))))
|
||||
(base32 "1h3s8m6csmxj815cpzh30m59132n8drxya0s2lh5ngjkpazgdnv3"))))
|
||||
(build-system pyproject-build-system)
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
|
@ -4639,7 +4640,7 @@ information tool.")
|
|||
(define-public fastfetch-minimal
|
||||
(package
|
||||
(name "fastfetch-minimal")
|
||||
(version "2.51.1")
|
||||
(version "2.53.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -4648,7 +4649,7 @@ information tool.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1c5z1mgpgm8nzxkdjfh0412zdnv1f8i1vvic2h5v99f9cmdjwr25"))
|
||||
(base32 "0w260lscjy3rqahhr2637hb3fqsklv2qx59f2v66wy99nnmqvbha"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(begin
|
||||
(delete-file-recursively "src/3rdparty")))))
|
||||
|
@ -6241,7 +6242,8 @@ alias cysdig=sudo csysdig --modern-bpf
|
|||
'("paths-arch.conf" "paths-debian.conf"
|
||||
"paths-fedora.conf" "paths-freebsd.conf"
|
||||
"paths-opensuse.conf" "paths-osx.conf")))))
|
||||
(patches (search-patches "fail2ban-paths-guix-conf.patch"))))
|
||||
(patches (search-patches "fail2ban-fix-sshd-filter.patch"
|
||||
"fail2ban-paths-guix-conf.patch"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2023, 2024, 2025 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2021 Lars-Dominik Braun <ldb@leibniz-psychology.org>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023 Mehmet Tekman <mtekman89@gmail.com>
|
||||
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
|
||||
|
@ -530,9 +530,6 @@ fast arithmetic.")
|
|||
(properties
|
||||
'((release-monitoring-url . "http://flintlib.org/downloads.html")))))
|
||||
|
||||
(define-public arb
|
||||
(deprecated-package "arb" flint))
|
||||
|
||||
(define-public python-flint
|
||||
(package
|
||||
(name "python-flint")
|
||||
|
@ -1213,7 +1210,7 @@ Python.")
|
|||
;; Then run 'CTest' with -V so we get more
|
||||
;; details upon failure.
|
||||
(invoke "ctest" "-V" dash-j))))))))
|
||||
(home-page "https://eigen.tuxfamily.org")
|
||||
(home-page "https://eigen.tuxfamily.org/index.php?title=Main_Page")
|
||||
(synopsis "C++ template library for linear algebra")
|
||||
(description
|
||||
"Eigen is a C++ template library for linear algebra: matrices, vectors,
|
||||
|
@ -1268,8 +1265,10 @@ features, and more.")
|
|||
(define-public eigen-for-onnxruntime
|
||||
(let ((commit "1d8b82b0740839c0de7f1242a3585e3390ff5f33")
|
||||
(revision "0"))
|
||||
(package/inherit eigen
|
||||
(name "eigen")
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit eigen)
|
||||
(name "eigen-for-onnxruntime")
|
||||
(version (git-version "3.4.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
|
@ -1285,7 +1284,34 @@ features, and more.")
|
|||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments eigen)
|
||||
((#:tests? tests? #t)
|
||||
#f))))))
|
||||
#f)))))))
|
||||
|
||||
;; XXX: python-ml-dtypes uses this commit specifically since at least version
|
||||
;; 0.2.0. It's not compiling with another eigen, so build this one for now.
|
||||
(define-public eigen-for-python-ml-dtypes
|
||||
(let ((commit "7bf2968fed5f246c0589e1111004cb420fcd7c71")
|
||||
(revision "0"))
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit eigen)
|
||||
(name "eigen-for-python-ml-dtypes")
|
||||
(version (git-version "3.4.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(inherit (package-source eigen))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/libeigen/eigen")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0yq69h7pasbzq5r83d974xi031r0z2y2x0my1rz5crky54i1j0r7"))
|
||||
(patches '())))
|
||||
;; XXX: Tests stable_norm_5 and stable_norm_6 are failing due to
|
||||
;; EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE.
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments eigen)
|
||||
((#:tests? flag #f) #false)))))))
|
||||
|
||||
(define-public xtensor
|
||||
(package
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2017, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2017, 2020, 2021, 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019, 2020, 2023 Andreas Enge <andreas@enge.fr>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
;;; Copyright © 2021 Sergiu Ivanov <sivanov@colimite.fr>
|
||||
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org>
|
||||
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
|
||||
;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
|
||||
;;; Copyright © 2023 Simon South <simon@simonsouth.net>
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1444,7 +1444,8 @@ tools.")
|
|||
;; CVE-2017-6833:
|
||||
"audiofile-division-by-zero.patch"
|
||||
"audiofile-CVE-2018-13440.patch"
|
||||
"audiofile-CVE-2018-17095.patch"))))
|
||||
"audiofile-CVE-2018-17095.patch"
|
||||
"audiofile-CVE-2022-24599.patch"))))
|
||||
(properties `((lint-hidden-cve . ("CVE-2017-6829"
|
||||
|
||||
"CVE-2017-6827" "CVE-2017-6828"
|
||||
|
@ -3436,6 +3437,51 @@ compensation, (de)interleaving, and byte-swapping
|
|||
;; original developer.
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rtosc
|
||||
(package
|
||||
(name "rtosc")
|
||||
(version "0.3.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/fundamental/rtosc")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1djvyq53cjwd0szkvhpk45zcmdgrlirjwr02nqq9hzdmh0n26pk2"))
|
||||
(patches
|
||||
(search-patches
|
||||
"rtosc-0.3.1-fix-invalid-comparison-operator.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~(list "-DPERF_TEST=ON"
|
||||
"-DRTOSC_BUILD_SHARED_LIBS=ON")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'build 'build-documentation
|
||||
(lambda _
|
||||
(invoke "make" "rtosc-doc")))
|
||||
(add-after 'install 'install-documentation
|
||||
(lambda _
|
||||
(copy-recursively "html"
|
||||
(string-append #$output:doc
|
||||
"/share/doc/rtosc/html")))))))
|
||||
(native-inputs
|
||||
(list doxygen pkg-config ruby))
|
||||
(inputs
|
||||
(list jack-1
|
||||
liblo
|
||||
libx11
|
||||
mesa))
|
||||
(outputs (list "out" "doc"))
|
||||
(home-page "https://fundamental-code.com/wiki/rtosc/")
|
||||
(synopsis "Realtime Safe OSC packet serialization and dispatch")
|
||||
(description
|
||||
"RtOSC is a realtime safe library for handling OSC messages.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public python-jack-client
|
||||
(package
|
||||
(name "python-jack-client")
|
||||
|
@ -5237,7 +5283,7 @@ interface.")
|
|||
(define-public qsynth
|
||||
(package
|
||||
(name "qsynth")
|
||||
(version "0.9.9")
|
||||
(version "1.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -5247,7 +5293,7 @@ interface.")
|
|||
(string-append "mirror://sourceforge/qsynth/qsynth (attic)"
|
||||
"/qsynth-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32 "1cjg25nva5ivahr0qqlvf6ybnpcx9jgrxbp4vgwkk64b4k9wnd4n"))))
|
||||
(base32 "0rmskh0b0jacjhqi4qkfaa28m96dn46a5r796rvha4g8xlm7x2fg"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; no "check" phase
|
||||
|
@ -6533,12 +6579,32 @@ as is the case with audio plugins.")
|
|||
(invoke "make" "features")))
|
||||
(add-after 'install 'make-carla-executable
|
||||
(lambda _
|
||||
(chmod (string-append #$output "/share/carla/carla") #o555)))
|
||||
(with-directory-excursion (string-append #$output
|
||||
"/share/carla")
|
||||
(for-each (lambda (file)
|
||||
(chmod file #o555))
|
||||
(list "carla"
|
||||
"carla-control"
|
||||
"carla-jack-multi"
|
||||
"carla-jack-single"
|
||||
"carla-patchbay"
|
||||
"carla-rack")))))
|
||||
(add-after 'install 'wrap-executables
|
||||
(lambda _
|
||||
(wrap-program (string-append #$output "/bin/carla")
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Wrap only those executable files that other programs
|
||||
;; (e.g. lmms) would call.
|
||||
(with-directory-excursion #$output
|
||||
(for-each (lambda (file)
|
||||
(when (and (executable-file? file)
|
||||
(not (symbolic-link? file))
|
||||
(not (string-suffix? ".py" file)))
|
||||
(wrap-program file
|
||||
`("GUIX_PYTHONPATH" ":" prefix
|
||||
(,(getenv "GUIX_PYTHONPATH")))))))))
|
||||
(,(getenv "GUIX_PYTHONPATH")))
|
||||
`("QT_PLUGIN_PATH" ":" prefix
|
||||
(,(getenv "QT_PLUGIN_PATH"))))))
|
||||
(append (find-files "share/carla/resources")
|
||||
(find-files "bin")))))))))
|
||||
(inputs
|
||||
(list alsa-lib
|
||||
ffmpeg
|
||||
|
@ -6549,6 +6615,7 @@ as is the case with audio plugins.")
|
|||
libx11
|
||||
gtk+-2 ;needed for bridging GTK2 plugins in GTK3 hosts
|
||||
gtk+
|
||||
pulseaudio
|
||||
python-pyliblo
|
||||
python-pyqt
|
||||
python-rdflib
|
||||
|
@ -6557,9 +6624,35 @@ as is the case with audio plugins.")
|
|||
;; (ModuleNotFoundError: No module named 'PyQt5')
|
||||
python-wrapper
|
||||
qtbase-5
|
||||
qtwayland-5
|
||||
zlib))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "CLAP_PATH")
|
||||
(files '("lib/clap")))
|
||||
(search-path-specification
|
||||
(variable "LADSPA_PATH")
|
||||
(files '("lib/ladspa")))
|
||||
(search-path-specification
|
||||
(variable "LV2_PATH")
|
||||
(files '("lib/lv2")))
|
||||
(search-path-specification
|
||||
(variable "LXVST_PATH")
|
||||
(files '("lib/lxvst")))
|
||||
(search-path-specification
|
||||
(variable "VST2_PATH")
|
||||
(files '("lib/vst")))
|
||||
(search-path-specification
|
||||
(variable "VST3_PATH")
|
||||
(files '("lib/vst3")))
|
||||
(search-path-specification
|
||||
(variable "SF2_PATH")
|
||||
(files '("share/sf2")))
|
||||
(search-path-specification
|
||||
(variable "SFZ_PATH")
|
||||
(files '("share/sfz")))))
|
||||
(home-page "https://kx.studio/Applications:Carla")
|
||||
(synopsis "Audio plugin host")
|
||||
(description "Carla is a modular audio plugin host, with features like
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
|
||||
;;; Copyright © 2020, 2023, 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2022, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
|
||||
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Feng Shu <tumashu@163.com>
|
||||
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
|
||||
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
|
||||
|
@ -571,97 +571,6 @@ remote machines over SSH. To reduce the disk space required for each backup,
|
|||
rsnapshot uses hard links to deduplicate identical files.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public libchop
|
||||
(package
|
||||
(name "libchop")
|
||||
(version "0.5.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/libchop/libchop-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Gnulib's <stdio.h> refers to 'gets' for the purposes of
|
||||
;; warning against its use, but 'gets' is no longer declared
|
||||
;; in glibc's <stdio.h>. Remove that warning.
|
||||
(substitute* "lib/stdio.in.h"
|
||||
(("_GL_WARN_ON_USE \\(gets,.*")
|
||||
"\n/* 'gets' is gone, rejoice! */\n"))
|
||||
|
||||
;; Include all the libtirpc headers necessary to get the
|
||||
;; definitions of 'u_int', etc.
|
||||
(substitute* '("src/block-server.c"
|
||||
"include/chop/block-server.h"
|
||||
"utils/chop-block-server.c")
|
||||
(("#include <rpc/(.*)\\.h>" _ header)
|
||||
(string-append "#include <rpc/types.h>\n"
|
||||
"#include <rpc/rpc.h>\n"
|
||||
"#include <rpc/" header ".h>\n")))))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(;; Link against libtirpc.
|
||||
#:configure-flags '("LDFLAGS=-ltirpc -Wl,--as-needed")
|
||||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-before 'configure 'adjust-configure-script
|
||||
(lambda _
|
||||
;; Mimic upstream commit
|
||||
;; 25750ab5ef82fd3cfce5205d5f1ef07b47098091.
|
||||
(substitute* "configure"
|
||||
(("GUILE=(.*)--variable bindir`" _ middle)
|
||||
(string-append "GUILE=" middle
|
||||
"--variable bindir`/guile")))))
|
||||
(add-before 'build 'set-libtirpc-include-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Allow <rpc/rpc.h> & co. to be found.
|
||||
(let ((tirpc (string-append (assoc-ref inputs "libtirpc")
|
||||
"/include/tirpc")))
|
||||
(if (getenv "CPATH")
|
||||
(setenv "CPATH"
|
||||
(string-append (getenv "CPATH")
|
||||
":" tirpc))
|
||||
(setenv "CPATH" tirpc)))))
|
||||
(add-before 'check 'adjust-test
|
||||
(lambda _
|
||||
;; This test uses a weird construct to spawn
|
||||
;; 'chop-block-server' in the background. Replace it
|
||||
;; with something that actually works.
|
||||
(substitute* "tests/utils/block-server"
|
||||
(("chop_fail_if ! chop-block-server")
|
||||
"chop-block-server")
|
||||
(("'&'")
|
||||
"&")))))))
|
||||
(native-inputs
|
||||
(list guile-2.0 gperf-3.0 ;see <https://bugs.gnu.org/32382>
|
||||
pkg-config rpcsvc-proto)) ;for 'rpcgen'
|
||||
(inputs
|
||||
(list guile-2.0
|
||||
util-linux
|
||||
libtirpc
|
||||
gnutls
|
||||
tdb
|
||||
bdb
|
||||
gdbm
|
||||
libgcrypt
|
||||
lzo
|
||||
bzip2
|
||||
zlib))
|
||||
(home-page "https://nongnu.org/libchop/")
|
||||
(synopsis "Tools & library for data backup and distributed storage")
|
||||
(description
|
||||
"Libchop is a set of utilities and library for data backup and
|
||||
distributed storage. Its main application is @command{chop-backup}, an
|
||||
encrypted backup program that supports data integrity checks, versioning,
|
||||
distribution among several sites, selective sharing of stored data, adaptive
|
||||
compression, and more. The library itself implements storage techniques such
|
||||
as content-addressable storage, content hash keys, Merkle trees, similarity
|
||||
detection, and lossless compression.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public borg
|
||||
(package
|
||||
(name "borg")
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
|
||||
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
|
||||
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
|
||||
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
;;; Copyright © 2024 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2024 chris <chris@bumblehead.com>
|
||||
;;; Copyright © 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
|
||||
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
|
||||
;;; Copyright © 2018-2024 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de>
|
||||
;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
|
||||
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
|
||||
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018, 2020, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018, 2020, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
|
|
|
@ -17,11 +17,12 @@
|
|||
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||
;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de>
|
||||
;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023-2024 Herman Rimm <herman@rimm.ee>
|
||||
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
|
||||
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2025 Esther Flashner <esther@flashner.co.il>
|
||||
;;; Copyright © 2025 André Batista <nandre@riseup.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -1491,6 +1492,9 @@ Documentation} for more information (for example by running @samp{info
|
|||
(define-public u-boot-firefly-rk3399
|
||||
(make-u-boot-rockchip-package "firefly" 'rk3399))
|
||||
|
||||
(define-public u-boot-rock-4c-plus-rk3399
|
||||
(make-u-boot-rockchip-package "rock-4c-plus" 'rk3399))
|
||||
|
||||
(define-public u-boot-rockpro64-rk3399
|
||||
(let ((base (make-u-boot-rockchip-package
|
||||
"rockpro64" 'rk3399
|
||||
|
@ -2031,6 +2035,13 @@ order to add a suitable bootloader menu entry.")
|
|||
"/share/syslinux \\\n"
|
||||
all))))))
|
||||
#~())
|
||||
#$@(if (target-x86-32?)
|
||||
;; Otherwise (u)int64 assertion failure on this arch.
|
||||
;; See <https://github.com/ipxe/ipxe/issues/1506>
|
||||
#~((add-after 'enter-source-directory 'fix-x86-align
|
||||
(lambda _
|
||||
(setenv "HOST_EFI_CFLAGS" "-malign-double"))))
|
||||
#~())
|
||||
(delete 'configure) ; no configure script
|
||||
(replace 'install
|
||||
(lambda _
|
||||
|
|
|
@ -95,8 +95,8 @@ supported content to the Kodi media center.")
|
|||
;; Arbitrary commit of branch master,
|
||||
;; Update when updating uBlockOrigin.
|
||||
(let* ((name "ublock-main-assets")
|
||||
(commit "4696d6a593755d34b28c073b0150f4b4bb000387")
|
||||
(revision "4")
|
||||
(commit "011eef4a5b36a7ebf4adedc486d96b77cfa25c54")
|
||||
(revision "5")
|
||||
(version (git-version "0" revision commit)))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -105,14 +105,14 @@ supported content to the Kodi media center.")
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "02cixd497fhhxk2xg74ys20d3h0l2s5rpvvqxdbvlpjvliinsg50")))))
|
||||
(base32 "0ng8a88zdvrxg30fz83gswjy27b3hfx9q11n2i715id7az7kqf9x")))))
|
||||
|
||||
(define ublock-prod-assets
|
||||
;; Arbitrary commit of branch gh-pages,
|
||||
;; Update when updating uBlockOrigin.
|
||||
(let* ((name "ublock-prod-assets")
|
||||
(commit "bfeb222d20279afcc997d4b804fc4862f1364f95")
|
||||
(revision "4")
|
||||
(commit "6844322800de647da0c4fe06dd6a0b212a3942e4")
|
||||
(revision "5")
|
||||
(version (git-version "0" revision commit)))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -121,12 +121,12 @@ supported content to the Kodi media center.")
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "161ilyilvpixgxx09qjcyiavjwc120hh012jfiq4r6lk4dvm8ij0")))))
|
||||
(base32 "13vxq4z1wxivz5xklncxd2sj5aqkyhq919vzbbfp0fgh0imhikib")))))
|
||||
|
||||
(define ublock-origin
|
||||
(package
|
||||
(name "ublock-origin")
|
||||
(version "1.65.0")
|
||||
(version "1.66.2")
|
||||
(home-page "https://github.com/gorhill/uBlock")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
@ -136,7 +136,7 @@ supported content to the Kodi media center.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1mmgacpp5g6ypfjp4niyyvhhc2linr752gr274ssqirzhbwdygpw"))))
|
||||
"16ph031hb8bf4rxyxvm6jr0bxmy0snza11jfrbjgfb390gax9r63"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("xpi" "firefox" "chromium"))
|
||||
(properties '((addon-id . "uBlock0@raymondhill.net")))
|
||||
|
@ -263,7 +263,7 @@ fill and submit login forms if a matching password entry is found.")
|
|||
(define keepassxc-browser
|
||||
(package
|
||||
(name "keepassxc-browser")
|
||||
(version "1.9.9.1")
|
||||
(version "1.9.9.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -273,7 +273,7 @@ fill and submit login forms if a matching password entry is found.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"12m7j7gz5gdhlv3paj9mmv9nb94cf80lridipmbdvk9shr43d0ag"))
|
||||
"1chw1y1332zn69s7kf5mkljc1bp2xfvl3zzvafnalv3zj2jsa5cs"))
|
||||
;; Default 'manifest.json' targets chromium based browsers and
|
||||
;; depends on background.service_worker support.
|
||||
;; See: <https://bugzilla.mozilla.org/show_bug.cgi?id=1573659>
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
;;; Copyright © 2024 Evgeny Pisemsky <mail@pisemsky.site>
|
||||
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2025 Aiden Isik <aidenisik+git@member.fsf.org>
|
||||
;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -62,6 +63,7 @@
|
|||
#:use-module (gnu packages elf)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages guile)
|
||||
#:use-module (gnu packages guile-xyz)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages lisp)
|
||||
#:use-module (gnu packages logging)
|
||||
|
@ -81,6 +83,7 @@
|
|||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages regex)
|
||||
#:use-module (gnu packages rpc)
|
||||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages unicode)
|
||||
|
@ -710,7 +713,7 @@ a build worked by accident.")
|
|||
(define-public osc
|
||||
(package
|
||||
(name "osc")
|
||||
(version "0.172.0")
|
||||
(version "1.19.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -719,28 +722,33 @@ a build worked by accident.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1sqdnkka3c6b6hwnrmlwrgy7w62cp8raq8mph9pgd2lydzzbvwlp"))))
|
||||
(base32 "09an4c5gjc99a6bfy4ax5yyng14v7b4fknkdzwl0hn89q5990xab"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
;; XXX: Tests require a config file.
|
||||
#:tests? #f
|
||||
#:tests? #f ; XXX: Fix tests.
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'fix-filename
|
||||
(lambda _
|
||||
(with-directory-excursion (string-append #$output "/bin")
|
||||
;; osc tool is renamed in spec file, not setup.py.
|
||||
(rename-file "osc-wrapper.py" "osc")))))))
|
||||
(native-inputs (list python-chardet python-setuptools python-wheel))
|
||||
(inputs (list python-m2crypto python-pycurl rpm)) ;for python-rpm
|
||||
(add-before 'check 'check-setup
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(setenv "HOME" (getcwd))))))))
|
||||
(native-inputs
|
||||
(list python-setuptools
|
||||
python-wheel
|
||||
diffstat))
|
||||
(inputs
|
||||
(list python-urllib3
|
||||
python-ruamel.yaml
|
||||
python-m2crypto
|
||||
python-pycurl
|
||||
rpm)) ; for python-rpm
|
||||
(home-page "https://github.com/openSUSE/osc")
|
||||
(synopsis "Open Build Service command line tool")
|
||||
(description
|
||||
"@command{osc} is a command line interface to the Open Build Service. It
|
||||
allows you to checkout, commit, perform reviews etc. The vast majority of the
|
||||
OBS functionality is available via commands and the rest can be reached via
|
||||
direct API calls.")
|
||||
(description "@command{osc} is a command line interface to the Open Build
|
||||
Service. It allows you to checkout, commit, perform reviews etc. The vast
|
||||
majority of the OBS functionality is available via commands and the rest can
|
||||
be reached via direct API calls.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public compdb
|
||||
|
@ -1096,6 +1104,52 @@ maintenance-related files, for convenience.")
|
|||
#:commit "9297749090b01720888dceeb5f6dab3d52dcef40"
|
||||
#:hash (base32 "10qyhji7q71fhq2956aszj6bipbf11hn0xcrrpkwj9azwindw7ch")))
|
||||
|
||||
(define-public maak
|
||||
(package
|
||||
(name "maak")
|
||||
(version "0.2.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://codeberg.org/jjba23/maak.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "15s6khifk7k002hr9mqgl45r3ipmvsc56z9z8skwclxsj6w1cddl"))))
|
||||
(build-system guile-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:source-directory "src"
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'build 'install-program-files
|
||||
(lambda _
|
||||
(let ((bin (string-append #$output "/bin"))
|
||||
(share (string-append #$output "/share")))
|
||||
(install-file "resources/help.txt"
|
||||
(string-append share "/resources"))
|
||||
(install-file "scripts/maak" bin)
|
||||
(install-file "scripts/log.bash"
|
||||
(string-append share "/scripts/"))
|
||||
(install-file "scripts/maak-completion.bash"
|
||||
(string-append share "/scripts/"))
|
||||
(chmod (string-append bin "/maak") #o755)))))))
|
||||
(native-inputs (list guile-3.0))
|
||||
(inputs (list guile-3.0 bash-minimal))
|
||||
(home-page "https://codeberg.org/jjba23/maak")
|
||||
(synopsis "Command runner à la Make using Guile Scheme")
|
||||
(description
|
||||
"Maak is a command runner and control plane for your
|
||||
projects. It allows you to use the power of Lisp (Guile Scheme) to define
|
||||
your tasks, build steps, repetitive tasks or other automation.
|
||||
|
||||
With Maak you can easily call external shell commands and integrate with
|
||||
your existing scripts and tools. It is inspired by the GNU Make utility
|
||||
but it does away with a lot of the complexity that comes with its history.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
|
||||
(define-public pdpmake
|
||||
(package
|
||||
(name "pdpmake")
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2020, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||
;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2021 David Dashyan <mail@davie.li>
|
||||
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
|
||||
|
@ -1920,3 +1920,51 @@ JSON Patch and JSON Merge Patch.
|
|||
@code{.c} file.
|
||||
@end itemize")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public kefir
|
||||
(package
|
||||
(name "kefir")
|
||||
(version "0.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://git.sr.ht/~jprotopopov/kefir")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"01jclalg2mz68rcfn287kjd13inbhkgh2kslb54sjyqx3hypq4vb"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list m4))
|
||||
(arguments
|
||||
(list
|
||||
#:test-target "test"
|
||||
#:make-flags
|
||||
#~(list
|
||||
(string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PREFIX=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'patch-install
|
||||
(lambda _
|
||||
(substitute* "Makefile.mk"
|
||||
(("^EXTRA_LDFLAGS=.*$")
|
||||
(string-append "EXTRA_LDFLAGS=-Wl,-rpath,"
|
||||
#$output
|
||||
"/lib\n")))
|
||||
(substitute* "install.mk"
|
||||
(("^prefix=.*$")
|
||||
(string-append "prefix=" #$output
|
||||
"\n"))))))))
|
||||
(home-page "https://kefir.protopopov.lv/")
|
||||
(synopsis "C17/C23 programming language compiler")
|
||||
(description "Kefir is an independent compiler for the C17/C23 programming
|
||||
language, developed by Jevgenij Protopopov. Kefir has been validated with a
|
||||
test suite of 80 software projects, among which are GNU core- and binutils,
|
||||
Curl, Nginx, OpenSSL, Perl, Postgresql, Tcl and many others. The compiler
|
||||
targets x86_64 architecture and System-V AMD64 ABI, supporting Linux, FreeBSD,
|
||||
NetBSD an OpenBSD.")
|
||||
(license license:gpl3)))
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
|
||||
;;; Copyright © 2020 Peng Mei Yu <pengmeiyu@riseup.net>
|
||||
;;; Copyright © 2021 Wamm K. D. <jaft.r@outlook.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2025 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2016, 2017, 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016-2017, 2021-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
@ -3721,28 +3721,11 @@ portable to just about any platform.")
|
|||
|
||||
#$@(if (target-64bit?)
|
||||
#~()
|
||||
#~((add-after 'unpack 'switch-libc-call
|
||||
#~((add-after 'unpack 'apply-32bit-patch
|
||||
(lambda _
|
||||
(substitute* "src/libfaketime.c"
|
||||
(("#define _GNU_SOURCE")
|
||||
;; Make sure to use the 64-bit 'struct timespec' in
|
||||
;; replacement functions.
|
||||
(string-append "#define _GNU_SOURCE\n"
|
||||
"#define _FILE_OFFSET_BITS 64\n"
|
||||
"#define _TIME_BITS 64\n"))
|
||||
(("\"__clock_gettime\"")
|
||||
;; Replace '__clock_gettime64' rather than
|
||||
;; '__clock_gettime64' since this is what
|
||||
;; newly-built applications use.
|
||||
"\"__clock_gettime64\""))
|
||||
|
||||
;; XXX: Turn off 'pthread_cond_timedwait' etc.: tests
|
||||
;; related to this are failing and this feature is
|
||||
;; probably not useful for the purposes of running
|
||||
;; code at a fixed date.
|
||||
(substitute* "src/Makefile"
|
||||
(("-DFAKE_PTHREAD")
|
||||
""))))))
|
||||
(let ((patch #$(local-file
|
||||
(search-patch "libfaketime-32bit.patch"))))
|
||||
(invoke "patch" "--force" "-p1" "-i" patch))))))
|
||||
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
|
@ -3762,13 +3745,7 @@ portable to just about any platform.")
|
|||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(substitute* "test/functests/test_exclude_mono.sh"
|
||||
(("/bin/bash") (which "bash")))
|
||||
#$@(if (target-64bit?)
|
||||
#~()
|
||||
;; XXX: This test uses Perl to call 'clock_gettime' and
|
||||
;; fails for unclear reasons on i686-linux.
|
||||
#~((delete-file
|
||||
"test/functests/test_exclude_mono.sh"))))))))
|
||||
(("/bin/bash") (which "bash"))))))))
|
||||
(native-inputs (list perl)) ;for tests
|
||||
(inputs (list coreutils-minimal))
|
||||
(synopsis "Fake the system time for single applications")
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
(define-public cuirass
|
||||
(package
|
||||
(name "cuirass")
|
||||
(version "1.3.0")
|
||||
(version "1.3.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -82,7 +82,7 @@
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"15jrl0rx6i5ibiw7svrdgcy13v8iwi5z30jp49gfxrapp6m6lsrw"))))
|
||||
"0bvzdrih8id8bwsfddkymskcb99xrh5db771mbbb5jlzccjlwhgx"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:modules `((guix build utils)
|
||||
|
@ -101,20 +101,6 @@
|
|||
#:parallel-tests? #f
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'build 'install-minified-javascript
|
||||
(lambda _
|
||||
;; Work around guix/cuirass#34. Remove when 1.3.1 is out.
|
||||
(define files
|
||||
'("src/static/js/choices.min.js"
|
||||
"src/static/js/d3.v6.min.js"
|
||||
"src/static/js/list.min.js"))
|
||||
(apply invoke "make" files)
|
||||
(for-each (lambda (file)
|
||||
(install-file
|
||||
file
|
||||
(in-vicinity #$output
|
||||
"share/cuirass/static/js")))
|
||||
files)))
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; Wrap the 'cuirass' command to refer to the right modules.
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2019-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
|
||||
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2019 Hartmut Goebel <h.goebel@goebel-consult.de>
|
||||
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020, 2021, 2023 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2021 lu hui <luhuins@163.com>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2019-2022 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020, 2022 Timothy Sample <samplet@ngyro.com>
|
||||
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
|
||||
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
|
|
|
@ -75,7 +75,7 @@
|
|||
(define-public crun
|
||||
(package
|
||||
(name "crun")
|
||||
(version "1.23.1")
|
||||
(version "1.24")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -85,7 +85,7 @@
|
|||
"/crun-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1y23fz82d7zaa2svyzjhfhahl6l0a3yrasfbcfacplhkwk7bflnp"))))
|
||||
"0lnfvwxq14pyqyxx56bdr7k4h3l99imc9vynxram7fh0chxf7dlh"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -463,7 +463,7 @@ configure network interfaces in Linux containers.")
|
|||
(define-public gvisor-tap-vsock
|
||||
(package
|
||||
(name "gvisor-tap-vsock")
|
||||
(version "0.8.6")
|
||||
(version "0.8.7")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -472,7 +472,7 @@ configure network interfaces in Linux containers.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18pwpw3dap42mpv5a1ciq6fh0y8ya5ix7r38bi8i1xc7dxcy3jdj"))))
|
||||
"1p9vypphssvqfcm3y2nc7b9v0wcc2smkrqq8k60vskaiza89974k"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -550,7 +550,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
|
|||
(define-public podman
|
||||
(package
|
||||
(name "podman")
|
||||
(version "5.6.0")
|
||||
(version "5.6.1")
|
||||
(outputs '("out" "docker"))
|
||||
(properties
|
||||
`((output-synopsis "docker" "docker alias for podman")
|
||||
|
@ -563,7 +563,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
|
|||
(url "https://github.com/containers/podman")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "1w5p76ynhlayvala76xsh1b1sv8w50fjp02sjm819mg98scbc3fk"))
|
||||
(base32 "1k8dppbni8wbzxqqaknp08h687qw884wn7bkpiwmbw9np261fl4b"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
@ -708,7 +708,7 @@ being rootless and not requiring any daemon to be running.")
|
|||
(define-public buildah
|
||||
(package
|
||||
(name "buildah")
|
||||
(version "1.41.1")
|
||||
(version "1.41.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -716,7 +716,7 @@ being rootless and not requiring any daemon to be running.")
|
|||
(url "https://github.com/containers/buildah")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "12mi2084dmk8hg35chfbfbdl1s9ibsq000hhi1n9f0ibk177y6qw"))
|
||||
(base32 "0gca1zv98c58z6c06ckgg63mm2305b1qzavxfmlgmj8s4f72g3zh"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2022-2025 David Elsing <david.elsing@posteo.net>
|
||||
;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
|
||||
;;; Copyright © 2023 Sughosha <Sughosha@proton.me>
|
||||
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
|
@ -48,6 +48,7 @@
|
|||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;; Copyright © 2025 Romain Garbage <romain.garbage@inria.fr>
|
||||
;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -2041,13 +2042,10 @@ other values of screen objects, by setting their values as the tween starting
|
|||
point and then, after each tween step, plugging back the result.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public abseil-cpp-20200923.3
|
||||
;; "guix refresh -l" shows no dependents of this package, but by input
|
||||
;; rewriting, grpc-1.16.1 depends on it;
|
||||
;; in turn this is an input to hyperledger-iroha and tensorflow.
|
||||
(define-public abseil-cpp-20220623
|
||||
(package
|
||||
(name "abseil-cpp")
|
||||
(version "20200923.3")
|
||||
(version "20220623.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -2056,26 +2054,32 @@ point and then, after each tween step, plugging back the result.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"))
|
||||
"1cmchfcqp85yp5hc3i47xv3i14v0f2wd5h2jblvcjjmjyhji1bwr"))
|
||||
(patches
|
||||
(search-patches "abseil-cpp-fix-strerror_test.patch"
|
||||
"abseil-cpp-20200923.3-adjust-sysinfo.patch"
|
||||
"abseil-cpp-20200923.3-duration-test.patch"))))
|
||||
(search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
|
||||
(list
|
||||
#:configure-flags
|
||||
;; The following convoluted expression has been crafted to avoid
|
||||
;; changing the derivation when removing inheritance from
|
||||
;; abseil-cpp-20200923.3.
|
||||
#~(cons*
|
||||
"-DABSL_BUILD_TESTING=ON"
|
||||
(delete
|
||||
"-DABSL_RUN_TESTS=ON"
|
||||
(list "-DBUILD_SHARED_LIBS=ON"
|
||||
"-DABSL_RUN_TESTS=ON"
|
||||
"-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
|
||||
;; Needed, else we get errors like:
|
||||
;;
|
||||
;; ld: CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o:
|
||||
;; undefined reference to symbol '_ZN7testing4Mock16UnregisterLockedEPNS_8internal25UntypedFunctionMockerBaseE'
|
||||
;; ld: /gnu/store/...-googletest-1.10.0/lib/libgmock.so:
|
||||
;; error adding symbols: DSO missing from command line
|
||||
;; collect2: error: ld returned 1 exit status
|
||||
"-DCMAKE_EXE_LINKER_FLAGS=-lgtest -lpthread -lgmock")
|
||||
"-DCMAKE_EXE_LINKER_FLAGS=-lgtest -lpthread -lgmock")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-max
|
||||
(lambda _
|
||||
(substitute* "absl/debugging/failure_signal_handler.cc"
|
||||
|
@ -2098,29 +2102,6 @@ augment the C++ standard library. The Abseil library code is collected from
|
|||
Google's C++ code base.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public abseil-cpp-20220623
|
||||
(let ((base abseil-cpp-20200923.3))
|
||||
(package
|
||||
(inherit base)
|
||||
(name "abseil-cpp")
|
||||
(version "20220623.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/abseil/abseil-cpp")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1cmchfcqp85yp5hc3i47xv3i14v0f2wd5h2jblvcjjmjyhji1bwr"))
|
||||
(patches
|
||||
(search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments base)
|
||||
((#:configure-flags flags)
|
||||
`(cons* "-DABSL_BUILD_TESTING=ON"
|
||||
(delete "-DABSL_RUN_TESTS=ON" ,flags))))))))
|
||||
|
||||
(define-public abseil-cpp
|
||||
(let ((base abseil-cpp-20220623))
|
||||
(package
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2019 Carl Dong <contact@carldong.me>
|
||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
|
||||
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
|
||||
;;;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2025 Lukas Gradl <lgradl@posteo.net>
|
||||
;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system pyproject)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages cpp)
|
||||
#:use-module (gnu packages engineering)
|
||||
|
@ -126,17 +127,27 @@ chains of gadgets to execute system calls.")
|
|||
(define-public pwntools
|
||||
(package
|
||||
(name "pwntools")
|
||||
(version "4.15.0b1")
|
||||
(version "4.15.0beta1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pwntools" version))
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Gallopsled/pwntools")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"091fsk9rvbjkcsp8mmww0ka26dvznmj4pbqwaiygcw90g3v94zgd"))))
|
||||
(build-system python-build-system)
|
||||
(base32 "048b8szybf3f69xdp258a783nl5dcgj316a5156i8ajhyfw6aaw0"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ;XXX: needs a specific version of unicorn
|
||||
(list
|
||||
#:tests? #f ;XXX: needs a specific version of unicorn
|
||||
#:phases
|
||||
'(modify-phases %standard-phases
|
||||
(add-after 'unpack 'relax-dependencies
|
||||
(lambda _
|
||||
(substitute* "pyproject.toml"
|
||||
(("^ *\"pip.*\",.*")
|
||||
"")))))))
|
||||
(propagated-inputs
|
||||
(list capstone
|
||||
python-colored-traceback
|
||||
|
@ -145,7 +156,6 @@ chains of gadgets to execute system calls.")
|
|||
python-mako
|
||||
python-packaging
|
||||
python-paramiko
|
||||
python-pathlib2
|
||||
python-psutil
|
||||
python-pyelftools
|
||||
python-pygments
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
|
||||
;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
|
||||
;;; Copyright © 2018, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2018, 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us>
|
||||
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2019 Gábor Boskovits <boskovits@gmail.com>
|
||||
|
@ -5806,10 +5806,13 @@ PostreSQL, SQLite, ODBC and MySQL.")
|
|||
(sha256
|
||||
(base32 "11fzwcahc1bc8npxbif0448v9cwyf7k04167i7fcspmfw7a0hj0d"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs (list unixodbc))
|
||||
(arguments
|
||||
;; NOTE: (Sharlatan-20210110213908+0000) some tests require DB connection,
|
||||
;; disabled for now.
|
||||
`(#:tests? #f))
|
||||
`(#:tests? #f
|
||||
#:configure-flags
|
||||
(list (string-append "--with-unixodbc=" (assoc-ref %build-inputs "unixodbc")))))
|
||||
(home-page "https://www.freetds.org/")
|
||||
(synopsis "Client libraries for MS SQL and Sybase servers")
|
||||
(description
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
|
||||
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
|
||||
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2022 ROCKTAKEY <rocktakey@gmail.com>
|
||||
;;; Copyright © 2022, 2024 Runciter <runciter@whispers-vpn.org>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;; Copyright © 2025 Zhu Zihao <all_but_last@163.com>
|
||||
;;;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
|
||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||
;;; Copyright © 2014, 2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Disseminate Dissent <disseminatedissent@protonmail.com>
|
||||
;;; Copyright © 2023 Timotej Lazar <timotej.lazar@araneo.si>
|
||||
;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2021-2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
;;; Copyright © 2018 Vijayalakshmi Vedantham <vijimay12@gmail.com>
|
||||
;;; Copyright © 2019 Sam <smbaines8@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2022, 2023 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
|
||||
;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
|
||||
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020, 2021, 2025 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2017, 2019, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
||||
;;; Copyright © 2021-2024 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 ( <paren@disroot.org>
|
||||
;;; Copyright © 2022 Esther Flashner <esther@flashner.co.il>
|
||||
;;;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2021 Andrew Whatson <whatson@gmail.com>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||
;;; Copyright © 2018, 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||
;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com>
|
||||
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
|
||||
;;; Copyright © 2022 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2024 Luis Higino <luishenriquegh2701@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -31,7 +31,7 @@
|
|||
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
|
||||
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
|
||||
;;; Copyright © 2017-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2017-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
|
||||
;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
|
@ -210,11 +210,11 @@
|
|||
#:use-module (gnu packages dictionaries)
|
||||
#:use-module (gnu packages djvu)
|
||||
#:use-module (gnu packages ebook)
|
||||
#:use-module (gnu packages electronics)
|
||||
#:use-module (gnu packages emacs)
|
||||
#:use-module (gnu packages emacs-build)
|
||||
#:use-module (gnu packages enchant)
|
||||
#:use-module (gnu packages fonts)
|
||||
#:use-module (gnu packages fpga)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages games)
|
||||
#:use-module (gnu packages gawk)
|
||||
|
@ -15407,6 +15407,46 @@ backends. It supports url.el which is shipped with Emacs and the curl command
|
|||
line program.")
|
||||
(license license:gpl3+))))
|
||||
|
||||
(define-public emacs-http-post-simple
|
||||
(let ((commit "f53697fca278c741051aeb668b00466b5e0fd3fe")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "emacs-http-post-simple")
|
||||
;; Upstream does not provide a version number. The package is very old,
|
||||
;; feature-complete and not likely to be updated. So, we assume a
|
||||
;; version of 1.0.0.
|
||||
(version (git-version "1.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/emacsorphanage/http-post-simple")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;no tests
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-obsolete-functions
|
||||
(lambda _
|
||||
;; Replace obsolete functions from 'cl.
|
||||
(substitute* "http-post-simple.el"
|
||||
(("\\(require 'url\\)")
|
||||
"(require 'cl-lib)\n(require 'cl-macs)\n(require 'url)")
|
||||
(("\\(destructuring-bind")
|
||||
"(cl-destructuring-bind")
|
||||
(("\\(values")
|
||||
"(cl-values")))))))
|
||||
(home-page "https://github.com/emacsorphanage/http-post-simple")
|
||||
(synopsis "HTTP POST requests using the url library")
|
||||
(description "@code{emacs-http-post-simple} provides a simple HTTP POST
|
||||
requests library that uses the url library.")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public emacs-ruby-electric
|
||||
(let ((revision "0")
|
||||
(commit "c53376da891713e0c49f01aad2ff64d4fbb0b812"))
|
||||
|
@ -17692,8 +17732,8 @@ indentation guides in Emacs:
|
|||
;; https://github.com/jorgenschaefer/elpy/issues/1824
|
||||
;; https://github.com/jorgenschaefer/elpy/pull/1951
|
||||
;; https://github.com/jorgenschaefer/elpy/issues/1940.
|
||||
(let ((commit "7ff8ffa918411887d165764f7a5a12bc46646e73")
|
||||
(revision "2"))
|
||||
(let ((commit "0b381f55969438ab2ccc2d1a1614045fcf7c9545")
|
||||
(revision "3"))
|
||||
(package
|
||||
(name "emacs-elpy")
|
||||
(version (git-version "1.35.0" revision commit))
|
||||
|
@ -17705,8 +17745,7 @@ indentation guides in Emacs:
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0lh8w5a1abxaa7lf1c4yzgr0sh9szcwdnwd8w2004hv6mrcmyqc6"))
|
||||
(patches (search-patches "emacs-elpy-dup-test-name.patch"))))
|
||||
"0398zwzq5c33fi8icyy2x50q7rs819i5xkpmhbfm1s34m6prv46a"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments
|
||||
`(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include)
|
||||
|
@ -17753,10 +17792,6 @@ indentation guides in Emacs:
|
|||
(substitute* "elpy-company-backend-test.el"
|
||||
(("elpy-company-backend-should-find-.*-prefix-string.*" all)
|
||||
(string-append all " :expected-result :failed\n")))
|
||||
(substitute* "elpy-shell-get-or-create-process-test.el"
|
||||
(("elpy-shell-get-or-create-process-should-add-project-root\
|
||||
-to-path.*" all)
|
||||
(string-append all " :expected-result :failed\n")))
|
||||
(substitute* "elpy-format-code-test.el"
|
||||
(("elpy-should-format-code-with-default-formatter.*" all)
|
||||
(string-append all " :expected-result :failed\n"))))))
|
||||
|
@ -18135,6 +18170,19 @@ restrict the text width to 80 characters.")
|
|||
(arguments
|
||||
`(#:test-command '("make" "test")
|
||||
#:phases (modify-phases %standard-phases
|
||||
;; The files auto-generated by `emacs-build-system' cause
|
||||
;; the Makefile target `compile' to fail (due to missing
|
||||
;; `lexical-binding' directives in the generated files).
|
||||
;; Since `emacs-build-system' already byte-compiles the
|
||||
;; source files (to `.elc' files), `make compile' is not
|
||||
;; needed anyway. Additionally, the `clean' target must be
|
||||
;; inhibited as it deletes all `.elc' files in the source
|
||||
;; directory, which, however, are part of the installation.
|
||||
(add-after 'unpack 'patch-makefile
|
||||
(lambda _
|
||||
(substitute* "Makefile"
|
||||
(("test: compile clean")
|
||||
"test:"))))
|
||||
;; Set HOME, otherwise tests fail on loading aspell dict.
|
||||
(add-before 'check 'set-home
|
||||
(lambda _ (setenv "HOME" (getcwd)))))))
|
||||
|
@ -41716,6 +41764,29 @@ supports generation of phonetic and numeric passwords.")
|
|||
text into a QR Code and show it in a separate buffer.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-quick-fasd
|
||||
(package
|
||||
(name "emacs-quick-fasd")
|
||||
(version "1.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/jamescherti/quick-fasd.el/")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1fsl6l67jf8fm5h6i5qxqvibzssbiyyjzchq3r5sbqry3d8yx3mk"))))
|
||||
(build-system emacs-build-system)
|
||||
(arguments (list #:tests? #f)) ;no tests
|
||||
(home-page "https://github.com/jamescherti/quick-fasd.el/")
|
||||
(synopsis "Navigate file system within Emacs by using @code{fasd}")
|
||||
(description
|
||||
"@code{quick-fasd} integrates the @code{fasd} tool within the Emacs
|
||||
environment, providing fast access to frequently used files and directories.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-quiet
|
||||
(package
|
||||
(name "emacs-quiet")
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;;; Copyright © 2016 David Thompson <dthompson2@worcester.edu>
|
||||
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017, 2019, 2020, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2017, 2019, 2020, 2023, 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2023, 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2020, 2021, 2022 Simon South <simon@simonsouth.net>
|
||||
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;; Copyright © 2025 Junker dk@junkeria.club
|
||||
|
@ -1429,58 +1429,6 @@ simulator.")
|
|||
(home-page (package-home-page propeller-gcc))
|
||||
(license (package-license propeller-gcc))))))
|
||||
|
||||
(define-public binutils-vc4
|
||||
(let ((commit "708acc851880dbeda1dd18aca4fd0a95b2573b36"))
|
||||
(package
|
||||
(name "binutils-vc4")
|
||||
(version (string-append "2.23.51-0." (string-take commit 7)))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/puppeh/binutils-vc4")
|
||||
(commit commit)))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kdrz6fki55lm15rwwamn74fnqpy0zlafsida2zymk76n3656c63"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--target=vc4-elf"
|
||||
"--disable-werror"
|
||||
"--enable-cgen-maint")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'unpack-cgen
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(copy-recursively (string-append (assoc-ref inputs "cgen")
|
||||
"/cgen") "cgen")
|
||||
#t))
|
||||
(add-after 'unpack-cgen 'fix-cgen-guile
|
||||
(lambda _
|
||||
(substitute* "opcodes/Makefile.in"
|
||||
(("guile\\{,-\\}1.8") "guile"))
|
||||
(invoke "which" "guile"))))))
|
||||
(native-inputs
|
||||
`(("cgen"
|
||||
,(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/puppeh/cgen")
|
||||
(commit "d8e2a9eb70425f180fdd5bfd032884b0855f2032")))
|
||||
(sha256
|
||||
(base32
|
||||
"14b3h2ji740s8zq5vwm4qdcxs4aa4wxi6wb9di3bv1h39x14nyr9"))))
|
||||
("texinfo" ,texinfo)
|
||||
("flex" ,flex)
|
||||
("bison" ,bison)
|
||||
("guile-1.8" ,guile-1.8)
|
||||
("which" ,which)))
|
||||
(synopsis "Binutils for VC4")
|
||||
(description "This package provides @code{binutils} for VideoCore IV,
|
||||
the Raspberry Pi chip.")
|
||||
(license license:gpl3+)
|
||||
(home-page "https://github.com/puppeh/vc4-toolchain/"))))
|
||||
|
||||
(define make-gcc-vc4
|
||||
(mlambda ()
|
||||
(let ((commit "0fe4b83897341742f9df65797474cb0feab4b377")
|
||||
|
|
|
@ -1088,19 +1088,22 @@ The following systems are supported:
|
|||
(license (list license:gpl2+ license:bsd-3))))
|
||||
|
||||
(define-public mgba
|
||||
;; Use the latest commit, as the last release does not support Qt 6 yet.
|
||||
(let ((commit "c6aa8f5523b21fd84336c9855b7f4df54a606a32")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "mgba")
|
||||
(version "0.10.5")
|
||||
(version (git-version "0.10.5" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/mgba-emu/mgba")
|
||||
(commit version)))
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1scyvcp8l5z1sy1hcr0wgdf8zrirg07fzqjdmhkjnyhxmb9sibb5"))
|
||||
"0dfsz4dsh49dc9xx9rjhfzfkg4h91i2ksgp2inlr9yhgldw9q8h3"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
|
@ -1123,7 +1126,11 @@ The following systems are supported:
|
|||
#~(list "-DBUILD_SUITE=ON"
|
||||
"-DUSE_DISCORD_RPC=OFF" ;avoid bundled copy
|
||||
"-DUSE_LIBZIP=OFF" ;use "zlib" instead
|
||||
"-DUSE_LZMA=OFF"))) ;do not use bundled LZMA
|
||||
"-DUSE_LZMA=OFF") ;do not use bundled LZMA
|
||||
;; The platform-qt-autoscript and platform-qt-library tests fails due
|
||||
;; to 'LibraryModelTest::testList' not returning the expected value
|
||||
;; (see: <https://github.com/mgba-emu/mgba/issues/3593>).
|
||||
#:test-exclude "(platform-qt-autoscript|platform-qt-library)"))
|
||||
(native-inputs (list cmocka pkg-config qttools))
|
||||
(inputs
|
||||
(list ffmpeg
|
||||
|
@ -1148,7 +1155,7 @@ well as adding features that other emulators lack. It also supports Game Boy
|
|||
and Game Boy Color games")
|
||||
(license (list license:mpl2.0 ;mgba itself
|
||||
license:lgpl2.1+ ;blip_buf bundled library
|
||||
license:bsd-3)))) ;inih bundled library
|
||||
license:bsd-3))))) ;inih bundled library
|
||||
|
||||
(define-public mgba-for-dolphin
|
||||
;; The commit should match that of the mgba git submodule in dolphin (see:
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
;;; Copyright © 2022 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
|
||||
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2022, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022, 2023, 2025 Felix Gruber <felgru@posteo.net>
|
||||
;;; Copyright © 2023 Theofilos Pechlivanis <theofilos.pechlivanis@gmail.com>
|
||||
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
|
@ -4496,7 +4496,7 @@ G-codes to binary and vice versa.")
|
|||
(define-public prusa-slicer
|
||||
(package
|
||||
(name "prusa-slicer")
|
||||
(version "2.9.2")
|
||||
(version "2.9.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -4505,7 +4505,7 @@ G-codes to binary and vice versa.")
|
|||
(url "https://github.com/prusa3d/PrusaSlicer")
|
||||
(commit (string-append "version_" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256 (base32 "05zwwhqv3fjg9rx6a4ga55f4ic1136f6lwms0kb4kaq50w9dvxwg"))
|
||||
(sha256 (base32 "15m015fr6yd41dbh26p93xyc320w1j7drr0rkfhsgi1x3np8fsq7"))
|
||||
(patches (search-patches "prusa-slicer-add-cmake-module.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -4592,6 +4592,7 @@ G-codes to binary and vice versa.")
|
|||
mesa
|
||||
mpfr
|
||||
nanosvg
|
||||
nlohmann-json
|
||||
nlopt
|
||||
opencascade-occt-7.6.1
|
||||
openssl
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
@ -49,7 +49,7 @@
|
|||
(define-public erlang
|
||||
(package
|
||||
(name "erlang")
|
||||
(version "27.3.4.1")
|
||||
(version "27.3.4.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
;; The tarball from http://erlang.org/download contains many
|
||||
|
@ -61,7 +61,7 @@
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0psayp39priibc0clkhx4h593iar2sp0lg9zls4l123854cq8m8m"))
|
||||
"040wayc6q8g8fspvyq7l3ckd9p1q2zc6ycrnm6mmwghd5rb3fvyi"))
|
||||
(patches (search-patches "erlang-man-path.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
@ -74,7 +74,7 @@
|
|||
"/OTP-" version "/otp_doc_man_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03333khh6qqkp7rfagb9jqdgcywc2vz2305fva9rn50h3i6v9cnk"))))))
|
||||
"0dy4wv0vqy5dy7j4sj7zld2g6yirwmg0f465db6qzgzx6lpjwk82"))))))
|
||||
(inputs
|
||||
(list ncurses openssl wxwidgets))
|
||||
(propagated-inputs
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2022 Kyle Meyer <kyle@kyleam.com>
|
||||
;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
|
||||
;;; Copyright © 2022 Collin J. Doering <collin@rekahsoft.ca>
|
||||
;;; Copyright © 2023 dan <i@dan.games>
|
||||
|
|
|
@ -11,9 +11,11 @@
|
|||
;;; Copyright © 2021 Martin Becze <mjbecze@riseup.net>
|
||||
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
|
||||
;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
|
||||
;;; Copyright © 2022 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2023 B. Wilson <x@wilsonb.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||
;;; Copyright © 2024, 2025 Cayetano Santos <csantosb@inventati.org>
|
||||
;;; Copyright © 2025 Joaquín Aguirrezabalaga <kinote@kinote.org>
|
||||
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2025 Ian Eure <ian@retrospec.tv>
|
||||
|
@ -82,21 +84,20 @@
|
|||
(define-public flashrom
|
||||
(package
|
||||
(name "flashrom")
|
||||
(version "1.5.1")
|
||||
(source (origin
|
||||
(version "1.6.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://download.flashrom.org/releases/flashrom-v"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"14v2bd46wyz46bvsxr3zx2wacqbqzi4w4pk50giar7nldq3lp4qz"))))
|
||||
"08s4r7abcyk849zk840l3szgdmaxj0bx1281wy0zrdgrgncb77cb"))))
|
||||
(build-system meson-build-system)
|
||||
(inputs (list bash-minimal dmidecode pciutils libusb libftdi libjaylink))
|
||||
(native-inputs (list cmocka pkg-config))
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
#~'("-Dprogrammer=all")
|
||||
(list
|
||||
#:configure-flags #~'("-Dprogrammer=all")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-path
|
||||
|
@ -107,6 +108,10 @@
|
|||
(search-input-file
|
||||
inputs (in-vicinity "sbin" command))
|
||||
suffix))))))))
|
||||
(native-inputs
|
||||
(list cmocka pkg-config))
|
||||
(inputs
|
||||
(list bash-minimal dmidecode pciutils libusb libftdi libjaylink))
|
||||
(home-page "https://flashrom.org/")
|
||||
(synopsis "Identify, read, write, erase, and verify ROM/flash chips")
|
||||
(description
|
||||
|
@ -238,14 +243,15 @@ firmware from it.")
|
|||
(define-public teensy-loader-cli
|
||||
(package
|
||||
(name "teensy-loader-cli")
|
||||
(version "2.2")
|
||||
(version "2.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/PaulStoffregen/teensy_loader_cli")
|
||||
(commit version)))
|
||||
(sha256 (base32 "12n8ifz4gph1anhwd8if3j1kw0wc3yxf48abbyxl8071l9vj3m0b"))
|
||||
(sha256
|
||||
(base32 "0kqjmbmns3ansmrs6pbpsqk0g4d82hxknpng6lp7375zccsq52im"))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -257,14 +263,18 @@ firmware from it.")
|
|||
(arguments
|
||||
(list
|
||||
#:tests? #f ;; Makefile has no test target
|
||||
#:make-flags #~(list "CC=gcc" (string-append "PREFIX=" #$output))
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
#:make-flags
|
||||
#~(list (string-append "CC=" #$(cc-for-target))
|
||||
(string-append "PREFIX=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(install-file "teensy_loader_cli"
|
||||
(string-append #$output "/bin")))))))
|
||||
(inputs (list libusb-compat)) ;only compatible with libusb 0.1
|
||||
(inputs
|
||||
(list libusb-compat)) ;only compatible with libusb 0.1
|
||||
(synopsis "Command line firmware uploader for Teensy development boards")
|
||||
(description
|
||||
"The Teensy loader program communicates with your Teensy board when the
|
||||
|
@ -314,8 +324,8 @@ for possible workarounds.")
|
|||
%supported-systems))))
|
||||
|
||||
(define-public rkflashtool
|
||||
(let ((commit "8966c4e277de8148290554aaaa4146a3a84a3c53")
|
||||
(revision "1"))
|
||||
(let ((commit "6022dd724e8247ff7a0825b0eda6a07c446aacdd")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "rkflashtool")
|
||||
(version (git-version "5.2" revision commit))
|
||||
|
@ -328,13 +338,15 @@ for possible workarounds.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1ndyzg1zlgg20dd8js9kfqm5kq19k005vddkvf65qj20w0pcyahn"))))
|
||||
"0s4zir2s0c3igplj42lq7bq0f0416nf9hrprbxzm87c9mvsdhyvv"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)) ; no configure
|
||||
#:make-flags (list (string-append "PREFIX=" %output))
|
||||
#:make-flags
|
||||
#~(list (string-append "PREFIX=" #$output))
|
||||
#:tests? #f)) ; no tests
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
|
@ -399,10 +411,11 @@ referred to as the \"Odin 3 protocol\".")
|
|||
(package
|
||||
(name "ifdtool")
|
||||
(version "4.9")
|
||||
(source (origin
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/coreboot/coreboot")
|
||||
(url "https://review.coreboot.org/coreboot")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
|
@ -410,19 +423,19 @@ referred to as the \"Odin 3 protocol\".")
|
|||
"0jidj29jh6p65d17k304wlzhxvp4p3c2namgcdwg2sxq8jfr0zlm"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list "CC=gcc"
|
||||
(list
|
||||
#:make-flags
|
||||
#~(list (string-append "CC=" #$(cc-for-target))
|
||||
"INSTALL=install"
|
||||
(string-append "PREFIX=" (assoc-ref %outputs "out")))
|
||||
(string-append "PREFIX=" #$output))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'chdir
|
||||
(lambda _
|
||||
(chdir "util/ifdtool")
|
||||
#t))
|
||||
(chdir "util/ifdtool")))
|
||||
(delete 'configure)) ; no configure script
|
||||
#:tests? #f)) ; no test suite
|
||||
(home-page "https://github.com/corna/me_cleaner/")
|
||||
(home-page "https://doc.coreboot.org/util/ifdtool/")
|
||||
(synopsis "Intel Firmware Descriptor dumper")
|
||||
(description "This package provides @command{ifdtool}, a program to
|
||||
dump Intel Firmware Descriptor data of an image file.")
|
||||
|
@ -588,6 +601,52 @@ Additionally your user must be member of the @code{plugdev} group.")
|
|||
Unifinished Extensible Firmware Interface (UEFI) images.")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public openfpgaloader
|
||||
(package
|
||||
(name "openfpgaloader")
|
||||
(version "1.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/trabucayre/openfpgaloader")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"00xr4dzd1mlc1k4rivh9ibmdlx6yizb016laad10dkhjqfz1ixhq"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs (list eudev
|
||||
hidapi
|
||||
libftdi
|
||||
libgpiod
|
||||
libusb
|
||||
zlib))
|
||||
(arguments
|
||||
(list #:tests? #f ;no test suite
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'install-rules
|
||||
(lambda _
|
||||
(install-file
|
||||
"../source/99-openfpgaloader.rules"
|
||||
(string-append #$output "/lib/udev/rules.d/")))))))
|
||||
(synopsis "Utility for programming FPGA")
|
||||
(description "This package provides a program to transfer a bitstream
|
||||
to an FPGA. To use @code{openfpgaloader} without root privileges it is
|
||||
necessary to install the necessary udev rules. This can be done by extending
|
||||
@code{udev-service-type} in the @code{operating-system} configuration file with
|
||||
this package, as in:
|
||||
@lisp
|
||||
(udev-rules-service 'openfpgaloader openfpgaloader #:groups '(\"plugdev\")
|
||||
@end lisp
|
||||
Additionally, the @samp{plugdev} group should be registered in the
|
||||
@code{supplementary-groups} field of your @code{user-account} declaration. Refer
|
||||
to @samp{info \"(guix) Base Services\"} for examples.")
|
||||
(home-page "https://trabucayre.github.io/openFPGALoader/")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public srecord
|
||||
(package
|
||||
(name "srecord")
|
||||
|
@ -789,10 +848,14 @@ production use.")
|
|||
(native-inputs (list libxml2))
|
||||
(inputs (list eudev))
|
||||
(arguments
|
||||
`(#:tests? #f ; No tests implemented
|
||||
#:make-flags (list (string-append "CC=" ,(cc-for-target))
|
||||
(string-append "prefix=" %output))
|
||||
#:phases (modify-phases %standard-phases (delete 'configure))))
|
||||
(list
|
||||
#:tests? #f ; No tests implemented
|
||||
#:make-flags
|
||||
#~(list (string-append "CC=" #$(cc-for-target))
|
||||
(string-append "prefix=" #$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure))))
|
||||
(home-page "https://git.linaro.org/landing-teams/working/qualcomm/qdl")
|
||||
(synopsis "Qualcomm EDL mode flashing tool")
|
||||
(description "This tool communicates with USB devices of id 05c6:9008 to
|
||||
|
|
|
@ -34,8 +34,8 @@
|
|||
;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
|
||||
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
|
||||
;;; Copyright © 2020, 2021 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2020, 2024 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2020, 2021, 2022 Simen Endsjø <simendsjo@gmail.com>
|
||||
;;; Copyright © 2020, 2024, 2025 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2020-2022, 2025 Simen Endsjø <contact@simendsjo.me>
|
||||
;;; Copyright © 2020 Tim Van den Langenbergh <tmt_vdl@gmx.com>
|
||||
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
|
||||
;;; Copyright © 2021 Antoine Côté <antoine.cote@posteo.net>
|
||||
|
@ -47,7 +47,7 @@
|
|||
;;; Copyright © 2022 Kitzman <kitzman@disroot.org>
|
||||
;;; Copyright © 2021 Wamm K. D. <jaft.r@outlook.com>
|
||||
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
|
||||
;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
|
||||
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
|
||||
|
@ -269,9 +269,11 @@ glyphset has also been extended, supporting now a wider number of languages.")
|
|||
(license license:silofl1.1))))
|
||||
|
||||
(define-public font-ibm-plex
|
||||
(let ((commit "89cba80dad75561262e758f4b6ddd474c5119796")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "font-ibm-plex")
|
||||
(version "6.4.2")
|
||||
(version (git-version "6.4.2" revision commit))
|
||||
;; We prefer git-fetch since it lets us get the opentype, truetype and web
|
||||
;; fonts all in one download. The zip archive releases separate the
|
||||
;; opentype, truetype and web fonts into three separate archives.
|
||||
|
@ -280,20 +282,20 @@ glyphset has also been extended, supporting now a wider number of languages.")
|
|||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/IBM/plex")
|
||||
(commit (string-append "v" version))))
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "00lzbm1b7zbx5q3p0s8fh9q9zj6z4k01fn7n177iybh9xn4jgx0p"))))
|
||||
(base32 "0ddc3471m2jhbdq7cfxnimsi4v31n69xlw8rxd2hyphyg79nqfrl"))))
|
||||
(build-system font-build-system)
|
||||
(outputs '("out" "ttf" "woff"))
|
||||
(home-page "https://github.com/IBM/plex")
|
||||
(synopsis "IBM Plex typeface")
|
||||
(description
|
||||
"This package provides the Plex font family. It comes in a Sans, Serif,
|
||||
Mono and Sans Condensed, all with roman and true italics. The fonts have been
|
||||
designed to work well in user interface (UI) environments as well as other
|
||||
mediums.")
|
||||
(license license:silofl1.1)))
|
||||
(home-page "https://github.com/IBM/plex")
|
||||
(license license:silofl1.1))))
|
||||
|
||||
(define-public font-lilex
|
||||
(package
|
||||
|
@ -990,41 +992,96 @@ terminal applications, and user interfaces that involve both Latin and Japanese
|
|||
text.")
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-cns11643
|
||||
;; Since upstream doesn't provide any version numbers, the date of the last
|
||||
;; edit is used, taken from https://data.gov.tw/dataset/5961
|
||||
;; XXX: The source is also updated in-place, so it may be desirable to mirror
|
||||
;; it elsewhere to avoid suddenly losing the current source file.
|
||||
(define-public font-cns11643-sung
|
||||
(package
|
||||
(name "font-cns11643")
|
||||
(version "98.1.20180605")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "http://www.cns11643.gov.tw/AIDB/Open_Data.zip")
|
||||
(name "font-cns11643-sung")
|
||||
(version "20250718") ; see https://www.cns11643.gov.tw/opendata/release.txt
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append "https://web.archive.org/web/20250914051659if_/"
|
||||
"https://cns11643.gov.tw/opendata/Fonts_Sung.zip"))
|
||||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"000a9whrjr1cd4pjc23pbl60zwkq3wcb5g61p9qi7fn3hwkp0kyw"))))
|
||||
"0b570p5jnw4bqhapalascrx8z1ybgf1c9xj691f5g48pq1jxrhqb"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "http://www.cns11643.gov.tw/AIDB/welcome.do")
|
||||
(synopsis "CJK TrueType fonts, TW-Kai and TW-Sung")
|
||||
(home-page "https://www.cns11643.gov.tw")
|
||||
(synopsis "CJK TrueType fonts, TW-Sung")
|
||||
(description
|
||||
"@code{CNS 11643} character set (Chinese National Standard, or Chinese
|
||||
Standard Interchange Code) is the standard character set of the Republic of
|
||||
China (Taiwan) for Chinese Characters and other Unicode symbols. Contained
|
||||
are six TrueType fonts based on two script styles, Regular script (Kai), and
|
||||
Sung/Ming script, each with three variants:
|
||||
are three variant of TrueType fonts in Sung/Ming script:
|
||||
|
||||
@itemize
|
||||
@item @code{CNS 11643} (@code{TW-Kai} and @code{TW-Sung}): Tens of thousands
|
||||
of CJK characters from frequency tables published by the Taiwanese
|
||||
Ministry of Education. ISO 10646 and Unicode compatible encoding.
|
||||
@item @code{Big-5 Plus}: Several thousand frequently used CJK characters
|
||||
encoded in the user defined area of the Big-5 code.
|
||||
@item @code{Big-5 Extended}: A Big-5 character set based on the
|
||||
@code{Big-5 Plus} and @code{CNS 11643} character sets.
|
||||
@item @code{TW-Sung-98_1.ttf}: CJK characters in the Basic Multilingual Plane
|
||||
of Unicode.
|
||||
@item @code{TW-Sung-Ext-B-98_1.ttf}: CJK characters in the CJK Unified
|
||||
Ideographs Extension B of Unicode.
|
||||
@item @code{TW-Sung-Plus-98_1.ttf}: CJK characters in the Plane 15 (Private Use)
|
||||
of Unicode.
|
||||
@end itemize\n")
|
||||
(license (license:non-copyleft
|
||||
"http://data.gov.tw/license")))) ; CC-BY 4.0 compatible
|
||||
(license license:silofl1.1)))
|
||||
|
||||
(define-public font-cns11643-kai
|
||||
(package
|
||||
(inherit font-cns11643-sung)
|
||||
(name "font-cns11643-kai")
|
||||
(version "20250718")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append "https://web.archive.org/web/20250914051659if_/"
|
||||
"https://cns11643.gov.tw/opendata/Fonts_Kai.zip"))
|
||||
(file-name (string-append name "-" version))
|
||||
(sha256
|
||||
(base32
|
||||
"10xylq0p8qhi8rlq62rhnfskfy6kdlh4ay8v7sp28xxl2291ll1j"))))
|
||||
(synopsis "CJK TrueType fonts, TW-Kai")
|
||||
(description
|
||||
"@code{CNS 11643} character set (Chinese National Standard, or Chinese
|
||||
Standard Interchange Code) is the standard character set of the Republic of
|
||||
China (Taiwan) for Chinese Characters and other Unicode symbols. Contained
|
||||
are three variant of TrueType fonts in Regular script (Kai):
|
||||
|
||||
@itemize
|
||||
@item @code{TW-Kai-98_1.ttf}: CJK characters in the Basic Multilingual Plane
|
||||
of Unicode.
|
||||
@item @code{TW-Kai-Ext-B-98_1.ttf}: CJK characters in the CJK Unified
|
||||
Ideographs Extension B of Unicode.
|
||||
@item @code{TW-Kai-Plus-98_1.ttf}: CJK characters in the Plane 15 (Private Use)
|
||||
of Unicode.
|
||||
@end itemize\n")))
|
||||
|
||||
;; In past, TW-Kai and TW-Sung are distributed in same zip archive. But now
|
||||
;; they are already separated in font-cns11643-kai and font-cns11643-sung.
|
||||
;; This package exists as a backward-compatible definition.
|
||||
(define-public font-cns11643
|
||||
(package
|
||||
(inherit font-cns11643-sung)
|
||||
(name "font-cns11643")
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:modules '((guix build union))
|
||||
#:builder
|
||||
#~(begin
|
||||
(use-modules (ice-9 match)
|
||||
(guix build union))
|
||||
(match %build-inputs
|
||||
(((names . directories) ...)
|
||||
(union-build #$output directories))))))
|
||||
(inputs (list font-cns11643-kai font-cns11643-sung))
|
||||
(synopsis "CJK TrueType fonts, TW-Kai and TW-Sung")
|
||||
(description
|
||||
"@code{CNS 11643} character set (Chinese National Standard, or Chinese
|
||||
Standard Interchange Code) is the standard character set of the Republic of
|
||||
China (Taiwan) for Chinese Characters and other Unicode symbols.
|
||||
|
||||
This package is an amalgamation of @code{font-cns11643-sung} and
|
||||
@code{font-cns11643-kai}.")))
|
||||
|
||||
(define-public font-cns11643-swjz
|
||||
(package
|
||||
|
@ -2238,7 +2295,7 @@ guix repl <<EOF
|
|||
(ice-9 string-fun)
|
||||
(gnu packages fonts))
|
||||
|
||||
(let ((new-version "20.0.0")
|
||||
(let ((new-version "33.3.0")
|
||||
(iosevka-hashes #nil)
|
||||
(iosevka-fails #nil))
|
||||
(for-each (lambda (font)
|
||||
|
@ -2290,7 +2347,7 @@ EOF
|
|||
(define-public font-iosevka
|
||||
(package
|
||||
(name "font-iosevka")
|
||||
(version "32.5.0")
|
||||
(version "33.3.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/zipbomb)
|
||||
|
@ -2298,7 +2355,7 @@ EOF
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-Iosevka-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1w7043q2pxllry2njrk4cpqwvralb0a1d3bxac36y0ai9al3m5w0"))))
|
||||
(base32 "0r6zs5a7ryishfa18dlgzifkdjbwgn9p0g0ma6sssmiz5c4h81rm"))))
|
||||
(build-system font-build-system)
|
||||
(home-page "https://be5invis.github.io/Iosevka/")
|
||||
(synopsis "Coders' typeface, built from code")
|
||||
|
@ -2321,7 +2378,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSlab-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "03r7ldsk3qrvy46ag08fhs3ppxmzycn8gh6xxmi3pw972hn9kgpi"))))))
|
||||
(base32 "1j6manjf5kb348c94jqzwgypym1wcvhhncc97fkcvy2fh7v23pjx"))))))
|
||||
|
||||
(define-public font-iosevka-term
|
||||
(package
|
||||
|
@ -2335,7 +2392,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTF-IosevkaTerm-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "13g3czmd36k261ip9l8r94hcq6swbvag80zb9g7i9frjsr97xn2h"))))
|
||||
(base32 "0li50ysnk2ry1fs9f7d8r9xh76jrx60si7f58blb648qn387hflh"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -2356,7 +2413,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"releases/download/v" version
|
||||
"/PkgTTF-IosevkaTermSlab-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "00dwp06za3i8kyqqk5xqsd9div2ydf0rgdnj3vl5g6g5621asd39"))))
|
||||
(base32 "1sz4l3fv37kvyj4gg9z36yh7wafb764v9j1fqjy2hc2p8pbsjv6r"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
|
@ -2377,7 +2434,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaAile-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "10sf5q4f3l9z4pai46sszkswnwfnjmyqzs6ark1dlsifxh8c86wb"))))))
|
||||
(base32 "0kry26cy7h6awmcyn9q2anz4654gz7gjniamdlfy27qwjzd01g6i"))))))
|
||||
|
||||
(define-public font-iosevka-curly
|
||||
(package
|
||||
|
@ -2391,7 +2448,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"releases/download/v" version
|
||||
"/PkgTTC-IosevkaCurly-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0qg4r8hid50hnjj3gs0xagdymm15z919s0pn6n2dnlmmxvw1c5nv"))))))
|
||||
(base32 "11zvpdg8kf1fh0ymrj7zpzfqmxp6njx5c9zb0sxkkp9hza22dg61"))))))
|
||||
|
||||
(define-public font-iosevka-curly-slab
|
||||
(package
|
||||
|
@ -2405,7 +2462,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"releases/download/v" version
|
||||
"/PkgTTC-IosevkaCurlySlab-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1lkcs3aqxvdlpgbplhpd4i6vza1xyqnim2awak9b310byyf35d0c"))))))
|
||||
(base32 "0dpkk161wbprx7a706jk9zizcbp7fvkknxgc8d10qg3rj7y0rih1"))))))
|
||||
|
||||
(define-public font-iosevka-etoile
|
||||
(package
|
||||
|
@ -2419,7 +2476,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaEtoile-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1yh8vlhrcczmsir87f84qr605rf1kp86bvf1c459myc4a6hcqc3z"))))))
|
||||
(base32 "0whpdbwwqdk4qk6n324q7hy4va5qa8w208szzqjyl56mf8n6xxcc"))))))
|
||||
|
||||
(define-public font-iosevka-ss01
|
||||
(package
|
||||
|
@ -2433,7 +2490,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS01-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0h1ln3bisbgwd7cc6c9jcmplzvgca42csd5cfxj1jjs4i2vmx2d6"))))))
|
||||
(base32 "1hbnaf2wr7svzl24a5vfxzwz5zpy202acm0bjr814jyfczrvjfcf"))))))
|
||||
|
||||
(define-public font-iosevka-ss02
|
||||
(package
|
||||
|
@ -2447,7 +2504,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS02-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0z0b14cwhbb85fjp508cb1ihscxcc75asjmq9fw5rfl3kx85w6h8"))))))
|
||||
(base32 "0zn7zz12ai9jvlnj7zi2mpaw29xsaabf1mrx40kydbr71i155dx2"))))))
|
||||
|
||||
(define-public font-iosevka-ss03
|
||||
(package
|
||||
|
@ -2461,7 +2518,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS03-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "18gs7h6mb5c9fqmx7ip1a5k3garqbgp640m338h776pcq9mlnndv"))))))
|
||||
(base32 "1w4shz9q89h1fgqmd0wxd7cnfr5s22h0dwl1ksqbc6cx86p503b9"))))))
|
||||
|
||||
(define-public font-iosevka-ss04
|
||||
(package
|
||||
|
@ -2475,7 +2532,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS04-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1yjywm9r390gnagla6g5yjach0ydng0m0q752k39fb2z5rpjzphp"))))))
|
||||
(base32 "041ldyblwiz7yp19xbsqhpyq78ln61406h9i907686zhs16c9ikv"))))))
|
||||
|
||||
(define-public font-iosevka-ss05
|
||||
(package
|
||||
|
@ -2489,7 +2546,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS05-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1jn8xb7f3hxs4yl54hmiar49wwdl7489xv0f0sqr5c66ip2jar0k"))))))
|
||||
(base32 "15lryq5km6b3l81xra04vcvapdssbx5yy03a0sdr1d78z4x8wgfp"))))))
|
||||
|
||||
(define-public font-iosevka-ss06
|
||||
(package
|
||||
|
@ -2503,7 +2560,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS06-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0c6wysyg8nzgan39z4w6l41abx2d0gj89mli63ydagqlljk7vs71"))))))
|
||||
(base32 "1ba5alcfwrhxcdy1wjjhwmx82dlll6ihqw54c6m5g4z79l36zq3x"))))))
|
||||
|
||||
(define-public font-iosevka-ss07
|
||||
(package
|
||||
|
@ -2517,7 +2574,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS07-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "006khr7hh14dcq81mqzn3fkfrpbix1vghrvwff289r7cfy45ijkk"))))))
|
||||
(base32 "1gj1ksg2yhq5g55v7xsdis706ahc5gf6gdxd3svkklngd5rhnx3p"))))))
|
||||
|
||||
(define-public font-iosevka-ss08
|
||||
(package
|
||||
|
@ -2531,7 +2588,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS08-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1dbnhbljybal9l61iq88h85jkmc16aaw8kxcq3r0ikzv2pq3vslm"))))))
|
||||
(base32 "1y72hpss830l6a86w8r311s86ph4qdwcljfjpr5fp49hi1k564ia"))))))
|
||||
|
||||
(define-public font-iosevka-ss09
|
||||
(package
|
||||
|
@ -2545,7 +2602,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS09-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0b218h42n5qg920q95ip3mva2xz012ijzgxj8r9m638qar0ba1qi"))))))
|
||||
(base32 "0xwb59ybr0c8bx3861xq1f5k4vf5ddrgdrdjfwph56x3m9imx5k0"))))))
|
||||
|
||||
(define-public font-iosevka-ss10
|
||||
(package
|
||||
|
@ -2559,7 +2616,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS10-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "005i3am8amvwg8skq5lh5pisq1ll8hi9nj3imlcvcwj0w2i8b04w"))))))
|
||||
(base32 "0j2iwg3bb5xpmkj8618k89ns4rs9qwpkzw5hak1lyg6ig87mqk6n"))))))
|
||||
|
||||
(define-public font-iosevka-ss11
|
||||
(package
|
||||
|
@ -2573,7 +2630,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS11-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0gnk9arz1dfksjx2d7gnb6vx0p0p7hpz4gcnkaj6ppdry9a5lmdn"))))))
|
||||
(base32 "0mn30rvj337n4nl9iqmy7jqvvdydylrzfdzxpbcy6idps59s0517"))))))
|
||||
|
||||
(define-public font-iosevka-ss12
|
||||
(package
|
||||
|
@ -2587,7 +2644,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS12-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "17ri9f2ka7jsb4n3bbb18vxnjxk432f8740hzbjpnvzy16av5nhk"))))))
|
||||
(base32 "0x0mnmayl232clk57wfbq0xyg7g4vgy7wrmp616b851pb1zaai4f"))))))
|
||||
|
||||
(define-public font-iosevka-ss13
|
||||
(package
|
||||
|
@ -2601,7 +2658,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS13-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1nb3vd7q3xcbijawk9pqznkcfrjdykrc83jl58dnx7jf0znk7j4d"))))))
|
||||
(base32 "1mjf5x2vzibmm3m4dfn56c963xkickc9xnzi4i5kvi6f0za2kjq3"))))))
|
||||
|
||||
(define-public font-iosevka-ss14
|
||||
(package
|
||||
|
@ -2615,7 +2672,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS14-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0dqkrf86h77ps90rdbsndngzg0l8c4jh8l3f3vcmdy1vlcrycpbi"))))))
|
||||
(base32 "0d38sjq53lh97walsn6d6m3icabw800wsyb856l34hbzlnnakk80"))))))
|
||||
|
||||
(define-public font-iosevka-ss15
|
||||
(package
|
||||
|
@ -2629,7 +2686,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS15-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0qd2di4phlxakprm5bqi0kz9yy48wqrhkxidzjswagf6bnm3mk5v"))))))
|
||||
(base32 "0vap4g5gf8qmczwbnvav865cjpa12j6p44bl0ysn34mizjzsyrbv"))))))
|
||||
|
||||
(define-public font-iosevka-ss16
|
||||
(package
|
||||
|
@ -2643,7 +2700,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS16-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "15yr94a3faribc19j91q7jna0hx3dsdpz1axkzr5gy56w7hg6bw4"))))))
|
||||
(base32 "1m8p6hjxlcmvi8h4zpn1iad5wa6kmq4hd5l9hjffr5l8bmkbmdh4"))))))
|
||||
|
||||
(define-public font-iosevka-ss17
|
||||
(package
|
||||
|
@ -2657,7 +2714,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS17-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "0k8blbzymyvwczngafz3vijwdy4iwhxc4lrfqxgddrfi57lbnj5r"))))))
|
||||
(base32 "1nw0zqqhwzw1p08rrz1ysz6fbvmya5h5wmx89bgl8h0dd9p146pl"))))))
|
||||
|
||||
(define-public font-iosevka-ss18
|
||||
(package
|
||||
|
@ -2671,7 +2728,7 @@ programming. Iosevka is completely generated from its source code.")
|
|||
"/releases/download/v" version
|
||||
"/PkgTTC-IosevkaSS18-" version ".zip"))
|
||||
(sha256
|
||||
(base32 "08ijx9rbcx95yiaiwv6k25xmsi24rdy50mkmmaw94mmwv22mxdra"))))))
|
||||
(base32 "12k9g1fkvgvlmr8m6n51wwk442cazqn5zxl226prvrxzwl0xj9l3"))))))
|
||||
|
||||
(define-public font-apl2741-unicode
|
||||
(let ((commit "1e11efae38e5095bfe49a786b111d563e83dad03"))
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2021-2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021-2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
|
||||
;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
|
||||
;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
|
||||
|
@ -24,6 +24,7 @@
|
|||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2024 Sou Bunnbu (宋文武) <iyzsong@gmail.com>
|
||||
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
||||
;;; Copyright © 2025 Alexey Abramov <levenson@mmer.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -113,7 +114,14 @@
|
|||
;; The use of "freetype-config" is deprecated, but other packages still
|
||||
;; depend on it.
|
||||
(list
|
||||
#:configure-flags #~(list "--enable-freetype-config")
|
||||
#:configure-flags #~(list "--enable-freetype-config"
|
||||
;; armhf-linux: Disable SLP vectorization.
|
||||
;; gcc-14 optimization bug that breaks
|
||||
;; ghostscript PostScript font handling (fixed
|
||||
;; in gcc-15). See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119155
|
||||
#$@(if (target-arm32?)
|
||||
(list "CFLAGS=-g -O2 -fno-tree-slp-vectorize")
|
||||
'()))
|
||||
#:disallowed-references (list pkg-config)
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
|
|
|
@ -1,963 +0,0 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2021 Andrew Miloradovsky <andrew@interpretmath.pw>
|
||||
;;; Copyright © 2022 Christian Gelinek <cgelinek@radlogic.com.au>
|
||||
;;; Copyright © 2022 jgart <jgart@dismail.de>
|
||||
;;; Copyright © 2023 Simon South <simon@simonsouth.net>
|
||||
;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
|
||||
;;; Copyright © 2025 Zheng Junjie <873216071@qq.com>
|
||||
;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
|
||||
;;; Copyright © 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages fpga)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix deprecation)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system pyproject)
|
||||
#:use-module (guix build-system qt)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages cmake)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cpp)
|
||||
#:use-module (gnu packages electronics)
|
||||
#:use-module (gnu packages elf)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gawk)
|
||||
#:use-module (gnu packages gdb)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages ghostscript)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages graphviz)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages libffi)
|
||||
#:use-module (gnu packages libftdi)
|
||||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages llvm)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages maths)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-build)
|
||||
#:use-module (gnu packages python-check)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages ruby)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages sphinx)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages texinfo)
|
||||
#:use-module (gnu packages toolkits)
|
||||
#:use-module (gnu packages version-control)
|
||||
#:use-module (gnu packages web))
|
||||
|
||||
(define-public abc
|
||||
(let ((commit "e29dcd9f3275874c8d31a2f781487efac1dabb7b")
|
||||
(revision "6"))
|
||||
(package
|
||||
(name "abc")
|
||||
(version (git-version "0.0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/berkeley-abc/abc")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18g4i1kdsxvp25p5z3wja4jkxppgrp6ybxal9y2p2d2qvlafiw5z"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list readline))
|
||||
(arguments
|
||||
(list #:license-file-regexp "copyright.txt"
|
||||
#:tests? #f ; no tests
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(install-file "abc" (string-append #$output "/bin")))))))
|
||||
(home-page "https://people.eecs.berkeley.edu/~alanmi/abc/")
|
||||
(synopsis "Sequential logic synthesis and formal verification")
|
||||
(description "ABC is a program for sequential logic synthesis and
|
||||
formal verification.")
|
||||
(license
|
||||
(license:non-copyleft
|
||||
"https://people.eecs.berkeley.edu/~alanmi/abc/copyright.htm")))))
|
||||
|
||||
(define-public abc-yosyshq
|
||||
(package
|
||||
(inherit abc)
|
||||
(name "abc-yosyshq")
|
||||
(version "0.57")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/YosysHQ/abc/")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"191hsznsmsjn8100n50qsh3ng8wgrnyfhr7qcnb8yskiwqp37pjh"))))
|
||||
(home-page "https://github.com/YosysHQ/abc/")
|
||||
(description "ABC is a program for sequential logic synthesis and
|
||||
formal verification. This is the Yosyshq fork of ABC.")
|
||||
(license (license:non-copyleft "file:///copyright.txt"))))
|
||||
|
||||
(define-public apycula
|
||||
(package
|
||||
(name "apycula")
|
||||
(version "0.24")
|
||||
;; The pypi tar.gz file includes the necessary .pickle files, not available
|
||||
;; in the home-page repository.
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "apycula" version))
|
||||
(sha256
|
||||
(base32 "1mlasq8lf90jcdwp4sk5a834bbmnnfxk2gswwcw83ypg75lli1gw"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments (list #:tests? #f)) ;requires Gowin EDA tools
|
||||
(inputs (list python-crc))
|
||||
(native-inputs (list python-setuptools python-wheel))
|
||||
(home-page "https://github.com/YosysHQ/apicula/")
|
||||
(synopsis "Gowin FPGA bitstream format")
|
||||
(description
|
||||
"The project Apycula provides tools to support development and
|
||||
generating bitstreams with Gowin FPGAs.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public iverilog
|
||||
(package
|
||||
(name "iverilog")
|
||||
(version "12.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/steveicarus/iverilog")
|
||||
(commit
|
||||
(string-append "v" (string-replace-substring version "." "_")))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1cm3ksxyyp8ihs0as5c2nk3a0y2db8dmrrw0f9an3sl255smxn17"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:bootstrap-scripts #~(list "autoconf.sh")
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'ensure-native-baked-CC/CXX
|
||||
(lambda _
|
||||
;; The compilers used to build are retained in
|
||||
;; bin/iverilog-vpi, which is a Makefile
|
||||
;; script. Normalize these to just 'gcc' and 'g++' to
|
||||
;; avoid having these set to cross compilers.
|
||||
(substitute* "Makefile.in"
|
||||
(("s;@IVCC@;\\$\\(CC);")
|
||||
"s;@IVCC@;gcc;")
|
||||
(("s;@IVCXX@;\\$\\(CXX);")
|
||||
"s;@IVCXX@;g++;")))))))
|
||||
(native-inputs (list autoconf bison flex gperf))
|
||||
(inputs (list zlib))
|
||||
(home-page "https://steveicarus.github.io/iverilog/")
|
||||
(synopsis "FPGA Verilog simulation and synthesis tool")
|
||||
(description
|
||||
"Icarus Verilog is a Verilog simulation and synthesis tool.
|
||||
It operates as a compiler, compiling source code written in Verilog
|
||||
(IEEE-1364) into some target format.
|
||||
For batch simulation, the compiler can generate an intermediate form
|
||||
called vvp assembly.
|
||||
This intermediate form is executed by @command{vvp}.
|
||||
For synthesis, the compiler generates netlists in the desired format.")
|
||||
;; GPL2 only because of:
|
||||
;; - ./driver/iverilog.man.in
|
||||
;; - ./iverilog-vpi.man.in
|
||||
;; - ./tgt-fpga/iverilog-fpga.man
|
||||
;; - ./vvp/vvp.man.in
|
||||
;; Otherwise would be GPL2+.
|
||||
;; You have to accept both GPL2 and LGPL2.1+.
|
||||
(license (list license:gpl2 license:lgpl2.1+))))
|
||||
|
||||
(define-public yosys
|
||||
(package
|
||||
(name "yosys")
|
||||
(version "0.57")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/YosysHQ/yosys")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "0bix5zlv9zp9fxqpn9l9bdw65xrgih5w0csq1xkkhm2c7p3vqjbb"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-target "test"
|
||||
#:make-flags
|
||||
#~(list (string-append "CC="
|
||||
#$(cc-for-target))
|
||||
(string-append "CXX="
|
||||
#$(cxx-for-target))
|
||||
(string-append "PREFIX="
|
||||
#$output))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-before 'configure 'fix-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "backends/smt2/smtio.py"
|
||||
(("\\['z3")
|
||||
(string-append "['"
|
||||
(search-input-file inputs "bin/z3"))))
|
||||
(substitute* "kernel/fstdata.cc"
|
||||
(("vcd2fst")
|
||||
(search-input-file inputs "bin/vcd2fst")))
|
||||
(substitute* "kernel/driver.cc"
|
||||
(("^#include \"libs/cxxopts/include/cxxopts.hpp\"")
|
||||
"#include <cxxopts.hpp>"))
|
||||
(substitute* '("passes/cmds/show.cc" "passes/cmds/viz.cc")
|
||||
(("exec xdot")
|
||||
(string-append "exec "
|
||||
(search-input-file inputs "bin/xdot")))
|
||||
(("dot -")
|
||||
(string-append (search-input-file inputs "bin/dot") " -"))
|
||||
(("fuser")
|
||||
(search-input-file inputs "bin/fuser")))))
|
||||
(replace 'configure
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(apply invoke "make" "config-gcc" make-flags)))
|
||||
(add-after 'configure 'use-external-abc
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* '("Makefile")
|
||||
(("ABCEXTERNAL \\?=")
|
||||
(string-append "ABCEXTERNAL = "
|
||||
(search-input-file inputs "/bin/abc"))))))
|
||||
(add-after 'install 'add-symbolic-link
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Previously this package provided a copy of the "abc"
|
||||
;; executable in its output, named "yosys-abc". Create a
|
||||
;; symbolic link so any external uses of that name continue to
|
||||
;; work.
|
||||
(symlink (search-input-file inputs "/bin/abc")
|
||||
(string-append #$output "/bin/yosys-abc"))))
|
||||
(add-after 'install 'keep-pmgen-py
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; pmgen.py is required by some yosys plugins.
|
||||
(install-file (search-input-file inputs
|
||||
"/passes/pmgen/pmgen.py")
|
||||
(string-append #$output "/bin"))))
|
||||
(add-after 'install 'wrap
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(wrap-program (string-append #$output "/bin/yosys-witness")
|
||||
`("GUIX_PYTHONPATH" ":" prefix
|
||||
(,(getenv "GUIX_PYTHONPATH")))))))))
|
||||
(native-inputs (list bison
|
||||
cxxopts ;header-only library
|
||||
flex
|
||||
gawk ;for the tests and "make" progress pretty-printing
|
||||
iverilog ;for the tests
|
||||
pkg-config
|
||||
python
|
||||
tcl)) ;tclsh for the tests
|
||||
(inputs (list abc-yosyshq
|
||||
bash-minimal
|
||||
graphviz
|
||||
gtkwave
|
||||
libffi
|
||||
psmisc
|
||||
python
|
||||
python-click
|
||||
readline
|
||||
tcl
|
||||
xdot
|
||||
z3
|
||||
zlib))
|
||||
(home-page "https://yosyshq.net/yosys/")
|
||||
(synopsis "FPGA Verilog RTL synthesizer")
|
||||
(description "Yosys synthesizes Verilog-2005.")
|
||||
(license license:isc)))
|
||||
|
||||
(define-public yosys-clang
|
||||
(package
|
||||
(inherit yosys)
|
||||
(name "yosys-clang")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments yosys)
|
||||
((#:make-flags _ #f)
|
||||
#~(list "CC=clang"
|
||||
"CXX=clang++"
|
||||
(string-append "PREFIX=" #$output)))
|
||||
((#:phases phases)
|
||||
#~(modify-phases #$phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key make-flags #:allow-other-keys)
|
||||
(apply invoke "make" "config-clang" make-flags)))))))
|
||||
(inputs
|
||||
(modify-inputs (package-inputs yosys)
|
||||
(append clang)))
|
||||
(synopsis "FPGA Verilog RTL synthesizer (Clang variant)")))
|
||||
|
||||
(define-public icestorm
|
||||
(let ((commit "3cdcf4b009bb8681ab7e2e09d65043f04334b60e")
|
||||
(revision "5"))
|
||||
(package
|
||||
(name "icestorm")
|
||||
(version (git-version "0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/YosysHQ/icestorm/")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0ygp6cj7grlnyji572kx215p2mw4crllskif9g795f390bp38g68"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? #f ;avoid a cyclic dependency with nextpr-ice40
|
||||
#:make-flags
|
||||
#~(list (string-append "CC="
|
||||
#$(cc-for-target))
|
||||
(string-append "CXX="
|
||||
#$(cxx-for-target))
|
||||
(string-append "PREFIX="
|
||||
#$output)
|
||||
"ICEPROG=1")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-usr-local
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "icepack/Makefile"
|
||||
(("/usr/local")
|
||||
#$output))
|
||||
(substitute* "icebox/Makefile"
|
||||
(("/usr/local")
|
||||
#$output))
|
||||
(substitute* "icebox/icebox_vlog.py"
|
||||
(("/usr/local")
|
||||
#$output))))
|
||||
(add-after 'build 'make-info
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(with-directory-excursion "docs"
|
||||
(invoke "make" "info")
|
||||
(install-file "build/texinfo/projecticestorm.info"
|
||||
(string-append #$output "/share/info"))
|
||||
(copy-recursively "build/texinfo/projecticestorm-figures"
|
||||
(string-append #$output
|
||||
"/share/info/projecticestorm-figures")))))
|
||||
(delete 'configure))))
|
||||
(inputs (list libftdi))
|
||||
(native-inputs (list pkg-config
|
||||
python
|
||||
python-sphinx
|
||||
python-sphinx-rtd-theme
|
||||
texinfo))
|
||||
(home-page "https://prjicestorm.readthedocs.io/")
|
||||
(synopsis "Bitstream tools for Lattice iCE40 FPGAs")
|
||||
(description
|
||||
"Project IceStorm aims at documenting the bitstream format of
|
||||
Lattice iCE40 FPGAs and providing simple tools for analyzing and creating bitstream
|
||||
files.")
|
||||
(license license:isc))))
|
||||
|
||||
(define-public libfst
|
||||
;; There are no release nor tags.
|
||||
(let ((commit "6a52070cd62ec65c29832bc95e7db493504aa7ac")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "libfst")
|
||||
(version (git-version "1.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/gtkwave/libfst/")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0b1r660m5aib316jjl4nhs10y7vhhqy2mvxjip3ynahig3hpi46z"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs (list gobject-introspection pkg-config))
|
||||
(inputs (list bzip2))
|
||||
(propagated-inputs (list zlib)) ;in Requires.private of libfst.pc
|
||||
(synopsis "Fast Signal Trace (FST) format waveforms library")
|
||||
(description "Libfst is a small library used to read and write
|
||||
@acronym{FST, Fast Signal Trace} format waveforms.")
|
||||
(home-page "https://github.com/gtkwave/libfst/")
|
||||
(license (list license:expat ;libfst and fastlz-derived sources
|
||||
license:bsd-2))))) ;for lz4-derived sources
|
||||
|
||||
(define-public nextpnr
|
||||
;; Necessary for compatibility with latest apycula.
|
||||
;; TODO: Remove with release 0.9.
|
||||
(let ((commit "d796cc720b60ccc18580c686d93c8751fe461532")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "nextpnr")
|
||||
(version (git-version "0.8" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/YosysHQ/nextpnr/")
|
||||
(commit commit)
|
||||
;; XXX: Fetch some bundled libraries such as QtPropertyBrowser,
|
||||
;; json11 and python-console, which have custom modifications or
|
||||
;; no longer have their original upstream.
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; XXX: 'delete-all-but' is copied from the turbovnc package.
|
||||
(define (delete-all-but directory . preserve)
|
||||
(with-directory-excursion directory
|
||||
(let* ((pred (negate (cut member <>
|
||||
(cons* "." ".." preserve))))
|
||||
(items (scandir "." pred)))
|
||||
(for-each (cut delete-file-recursively <>) items))))
|
||||
(delete-all-but "3rdparty"
|
||||
;; The following sources have all been patched, so
|
||||
;; cannot easily be unbundled.
|
||||
"QtPropertyBrowser"
|
||||
"json11"
|
||||
"python-console"
|
||||
"oourafft")))
|
||||
(patches (search-patches "nextpnr-gtest.patch"
|
||||
"nextpnr-imgui.patch"))
|
||||
(sha256
|
||||
(base32 "1arj25vad76wg6b5yaaky4cby5zp9v92pdd4y3l0kxi7wvxhmmya"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:cmake cmake ;CMake 3.25 or higher is required.
|
||||
#:configure-flags
|
||||
;; TODO: enable more architectures?
|
||||
#~(list "-DARCH=generic;ice40;ecp5;himbaechel"
|
||||
"-DBUILD_GUI=ON"
|
||||
"-DUSE_OPENMP=ON"
|
||||
"-DBUILD_TESTS=ON"
|
||||
"-DHIMBAECHEL_UARCH=ng-ultra;gowin"
|
||||
"-DHIMBAECHEL_NGULTRA_DEVICES=ng-ultra"
|
||||
"-DHIMBAECHEL_SPLIT=ON"
|
||||
"-DHIMBAECHEL_PRJBEYOND_DB=/tmp/prjbeyond-db"
|
||||
(string-append "-DCURRENT_GIT_VERSION=nextpnr-" #$version)
|
||||
(string-append "-DICESTORM_INSTALL_PREFIX="
|
||||
#$(this-package-input "icestorm"))
|
||||
(string-append "-DTRELLIS_INSTALL_PREFIX="
|
||||
#$(this-package-input "prjtrellis"))
|
||||
"-DUSE_IPO=OFF")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Required by himbaechel architecture, ng-ultra support.
|
||||
(add-after 'unpack 'get-prjbeyond-db
|
||||
(lambda _
|
||||
(copy-recursively
|
||||
#$(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/yosyshq-GmbH/prjbeyond-db/")
|
||||
;; We take latest commit, as indicated in nextpnr’s
|
||||
;; README.md file
|
||||
(commit "06d3b424dd0e52d678087c891c022544238fb9e3")))
|
||||
(sha256
|
||||
(base32
|
||||
"17dd3cgms2fy6xvz7magdmvv92km4cqh2kz9dyjrvz5y8caqav4y")))
|
||||
"/tmp/prjbeyond-db")))
|
||||
(add-after 'unpack 'unbundle-sanitizers-cmake
|
||||
(lambda _
|
||||
(substitute* "CMakeLists.txt"
|
||||
;; Use the system sanitizers-cmake module. This is made
|
||||
;; necessary 'sanitizers-cmake' installing a FindPackage
|
||||
;; module but no CMake config file.
|
||||
(("\\$\\{CMAKE_SOURCE_DIR}/3rdparty/sanitizers-cmake/cmake")
|
||||
(string-append
|
||||
#$(this-package-native-input "sanitizers-cmake")
|
||||
"/share/sanitizers-cmake/cmake"))))))))
|
||||
(native-inputs
|
||||
(list googletest
|
||||
sanitizers-cmake))
|
||||
(inputs
|
||||
(list apycula
|
||||
boost
|
||||
corrosion
|
||||
eigen
|
||||
icestorm
|
||||
prjtrellis
|
||||
pybind11
|
||||
python
|
||||
qtbase-5
|
||||
qtwayland-5
|
||||
qtimgui
|
||||
yosys))
|
||||
(synopsis "Place-and-Route tool for FPGAs")
|
||||
(description "Nextpnr is a portable FPGA place and route tool.")
|
||||
(home-page "https://github.com/YosysHQ/nextpnr/")
|
||||
(license license:isc))))
|
||||
|
||||
(define-public nextpnr-ice40
|
||||
(deprecated-package "nextpnr-ice40" nextpnr))
|
||||
|
||||
(define-public gtkwave
|
||||
;; The last release is more than 2 years old, and there are improvements in
|
||||
;; the master branch, such as GTK 4 support: pick the latest commit that
|
||||
;; passes their CI.
|
||||
(let ((commit "bb978d9d667d569b9153ffa34007e300302907dc")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "gtkwave")
|
||||
;; The version string can be found in meson.build.
|
||||
(version (git-version "3.4.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/gtkwave/gtkwave")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1nv27cpz5937cb6bkhpw8w0ji6hm9xr8f0znvfwzfl1fwwypf23y"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments (list #:glib-or-gtk? #t))
|
||||
(native-inputs (list desktop-file-utils
|
||||
flex
|
||||
`(,glib "bin") ;for glib-mkenums
|
||||
gobject-introspection
|
||||
gperf
|
||||
`(,gtk "bin")
|
||||
pkg-config))
|
||||
(inputs (list gtk gtk+ libfst))
|
||||
(synopsis "Waveform viewer for FPGA simulator trace files")
|
||||
(description "This package is a waveform viewer for @acronym{FST, FPGA
|
||||
Simulator Trace} files.")
|
||||
(home-page "https://github.com/gtkwave/gtkwave")
|
||||
;; Exception against free government use in tcl_np.c and tcl_np.h.
|
||||
(license (list license:gpl2+ license:expat license:tcl/tk)))))
|
||||
|
||||
(define-public python-migen
|
||||
;; XXX: The latest version tag (0.9.2) was placed in 2019, there are latest
|
||||
;; changes supporting Python 3.11 on master branch, see
|
||||
;; <https://github.com/m-labs/migen/issues/259>.
|
||||
(let ((commit "6e3a9e150fb006dabc4b55043d3af18dbfecd7e8")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "python-migen")
|
||||
(version (git-version "0.9.2" revision commit))
|
||||
(source
|
||||
(origin
|
||||
;; Tests fail in the PyPI tarball due to missing files.
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/m-labs/migen")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1hibhjnj5b3ka5y4nnqx9zp5w730gfqfa3r5injpa14i4cz6bj1n"))))
|
||||
(build-system pyproject-build-system)
|
||||
(native-inputs
|
||||
(list python-pytest
|
||||
python-setuptools-next))
|
||||
(propagated-inputs
|
||||
(list python-colorama))
|
||||
(home-page "https://m-labs.hk/gateware/migen/")
|
||||
(synopsis "Python toolbox for building complex digital hardware")
|
||||
(description
|
||||
"Migen FHDL is a Python library that replaces the event-driven paradigm
|
||||
of Verilog and VHDL with the notions of combinatorial and synchronous
|
||||
statements, has arithmetic rules that make integers always behave like
|
||||
mathematical integers, and allows the design's logic to be constructed by a
|
||||
Python program.")
|
||||
(license license:bsd-2))))
|
||||
|
||||
(define-public python-myhdl
|
||||
(let ((commit "7dc29c242cd33cb835c336a81ffc3a461eaa92f4")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "python-myhdl")
|
||||
(version (git-version "0.11" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/myhdl/myhdl/")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1b91yvr0ksrw3bx61i7914caf8pyks9c242kwmj4l12zjd06mp56"))))
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key tests? #:allow-other-keys)
|
||||
(when tests?
|
||||
(invoke "make" "iverilog" "core")))))))
|
||||
(build-system pyproject-build-system)
|
||||
(native-inputs
|
||||
(list iverilog python-setuptools-next python-pytest))
|
||||
(home-page "http://www.myhdl.org/")
|
||||
(synopsis "Python as a Hardware Description Language")
|
||||
(description "This package provides a library to turn Python into
|
||||
a hardware description and verification language.")
|
||||
(license license:lgpl2.1+))))
|
||||
|
||||
(define-public python-vunit
|
||||
(package
|
||||
(name "python-vunit")
|
||||
(version "5.0.0-dev.6") ;v4.7.0 dates back from 2 years ago.
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/VUnit/vunit")
|
||||
(commit (string-append "v" version))
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0zm7733g7ivcx6y00bigvqzkxa2i46sw4pb5k1n3lfbqvsjymshh"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-ghdl-jit
|
||||
(lambda _
|
||||
;; TODO: Remove when fixed upstream (see:
|
||||
;; https://github.com/VUnit/vunit/pull/1121).
|
||||
(substitute* "vunit/sim_if/ghdl.py"
|
||||
((": \"llvm\",")
|
||||
(string-append
|
||||
": \"llvm\",\n\tr\"static elaboration, LLVM JIT code "
|
||||
"generator\": \"llvm-jit\","))))))
|
||||
#:test-flags
|
||||
;; Skip lint tests which require python-pycodestyle, python-pylint and
|
||||
;; python-mypy to reduce closoure size; some lint test fails, see
|
||||
;; <https://github.com/VUnit/vunit/issues/1111>.
|
||||
;;
|
||||
;; XXX: Acceptance tests take 10+ minutes to complete, hang on
|
||||
;; "test_external_run_scripts.py" and fail eventually, consider to
|
||||
;; improve them; ignore for now.
|
||||
#~(list "tests/unit")))
|
||||
(native-inputs
|
||||
(list nvc
|
||||
python-pytest
|
||||
python-setuptools
|
||||
python-setuptools-scm
|
||||
python-wheel))
|
||||
(propagated-inputs
|
||||
(list python-colorama))
|
||||
(home-page "https://vunit.github.io")
|
||||
(synopsis "Unit testing framework for VHDL/SystemVerilog")
|
||||
(description
|
||||
"VUnit features the functionality needed to realize continuous and
|
||||
automated testing of HDL code.")
|
||||
;; According to 'LICENSE.rst', VUnit itself is under MPL but two
|
||||
;; subdirectories are under ASL.
|
||||
(license (list license:mpl2.0 license:asl2.0))))
|
||||
|
||||
(define-public nvc
|
||||
(package
|
||||
(name "nvc")
|
||||
(version "1.17.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/nickg/nvc")
|
||||
(commit (string-append "r" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0hr5y9ys5kf096x18mh10wwqa0hbzlmdj7pyayc6szsjla1d3mk0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:out-of-source? #t
|
||||
#:configure-flags
|
||||
#~(list "--enable-tcl"
|
||||
"--enable-llvm"
|
||||
"--enable-verilog"
|
||||
"--enable-vital"
|
||||
"--enable-server"
|
||||
"--with-ncurses"
|
||||
"--enable-parallel-make"
|
||||
"--enable-vital"
|
||||
(string-append "--with-bash-completion=" #$output
|
||||
"/share/bash-completion/completions"))
|
||||
#:phases #~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'clean-up
|
||||
(lambda _
|
||||
(delete-file "autogen.sh"))))))
|
||||
(native-inputs
|
||||
(list automake
|
||||
autoconf
|
||||
check ; for the tests
|
||||
flex
|
||||
gettext-minimal
|
||||
libtool
|
||||
pkg-config
|
||||
python-minimal
|
||||
which))
|
||||
(inputs
|
||||
(list jansson
|
||||
libffi
|
||||
llvm
|
||||
readline
|
||||
tcl
|
||||
`(,zstd "lib")))
|
||||
(synopsis "VHDL compiler and simulator")
|
||||
(description "This package provides a VHDL compiler and simulator.")
|
||||
(home-page "https://www.nickg.me.uk/nvc/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public systemc
|
||||
(package
|
||||
(name "systemc")
|
||||
(version "3.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/accellera-official/systemc")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1c8brlv3702p2ivifai9929bg20y30jb301ap0gdmz305q8mcb33"))))
|
||||
(native-inputs (list perl))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:modules '((guix build cmake-build-system)
|
||||
((guix build gnu-build-system) #:prefix gnu:)
|
||||
(guix build utils))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'check (assoc-ref gnu:%standard-phases 'check)))))
|
||||
(home-page "https://systemc.org/")
|
||||
(synopsis "Library for event-driven simulation")
|
||||
(description
|
||||
"SystemC is a C++ library for modeling concurrent systems, and the
|
||||
reference implementation of IEEE 1666-2011. It provides a notion of timing as
|
||||
well as an event-driven simulations environment. Due to its concurrent and
|
||||
sequential nature, SystemC allows the description and integration of complex
|
||||
hardware and software components. To some extent, SystemC can be seen as
|
||||
a Hardware Description Language. However, unlike VHDL or Verilog, SystemC
|
||||
provides sophisticated mechanisms that offer high abstraction levels on
|
||||
components interfaces. This, in turn, facilitates the integration of systems
|
||||
using different abstraction levels.")
|
||||
;; homepages.cae.wisc.edu/~ece734/SystemC/Esperan_SystemC_tutorial.pdf
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public verilator
|
||||
(package
|
||||
(name "verilator")
|
||||
(version "5.040")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/verilator/verilator/")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0xw2w7fikli3jffwd819rx8bwbh3zsymhrn3zbq34glklff07rsb"))))
|
||||
(native-inputs
|
||||
(list autoconf
|
||||
automake
|
||||
bison
|
||||
cmake-minimal
|
||||
flex
|
||||
gdb/pinned
|
||||
gettext-minimal
|
||||
help2man
|
||||
python-distro
|
||||
python-minimal
|
||||
which))
|
||||
(inputs
|
||||
(list perl python systemc))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'bootstrap
|
||||
(lambda _ (invoke "autoconf")))
|
||||
(add-after 'unpack 'adjust-source
|
||||
(lambda _
|
||||
(substitute* "bin/verilator"
|
||||
(("/bin/echo") "echo"))))
|
||||
(add-before 'check 'set-SYSTEMC_ROOT
|
||||
(lambda _
|
||||
(setenv "SYSTEMC_ROOT" #$(this-package-input systemc))))
|
||||
(add-before 'check 'disable-gdb-safe-path
|
||||
(lambda _
|
||||
(setenv "HOME" (getcwd))
|
||||
(mkdir-p (string-append (getcwd) "/.config/gdb"))
|
||||
(with-output-to-file
|
||||
(string-append (getcwd) "/.config/gdb/gdbinit")
|
||||
(lambda ()
|
||||
(display "set auto-load safe-path /"))))))
|
||||
#:test-target "test"))
|
||||
(home-page "https://www.veripool.org/verilator/")
|
||||
(synopsis "Verilog/SystemVerilog simulator")
|
||||
(description
|
||||
"Verilator transforms the specified Verilog or SystemVerilog code by
|
||||
reading it, performing lint checks, and optionally inserting assertion checks
|
||||
and coverage-analysis points. It outputs single- or multi-threaded
|
||||
@file{.cpp} and @file{.h} files.")
|
||||
(license license:lgpl3)))
|
||||
|
||||
(define-public fftgen
|
||||
(let ((commit "3378b77d83a98b06184656a5cb9b54e50dfe4485") ;no releases
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "fftgen")
|
||||
(version (git-version "0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/ZipCPU/dblclockfft")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1rvln871wjkbbqnv88jnx328xlhn5sgbr8fglk3ajnd9rwgiq3jg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:test-target "bench-test"
|
||||
#:make-flags #~(list "CFLAGS=-g -O2") ;default flags lack -O2
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda _
|
||||
(install-file "sw/fftgen"
|
||||
(string-append #$output "/bin")))))))
|
||||
(native-inputs (list bc fftw python-minimal verilator which))
|
||||
(synopsis "Generic pipelined FFT core generator")
|
||||
(description "fftgen produces @acronym{FFT, fast-Fourier transforms}
|
||||
hardware designs in Verilog.")
|
||||
(home-page "https://github.com/ZipCPU/zipcpu/")
|
||||
(license license:lgpl3+))))
|
||||
|
||||
(define-public openfpgaloader
|
||||
(package
|
||||
(name "openfpgaloader")
|
||||
(version "0.13.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/trabucayre/openfpgaloader")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1p5qvr0bq27rp7f20ysjml7zy4bbwjx3s4yd5qjsg4b01mw4hbiq"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(inputs (list eudev
|
||||
hidapi
|
||||
libftdi
|
||||
libgpiod
|
||||
libusb
|
||||
zlib))
|
||||
(arguments
|
||||
(list #:tests? #f ;no test suite
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'install-rules
|
||||
(lambda _
|
||||
(install-file
|
||||
"../source/99-openfpgaloader.rules"
|
||||
(string-append #$output "/lib/udev/rules.d/")))))))
|
||||
(synopsis "Utility for programming FPGA")
|
||||
(description "This package provides a program to transfer a bitstream
|
||||
to an FPGA. To use @code{openfpgaloader} without root privileges it is
|
||||
necessary to install the necessary udev rules. This can be done by extending
|
||||
@code{udev-service-type} in the @code{operating-system} configuration file with
|
||||
this package, as in:
|
||||
@lisp
|
||||
(udev-rules-service 'openfpgaloader openfpgaloader #:groups '(\"plugdev\")
|
||||
@end lisp
|
||||
Additionally, the @samp{plugdev} group should be registered in the
|
||||
@code{supplementary-groups} field of your @code{user-account} declaration. Refer
|
||||
to @samp{info \"(guix) Base Services\"} for examples.")
|
||||
(home-page "https://trabucayre.github.io/openFPGALoader/")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public python-hdlmake
|
||||
(let ((commit "c56cb8efa2000d06cec698f0149bc4ca4ef4e5bc")
|
||||
(revision "3"))
|
||||
(package
|
||||
(name "python-hdlmake")
|
||||
(version (git-version "3.3" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/ohwr/project/hdl-make/")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1w4b0g015rzfypr8sjyr8xqij6s2p5qxhxraswrhjvg1w86b6s36"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments (list #:phases #~(modify-phases %standard-phases
|
||||
(add-before 'check 'chdir
|
||||
(lambda _
|
||||
(chdir "testsuite"))))
|
||||
#:test-flags #~(list "test_all.py")))
|
||||
(native-inputs (list python-pytest python-setuptools-next))
|
||||
(propagated-inputs (list python-networkx python-six))
|
||||
(home-page "https://ohwr.gitlab.io/project/hdl-make/")
|
||||
(synopsis "Generate multi-purpose makefiles for HDL projects")
|
||||
(description
|
||||
"Hdlmake helps manage and share @acronym{HDL, hardware description
|
||||
language} code by automatically finding file dependencies, writing synthesis
|
||||
and simulation Makefiles.")
|
||||
(license license:gpl3+))))
|
|
@ -27,7 +27,7 @@
|
|||
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
|
||||
;;; Copyright © 2021, 2022, 2023 Maxime Devos <maximedevos@telenet.be>
|
||||
;;; Copyright © 2021, 2022, 2024 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2021-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
|
||||
;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
|
||||
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
|
||||
|
|
|
@ -32,14 +32,14 @@
|
|||
(define-public freeipmi
|
||||
(package
|
||||
(name "freeipmi")
|
||||
(version "1.6.15")
|
||||
(version "1.6.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/freeipmi/freeipmi-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bwc5gz3985fly84ap1yq8jkddkf6s5px2dinmswxx9r8qsrr4nn"))))
|
||||
"078i0ilsv4czzr2j0nwjafgqkrxc62cmf8rn9ady905nksxzdkjv"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(append
|
||||
|
|
|
@ -964,7 +964,7 @@ complex and interesting levels.")
|
|||
("pkg-config" ,pkg-config)
|
||||
("texinfo" ,texinfo)))
|
||||
(inputs
|
||||
`(("guile-sdl2" ,guile3.0-sdl2)
|
||||
`(("guile-sdl2" ,guile-sdl2)
|
||||
("guile" ,guile-3.0)
|
||||
("pango" ,pango)
|
||||
("sdl2" ,sdl2)))
|
||||
|
|
|
@ -2395,7 +2395,7 @@ such as chess or stockfish.")
|
|||
(define-public gnubg
|
||||
(package
|
||||
(name "gnubg")
|
||||
(version "1.07.001")
|
||||
(version "1.08.003")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2403,10 +2403,10 @@ such as chess or stockfish.")
|
|||
version "-sources.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07l2srlm05c99l4pppba8l54bnh000ns2rih5h8rzbcw84lrffbj"))))
|
||||
"0yar8j6g2f1q9zz9m9ha9xzvjr6mwp2qrzwhp9ppizyg2fdrczbg"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs (list ;; XXX: Build with an older Pango for 'pango_font_get_hb_font' and
|
||||
;; 'pango_coverage_get_type'. Try removing this for versions > 1.07.001.
|
||||
;; 'pango_coverage_get_type'. Try removing this for versions > 1.08.003.
|
||||
pango-1.42
|
||||
glib
|
||||
readline
|
||||
|
@ -2415,10 +2415,10 @@ such as chess or stockfish.")
|
|||
glu
|
||||
gtkglext
|
||||
sqlite
|
||||
libcanberra
|
||||
libxcrypt)) ;required by Python.h
|
||||
(native-inputs `(("python-2" ,python-2)
|
||||
("pkg-config" ,pkg-config)))
|
||||
libcanberra))
|
||||
(native-inputs (list flex
|
||||
python
|
||||
pkg-config))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
;; SSE instructions are available on Intel systems only.
|
||||
|
@ -2777,7 +2777,7 @@ Every puzzle has a complete solution, although there may be more than one.")
|
|||
(define-public dsda-doom
|
||||
(package
|
||||
(name "dsda-doom")
|
||||
(version "0.29.0")
|
||||
(version "0.29.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -2786,7 +2786,7 @@ Every puzzle has a complete solution, although there may be more than one.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1aki559nz1czlvzah1rdmpdcad4mswpp5gszfwxhil9x0hc3gj4r"))))
|
||||
(base32 "1nhlwxwhs69ibsi873cdjanfdlpqcb4ybcp8c2j8j9l07xpgvk1n"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -11502,50 +11502,6 @@ player adaptability for character progression.")
|
|||
(modify-inputs (package-native-inputs harmonist)
|
||||
(prepend pkg-config)))))
|
||||
|
||||
(define-public gnurobots
|
||||
(package
|
||||
(name "gnurobots")
|
||||
(version "1.2.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gnurobots/gnurobots-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07gi3lsmbzzsjambgixj6xy79lh22km84z7bnzgwzxdy806lyvwb"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list glib gtk+-2 vte/gtk+-2 readline guile-1.8 libxcrypt))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
(list
|
||||
;; Do not abort build on "deprecated-declarations" warnings.
|
||||
"CFLAGS=-Wno-error=deprecated-declarations"
|
||||
;; Find readline headers in sub-directory.
|
||||
(string-append "READLINE_CFLAGS=-I"
|
||||
(assoc-ref %build-inputs "readline")
|
||||
"/include/readline/"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'install 'install-doc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(install-file "doc/Robots-HOWTO"
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/share/doc/gnurobots-"
|
||||
,version))
|
||||
#t)))))
|
||||
(home-page "https://www.gnu.org/software/gnurobots/")
|
||||
(synopsis "Program a little robot and watch it explore a world")
|
||||
(description
|
||||
"GNU Robots is a game in which you program a robot to explore a world
|
||||
full of enemies that can hurt it, obstacles and food to be eaten. The goal of
|
||||
the game is to stay alive and collect prizes. The robot program conveniently
|
||||
may be written in a plain text file in the Scheme programming language.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public li-ri
|
||||
(package
|
||||
(name "li-ri")
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2024, 2025 Zheng Junjie <z572@z572.online>
|
||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org>
|
||||
;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2025 Leo Nikkilä <hello@lnikki.la>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2024 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020, 2021, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2025 Zheng Junjie <z572@z572.online>
|
||||
;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
|
||||
;;;
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
;;; Copyright © 2021, 2022 Nikolay Korotkiy <sikmir@disroot.org>
|
||||
;;; Copyright © 2022 Patrick Noll <patrick@patricknoll.com>
|
||||
;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||
;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
|
||||
;;; Copyright © 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
|
@ -890,7 +890,7 @@ OpenGeoSys")
|
|||
(define-public ogs-serial
|
||||
(package
|
||||
(name "ogs-serial")
|
||||
(version "6.5.5")
|
||||
(version "6.5.6")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -899,7 +899,7 @@ OpenGeoSys")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1zph6vlkcq6ph23hlwk4gx3xpdf98a2iz25viah429hm1agziqi4"))))
|
||||
(base32 "0dpj0m1hp7pn8j5avk4gip80ccx08ik3jw5bknz722d7i9hm78dz"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
@ -4126,8 +4126,19 @@ time. Interactively visualize vector, raster and volume data.")
|
|||
#:configure-flags #~(list "-DSAMPLE_MAP=FALSE")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
;; Workaround for the following issue:
|
||||
;; https://github.com/navit-gps/navit/issues/1294 which results in
|
||||
;; 'error:navit:navit_init:FATAL: No GUI available.' For now there
|
||||
;; is only a workaround and no real fix yet.
|
||||
(add-after
|
||||
'unpack 'patch-navit-config
|
||||
'unpack 'patch-cmake_minimum_required
|
||||
(lambda _
|
||||
(substitute*
|
||||
"CMakeLists.txt"
|
||||
(("cmake_minimum_required\\(VERSION 3\\.10\\)")
|
||||
"cmake_minimum_required(VERSION 3.2)"))))
|
||||
(add-after
|
||||
'patch-cmake_minimum_required 'patch-navit-config
|
||||
(lambda _
|
||||
;; For now this package only supports SDL, so if we keep
|
||||
;; the configuration as-is, Navit doesn't start.
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue