forked from tribes/guix
Compare commits
482 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d0d906917c | |||
| 2288a14a60 | |||
| da50337f6b | |||
| 939ce93a12 | |||
| 421df8e79b | |||
| c534e0adfd | |||
| 3b338604b8 | |||
| 67c8d652fd | |||
| 3a2775a160 | |||
| 5e5ff1381b | |||
| ef165bcf5a | |||
| f8f1778c69 | |||
| 1e88181626 | |||
| c364afa1d6 | |||
| 8dffe4713d | |||
| f1286d6bf1 | |||
| 8cb29ebe60 | |||
| 56b1a933f1 | |||
| 19019755ad | |||
| 57a0260359 | |||
| 82b8284ce1 | |||
| 7c290d6667 | |||
| 46a4f15a55 | |||
| d407ea1404 | |||
| 3da6a0bc9d | |||
| 44ac95c31f | |||
| e734102b74 | |||
| 4a041b080e | |||
| a3ae72cebe | |||
| 4dea734cb7 | |||
| 44019bf299 | |||
| 3a7d19de6a | |||
| b03996be13 | |||
| 7ad161c1c8 | |||
| 4dd12d40d8 | |||
| ef3aec8060 | |||
| 057e45fa94 | |||
| e978b77e9b | |||
| 3e937950aa | |||
| b22ed7e361 | |||
| f27a394eb7 | |||
| a97d78ba76 | |||
| 229d0cb49f | |||
| 78e603ce22 | |||
| 83dfde3eb6 | |||
| 06cd989c0f | |||
| ddc6ea22ca | |||
| 64e4b79de6 | |||
| cbeee0326f | |||
| 165bc107d4 | |||
| c039b2da23 | |||
| d02b10be15 | |||
| e5e2aaaf55 | |||
| 5d73106227 | |||
| ce09216dce | |||
| cb1f7b8948 | |||
| f78630e302 | |||
| 9e4f181122 | |||
| 4362b0c608 | |||
| fef9065259 | |||
| 528c6261cd | |||
| fbd8568c22 | |||
| 31c2fc709b | |||
| bbfb6f2c62 | |||
| 0cbf963044 | |||
| fe89ae08c2 | |||
| 72ce4088da | |||
| 65eb271e6f | |||
| 0e0622edcc | |||
| 9a9b4c5674 | |||
| f0c5f25cb4 | |||
| 869cd7fa03 | |||
| 08015b27ee | |||
| 273a4433a6 | |||
| 209874a88a | |||
| d7f45831cf | |||
| b10d0fdaf0 | |||
| af2b12e51f | |||
| cfa3de9ba4 | |||
| fd18daaa4d | |||
| 3c2ea3ba6a | |||
| d3a19b14a9 | |||
| 8a68d9f6c8 | |||
| bec766115e | |||
| 8793d78395 | |||
| 128dc8ca7f | |||
| b5e877667d | |||
| a3b0ebdde1 | |||
| 606bbed702 | |||
| de8754d2e1 | |||
| 92c1e44eb8 | |||
| 5ee0ece891 | |||
| 1c3f020a60 | |||
| 7c60dab501 | |||
| ff3ee6f1ce | |||
| 79acf11475 | |||
| 8119d7fc9d | |||
| 3e358dd784 | |||
| ab36825327 | |||
| 9880ac3122 | |||
| a801ef90b5 | |||
| f828194554 | |||
| a50c44187a | |||
| 33c8768b2e | |||
| 0e163369bd | |||
| 30f766b991 | |||
| ad469cba6e | |||
| ec02b2b974 | |||
| 3b5508ffde | |||
| 6f905d7258 | |||
| 7c62cb0528 | |||
| 59784cd1ad | |||
| 5fe0b7d3b6 | |||
| ad8f92b114 | |||
| a3b327b8a8 | |||
| 3d19529f8e | |||
| 3b53789393 | |||
| a191ad0d35 | |||
| 9561f5375c | |||
| 8ebc554e6a | |||
| fda72ca8fb | |||
| e9e6165d07 | |||
| 4dcde11825 | |||
| 412394f444 | |||
| 32f426c446 | |||
| 0a713ecbc8 | |||
| edda146be0 | |||
| 36bf3f59c1 | |||
| a368dfefbb | |||
| 32ed37885e | |||
| ef8a6c422b | |||
| 601d8c959d | |||
| bb81430026 | |||
| b7e6b4c615 | |||
| affd37076f | |||
| c1719eb0c4 | |||
| 9147a33256 | |||
| 9e5a110068 | |||
| 513168ffb2 | |||
| 23377537da | |||
| 9cf150b28e | |||
| 96b80b008e | |||
| 6b89b97d05 | |||
| 4cc4c76637 | |||
| 33c9aaf002 | |||
| 643374559e | |||
| ad86e9660d | |||
| b4b7dbfe1b | |||
| dbecaed075 | |||
| 87d45d5b76 | |||
| bf3f52609d | |||
| 34777c0bbd | |||
| d86748d99f | |||
| 2474e38c5b | |||
| 113d22500c | |||
| 28a2916e86 | |||
| 96d645150a | |||
| 78000c9395 | |||
| a448eca8a5 | |||
| 39a6807609 | |||
| c581d42f7f | |||
| 13196327fd | |||
| e20ff3658f | |||
| 6a3832ad6d | |||
| 85ccd32fe6 | |||
| 6a5005d62e | |||
| c04485849e | |||
| bcee2b576a | |||
| b9512bd5e8 | |||
| 3628c68e9a | |||
| 200fdbed49 | |||
| f82efbf17d | |||
| d5091385a5 | |||
| 0d40939b5f | |||
| 1b2320b8b0 | |||
| d93e81e2b4 | |||
| 8bb50dde37 | |||
| ae742476b5 | |||
| 1dab977424 | |||
| 96ae688e32 | |||
| aad2bc38c7 | |||
| 42e68f5584 | |||
| 5afd027487 | |||
| 3806f5f991 | |||
| 65f772c482 | |||
| 7ce5f9e696 | |||
| 428dfc796f | |||
| 90f9443668 | |||
| f8f9149ff0 | |||
| 6806ec49db | |||
| be70e45f12 | |||
| fd86a45eb0 | |||
| a0d88a4725 | |||
| a1d6d4e8b8 | |||
| c013cce3ba | |||
| 46e915efba | |||
| 25a3cf7687 | |||
| cc1c4e60e7 | |||
| 969be80aae | |||
| 6a2c721366 | |||
| 7a37399512 | |||
| 05ad747b16 | |||
| 7072de11b9 | |||
| c03156b1fb | |||
| ef1638ebdf | |||
| cdaefd61ba | |||
| c2e4b45aad | |||
| 0133d872f6 | |||
| ddb7a77b7d | |||
| 31eee60940 | |||
| 16f971bbf7 | |||
| c32757baf6 | |||
| 986d997ad0 | |||
| 0748122bd2 | |||
| 396bb7e8ef | |||
| f668151823 | |||
| c0584bed8c | |||
| 6cc23705a6 | |||
| acb466c056 | |||
| 735e13d60e | |||
| 98168d5362 | |||
| fa8e00338c | |||
| 32b007b434 | |||
| 0e8a578da4 | |||
| fe376cdf4a | |||
| d636e801be | |||
| c46b44ce68 | |||
| bb27bc901c | |||
| 7619e82b35 | |||
| 8d6b041cb6 | |||
| 55e3d0b154 | |||
| 32863e42b6 | |||
| c6cf60450d | |||
| 451247642d | |||
| be5131cf13 | |||
| 7b4d4f16ed | |||
| 73d69677a3 | |||
| 44a1f76f05 | |||
| ce0a26bf44 | |||
| d57ecc3023 | |||
| 132d2a4e7c | |||
| f3efb57c4c | |||
| d68e92fcf7 | |||
| 72d81789e9 | |||
| 65b767cb36 | |||
| a02a6d2b83 | |||
| 14a65594a1 | |||
| 527de054fa | |||
| 78cb02925f | |||
| 3e6e8582a1 | |||
| c94e2af5aa | |||
| f5c418be09 | |||
| a4ecd92dae | |||
| b8946c8d7b | |||
| f17572eb4b | |||
| 48f52f85f9 | |||
| 852c6300bf | |||
| 3699c4a4fe | |||
| d1011b548f | |||
| 3814cc1da9 | |||
| 746add3f1b | |||
| 2fbb82a8a5 | |||
| 45cf15b751 | |||
| 30442f49a5 | |||
| 2afe7fe09e | |||
| 2fe026b447 | |||
| 03f9966834 | |||
| 2f889ec2b5 | |||
| cfd676fa24 | |||
| 5e86b3e112 | |||
| d09c3b19e7 | |||
| 68adc69ce3 | |||
| b7b8497734 | |||
| 6b11be9644 | |||
| 79a70405bb | |||
| 8d06dbc72e | |||
| ac7bec1187 | |||
| a1bb828da2 | |||
| 6a90416017 | |||
| 2fdb18979e | |||
| d8bc7a857a | |||
| 9ccbefd585 | |||
| 8538108621 | |||
| adac45850b | |||
| 63e73973a5 | |||
| 082c705d48 | |||
| a544e59205 | |||
| fed54175a1 | |||
| 6d5a20bc05 | |||
| 92df3d957a | |||
| 8bb2902721 | |||
| dc0ffec8da | |||
| ccd22eac80 | |||
| da61f4e8fb | |||
| 67fa713c9a | |||
| d8aadaecca | |||
| 84426cb20a | |||
| 3e4c2ce48e | |||
| 8014907342 | |||
| 5dd9f05628 | |||
| 8d585c6179 | |||
| 89a627472b | |||
| 98a10e4e2e | |||
| d7cf85a404 | |||
| de90fd9b14 | |||
| 8a8d8ca39e | |||
| a06400ad5c | |||
| ca58363a7c | |||
| ace8be46a4 | |||
| f0079d20ae | |||
| e597af9546 | |||
| 41ab1cb9e4 | |||
| 9bc1228485 | |||
| 745bd96b91 | |||
| 357fbd56fb | |||
| d23f6960d8 | |||
| fa26ae8d65 | |||
| 51ec304fb7 | |||
| 0cd40ba2ab | |||
| 857540e6cb | |||
| 0d16098802 | |||
| eb2482a352 | |||
| 3ffa9e2742 | |||
| 7a4e3229f7 | |||
| a8103c1b7c | |||
| f77bbf8016 | |||
| c26c3d0f53 | |||
| 0d11c221b8 | |||
| 6abb7bc422 | |||
| 03937c8724 | |||
| 7ff2ca1b5c | |||
| 380efb7408 | |||
| 589f4cc655 | |||
| 05e669ac50 | |||
| 08341ec277 | |||
| b725619636 | |||
| a3f6d396cd | |||
| 7d67cacad1 | |||
| 333d61cf5b | |||
| 21a4d649b2 | |||
| 5ff9ca0339 | |||
| c4657c774b | |||
| b559fd6938 | |||
| fa38888348 | |||
| 10ea4f874e | |||
| c5280fd612 | |||
| ed63c9e8f7 | |||
| 297b593f62 | |||
| 07ecb050c0 | |||
| ac316e522a | |||
| 99fdbdef6a | |||
| 101b12a54a | |||
| aafdf7ecf7 | |||
| 0999b3268c | |||
| e296f3f012 | |||
| 759bdcb469 | |||
| ee985ff4d6 | |||
| 4fdaa6e2f2 | |||
| 445e61337e | |||
| d632b423d5 | |||
| 4a4ef229e6 | |||
| 2c51b803e3 | |||
| 6690bf46c6 | |||
| 58266bb4ba | |||
| 69f512e520 | |||
| 83e5fe437f | |||
| ef81d340cd | |||
| 5ce1b4a3e3 | |||
| e155ef7c4b | |||
| 09a4a0fce4 | |||
| d841bf2ec2 | |||
| fe7badf33e | |||
| e0fd8f335c | |||
| 343d7553f0 | |||
| dca6d32c62 | |||
| 4719c0781c | |||
| e3a096758c | |||
| bd16834557 | |||
| d1c04ded76 | |||
| 39d7eadd40 | |||
| 891e434c6b | |||
| 0b409bae2c | |||
| 15c7094492 | |||
| c1ca168e05 | |||
| 8e9f2feeef | |||
| 66c2b3f46d | |||
| 5578b6daf2 | |||
| 5d80f53024 | |||
| 7927aebb9e | |||
| a3c93d47fa | |||
| f6b79709c3 | |||
| 1b9b62e0c5 | |||
| 1a76acd4c2 | |||
| 0bb446efff | |||
| 6ab6e5b75d | |||
| 40fc279123 | |||
| 36f773a1f2 | |||
| 08222e17eb | |||
| 3b4e41a01b | |||
| af0379d6c4 | |||
| 727b300e04 | |||
| 1d6eb98dd6 | |||
| 65011d15fd | |||
| a816cf8965 | |||
| 5672a9e280 | |||
| 92de7e0cae | |||
| 5fe112e4fa | |||
| b7992ceef5 | |||
| 3b57556870 | |||
| e270914ffe | |||
| 62e144930a | |||
| 8632cc58e4 | |||
| cf94cd3e4e | |||
| f6365c6b3e | |||
| a8c0685d98 | |||
| 8d0df614e1 | |||
| 91b71c2b5f | |||
| 9cdd36e7ed | |||
| 4a835a41dd | |||
| a4eb13568e | |||
| 441dcb81c3 | |||
| 7d6d1663c4 | |||
| 9829ea548c | |||
| fae4042d23 | |||
| ef105f1316 | |||
| 0fbe363fb8 | |||
| 450849da26 | |||
| 2434428c28 | |||
| 2d7f403979 | |||
| 3ec160f69b | |||
| 7674b45fbf | |||
| 8d3cb0bfa1 | |||
| 33555b672b | |||
| 630b50d46b | |||
| 7b07f8063f | |||
| fa060a6d95 | |||
| 864ec1d9d0 | |||
| 1b0879169d | |||
| e34642e764 | |||
| 40651d41da | |||
| 7cf91385c5 | |||
| 4ec4ff0148 | |||
| 2d21820519 | |||
| f2ed23fcf4 | |||
| 466686033e | |||
| 461f61dafa | |||
| f61fc47913 | |||
| b79aea3544 | |||
| 6ee49c693f | |||
| 85834b7219 | |||
| a5a578b027 | |||
| 7791daea29 | |||
| 3d22340ff4 | |||
| 0b8e838208 | |||
| 2abfd1370f | |||
| bd03432cb8 | |||
| 8fe2277507 | |||
| 1045f12f00 | |||
| c41e1bffa1 | |||
| ba516ec82e | |||
| 7d74bb3ee4 | |||
| f00a19b0af | |||
| 5fa6ada0e8 | |||
| 3c2d5297f0 | |||
| 53e746150f | |||
| ff4aa1fd77 | |||
| 7e93e39db7 | |||
| 7c439d1258 | |||
| f8fa16af89 | |||
| 489b5ab929 | |||
| 84347d9ff3 | |||
| afed309937 | |||
| d4afa4f3a1 | |||
| 45c979eeca | |||
| 66abefe050 | |||
| bebf93a029 | |||
| fc884c09de | |||
| 365ff68f3c | |||
| dc2e36600b | |||
| 7c3c6cf9c3 | |||
| 4e78e6a842 | |||
| e61b99dfb1 |
@@ -68,6 +68,7 @@ guix/discovery\.scm @guix/core
|
|||||||
guix/docker\.scm @guix/core
|
guix/docker\.scm @guix/core
|
||||||
guix/download\.scm @guix/core
|
guix/download\.scm @guix/core
|
||||||
guix/elf\.scm @guix/core
|
guix/elf\.scm @guix/core
|
||||||
|
guix/fossil-download\.scm @guix/core
|
||||||
guix/ftp-client\.scm @guix/core
|
guix/ftp-client\.scm @guix/core
|
||||||
guix/gexp\.scm @guix/core
|
guix/gexp\.scm @guix/core
|
||||||
guix/git-authenticate\.scm @guix/core
|
guix/git-authenticate\.scm @guix/core
|
||||||
@@ -178,6 +179,7 @@ guix/scripts/import/elpa\.scm @guix/emacs
|
|||||||
tests/import/elpa\.scm @guix/emacs
|
tests/import/elpa\.scm @guix/emacs
|
||||||
|
|
||||||
gnu/packages/bootloaders\.scm @guix/embedded
|
gnu/packages/bootloaders\.scm @guix/embedded
|
||||||
|
gnu/packages/coreboot\.scm @guix/embedded
|
||||||
gnu/packages/firmware\.scm @guix/embedded
|
gnu/packages/firmware\.scm @guix/embedded
|
||||||
|
|
||||||
gnu/packages/emulators\.scm @guix/games
|
gnu/packages/emulators\.scm @guix/games
|
||||||
@@ -317,6 +319,7 @@ gnu/packages/tor-browsers\.scm @guix/mozilla
|
|||||||
|
|
||||||
gnu/packages/ocaml\.scm @guix/ocaml
|
gnu/packages/ocaml\.scm @guix/ocaml
|
||||||
gnu/packages/coq\.scm @guix/ocaml
|
gnu/packages/coq\.scm @guix/ocaml
|
||||||
|
gnu/packages/rocq\.scm @guix/ocaml
|
||||||
guix/build/ocaml-build-system\.scm @guix/ocaml
|
guix/build/ocaml-build-system\.scm @guix/ocaml
|
||||||
guix/build/dune-build-system\.scm @guix/ocaml
|
guix/build/dune-build-system\.scm @guix/ocaml
|
||||||
guix/build-system/ocaml\.scm @guix/ocaml
|
guix/build-system/ocaml\.scm @guix/ocaml
|
||||||
@@ -484,6 +487,7 @@ gnu/services/version-control\.scm @guix/vcs
|
|||||||
gnu/tests/version-control\.scm @guix/vcs
|
gnu/tests/version-control\.scm @guix/vcs
|
||||||
guix/build/bzr\.scm @guix/vcs
|
guix/build/bzr\.scm @guix/vcs
|
||||||
guix/build/cvs\.scm @guix/vcs
|
guix/build/cvs\.scm @guix/vcs
|
||||||
|
guix/build/fossil\.scm @guix/vcs
|
||||||
guix/build/git\.scm @guix/vcs
|
guix/build/git\.scm @guix/vcs
|
||||||
guix/build/hg\.scm @guix/vcs
|
guix/build/hg\.scm @guix/vcs
|
||||||
guix/build/svn\.scm @guix/vcs
|
guix/build/svn\.scm @guix/vcs
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ MODULES = \
|
|||||||
guix/discovery.scm \
|
guix/discovery.scm \
|
||||||
guix/android-repo-download.scm \
|
guix/android-repo-download.scm \
|
||||||
guix/bzr-download.scm \
|
guix/bzr-download.scm \
|
||||||
|
guix/fossil-download.scm \
|
||||||
guix/git-download.scm \
|
guix/git-download.scm \
|
||||||
guix/hg-download.scm \
|
guix/hg-download.scm \
|
||||||
guix/hash.scm \
|
guix/hash.scm \
|
||||||
@@ -236,6 +237,7 @@ MODULES = \
|
|||||||
guix/build/asdf-build-system.scm \
|
guix/build/asdf-build-system.scm \
|
||||||
guix/build/bzr.scm \
|
guix/build/bzr.scm \
|
||||||
guix/build/copy-build-system.scm \
|
guix/build/copy-build-system.scm \
|
||||||
|
guix/build/fossil.scm \
|
||||||
guix/build/git.scm \
|
guix/build/git.scm \
|
||||||
guix/build/hg.scm \
|
guix/build/hg.scm \
|
||||||
guix/build/glib-or-gtk-build-system.scm \
|
guix/build/glib-or-gtk-build-system.scm \
|
||||||
|
|||||||
@@ -18,6 +18,10 @@ Please send Guix bug reports to bug-guix@gnu.org.
|
|||||||
** Distribution
|
** Distribution
|
||||||
*** GNOME updated to version 48
|
*** GNOME updated to version 48
|
||||||
*** New service for Fossil SCM
|
*** New service for Fossil SCM
|
||||||
|
*** TeX Live updated to 2026.1
|
||||||
|
|
||||||
|
** Programming interfaces
|
||||||
|
*** New (guix fossil-download) module, for fetching Fossil repositories
|
||||||
|
|
||||||
* Changes in 1.5.0 (since 1.4.0)
|
* Changes in 1.5.0 (since 1.4.0)
|
||||||
** Package management
|
** Package management
|
||||||
|
|||||||
@@ -1667,6 +1667,9 @@ can be turned into a version string via @code{git-version}, for example
|
|||||||
@code{rust-pipewire-0.8.0.fd3d8f7} and @code{rust-pubgrub-0.3.0.b70cf70}.
|
@code{rust-pipewire-0.8.0.fd3d8f7} and @code{rust-pubgrub-0.3.0.b70cf70}.
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
|
When contributing Rust packages, we should have all modifications to these
|
||||||
|
two modules, in the same commit as the package we are contributing.
|
||||||
|
|
||||||
To avoid merge conflicts with changes from multiple branches, these two modules
|
To avoid merge conflicts with changes from multiple branches, these two modules
|
||||||
are maintained by the Rust team (@pxref{Teams}).
|
are maintained by the Rust team (@pxref{Teams}).
|
||||||
|
|
||||||
@@ -1696,6 +1699,68 @@ tree.
|
|||||||
@xref{Packaging Rust Crates,,, guix-cookbook, GNU Guix Cookbook}, for
|
@xref{Packaging Rust Crates,,, guix-cookbook, GNU Guix Cookbook}, for
|
||||||
packaging workflow.
|
packaging workflow.
|
||||||
|
|
||||||
|
@subsubsection Commit messages
|
||||||
|
|
||||||
|
The commit message must have a general brief mention to entry changes
|
||||||
|
in @code{(gnu packages rust-crates)}. For changes in @code{(gnu packages
|
||||||
|
rust-sources)}, the commit message must explicitly mention all changes to the
|
||||||
|
packages.
|
||||||
|
|
||||||
|
Here are some examples for different situations:
|
||||||
|
|
||||||
|
@itemize
|
||||||
|
|
||||||
|
@item
|
||||||
|
Adding a new Rust package:
|
||||||
|
|
||||||
|
@example
|
||||||
|
gnu: Add catppuccin-whiskers.
|
||||||
|
|
||||||
|
* gnu/packages/rust-apps.scm (catppuccin-whiskers): New variable.
|
||||||
|
* gnu/packages/rust-crates.scm (lookup-cargo-inputs)
|
||||||
|
[catppuccin-whiskers]: New entry.
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@item
|
||||||
|
Updating a simple package:
|
||||||
|
|
||||||
|
@example
|
||||||
|
gnu: watchexec: Update to 2.3.2.
|
||||||
|
|
||||||
|
* gnu/packages/rust-apps.scm (watchexec): Update to 2.3.2.
|
||||||
|
* gnu/packages/rust-crates.scm (lookup-cargo-inputs)[watchexec]:
|
||||||
|
Update entry.
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@item
|
||||||
|
Updating a package with sources:
|
||||||
|
|
||||||
|
@example
|
||||||
|
gnu: typst: Update to 0.14.0.
|
||||||
|
|
||||||
|
* gnu/packages/rust-apps.scm (typst): Update to 0.14.0.
|
||||||
|
[arguments]<#:rust>: Use rust-1.88.
|
||||||
|
* gnu/packages/rust-crates.scm (lookup-cargo-inputs)[typst]: Update
|
||||||
|
entry.
|
||||||
|
[rust-syntect-5]: Rename to rust-syntect-5.2.
|
||||||
|
[rust-syntect-5.3]: New entry.
|
||||||
|
* gnu/packages/rust-sources.scm (rust-hypher-0.1): Update to 0.1.6.
|
||||||
|
(rust-syntect-5): Rename to rust-syntect-5.2.
|
||||||
|
[inputs]: Rename cargo-inputs rust-syntect-5 to rust-syntect-5.2.
|
||||||
|
(rust-syntect-5.3): New variable.
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@end itemize
|
||||||
|
|
||||||
|
@subsubsection Resolving merge conflicts in Pull Requests
|
||||||
|
|
||||||
|
For Rust crates, the recommended way to solve merge conflicts is to drop all
|
||||||
|
changes to @code{gnu/packages/rust-crates.scm}, rebase onto the desired branch
|
||||||
|
and run the lockfile importer again, manually adding back all relevant snippets
|
||||||
|
(if any).
|
||||||
|
|
||||||
|
@xref{Common Workflow for Resolving Merge Conflicts on Existing Pull Requests,,, guix-cookbook, GNU Guix Cookbook} for
|
||||||
|
a suggested workflow on resolving merge conflicts.
|
||||||
|
|
||||||
@node Elm Packages
|
@node Elm Packages
|
||||||
@subsection Elm Packages
|
@subsection Elm Packages
|
||||||
@@ -2650,6 +2715,7 @@ applications settings page}, granting read/write access to the
|
|||||||
|
|
||||||
@cindex decision making
|
@cindex decision making
|
||||||
@cindex consensus seeking
|
@cindex consensus seeking
|
||||||
|
Every contribution to the project involves a form of decision making.
|
||||||
It is expected from all contributors, and even more so from committers,
|
It is expected from all contributors, and even more so from committers,
|
||||||
to help build consensus and make decisions based on consensus. By using
|
to help build consensus and make decisions based on consensus. By using
|
||||||
consensus, we are committed to finding solutions that everyone can live
|
consensus, we are committed to finding solutions that everyone can live
|
||||||
@@ -2664,6 +2730,26 @@ resolve the deadlock. To learn what consensus decision making means and
|
|||||||
understand its finer details, you are encouraged to read
|
understand its finer details, you are encouraged to read
|
||||||
@url{https://www.seedsforchange.org.uk/consensus}.
|
@url{https://www.seedsforchange.org.uk/consensus}.
|
||||||
|
|
||||||
|
Day-to-day decision making, for instance discussions about pull requests
|
||||||
|
(@pxref{Reviewing the Work of Others}), happens informally among
|
||||||
|
interested parties such as contributors and members of the relevant
|
||||||
|
teams (@pxref{Teams}).
|
||||||
|
|
||||||
|
@cindex GCD, Guix Consensus Documents
|
||||||
|
@cindex Guix Consensus Documents (GCD)
|
||||||
|
Decisions that are expected to have an impact on most contributors
|
||||||
|
and/or on the broader user community---e.g., changes to project-wide
|
||||||
|
policies, to core functionality, and so on---are made following the
|
||||||
|
@acronym{GCD, Guix Consensus Document} process. The process provides a
|
||||||
|
framework to formalize proposals and draw attention to them, to leave
|
||||||
|
time for interested parties to discuss them, and to collectively accept
|
||||||
|
or withdraw them based on input from participating team members. It is
|
||||||
|
defined in
|
||||||
|
@uref{https://consensus.guix.gnu.org/gcd/001-gcd-process.html,
|
||||||
|
GCD@tie{}001}. Past GCDs can be seen at
|
||||||
|
@uref{https://consensus.guix.gnu.org}, and discussions take place at
|
||||||
|
@uref{https://codeberg.org/guix/guix-consensus-documents}.
|
||||||
|
|
||||||
@node Commit Access
|
@node Commit Access
|
||||||
@section Commit Access
|
@section Commit Access
|
||||||
|
|
||||||
|
|||||||
@@ -146,6 +146,8 @@ Packaging Rust Crates
|
|||||||
* Common Workflow for Rust Packaging::
|
* Common Workflow for Rust Packaging::
|
||||||
* Cargo Workspaces and Development Snapshots::
|
* Cargo Workspaces and Development Snapshots::
|
||||||
* Using Rust Libraries in Other Build Systems::
|
* Using Rust Libraries in Other Build Systems::
|
||||||
|
* Common Workflow for Updating Existing Rust Packages::
|
||||||
|
* Common Workflow for Resolving Merge Conflicts on Existing Pull Requests::
|
||||||
|
|
||||||
System Configuration
|
System Configuration
|
||||||
|
|
||||||
@@ -1647,6 +1649,8 @@ $ guix shell rust rust:cargo cargo-audit cargo-license
|
|||||||
* Common Workflow for Rust Packaging::
|
* Common Workflow for Rust Packaging::
|
||||||
* Cargo Workspaces and Development Snapshots::
|
* Cargo Workspaces and Development Snapshots::
|
||||||
* Using Rust Libraries in Other Build Systems::
|
* Using Rust Libraries in Other Build Systems::
|
||||||
|
* Common Workflow for Updating Existing Rust Packages::
|
||||||
|
* Common Workflow for Resolving Merge Conflicts on Existing Pull Requests::
|
||||||
@end menu
|
@end menu
|
||||||
|
|
||||||
@node Common Workflow for Rust Packaging
|
@node Common Workflow for Rust Packaging
|
||||||
@@ -1705,6 +1709,15 @@ $ cargo audit
|
|||||||
$ cargo license
|
$ cargo license
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
Before running @command{cargo generate-lockfile}, make sure you have checked
|
||||||
|
out the correct tag for the version you are packaging. This ensures that
|
||||||
|
@code{Cargo.toml} matches the file used in the packages's @code{source} field.
|
||||||
|
To make sure, you can obtain the exact source with @command{./pre-inst-env guix
|
||||||
|
build --source <package>} and only then run @command{cargo generate-lockfile} on
|
||||||
|
that source tree.
|
||||||
|
@end quotation
|
||||||
|
|
||||||
@command{cargo generate-lockfile} updates dependencies to compatible versions.
|
@command{cargo generate-lockfile} updates dependencies to compatible versions.
|
||||||
Applying it to all Rust applications helps reduce a great number of Rust
|
Applying it to all Rust applications helps reduce a great number of Rust
|
||||||
libraries we need to check later. Although sometimes libraries may fail to
|
libraries we need to check later. Although sometimes libraries may fail to
|
||||||
@@ -1987,6 +2000,316 @@ method, one of the most popular choices for Traditional Chinese users.")
|
|||||||
(license license:lgpl2.1+)))
|
(license license:lgpl2.1+)))
|
||||||
@end lisp
|
@end lisp
|
||||||
|
|
||||||
|
@node Common Workflow for Updating Existing Rust Packages
|
||||||
|
@subsubsection Common Workflow for Updating Existing Rust Packages
|
||||||
|
|
||||||
|
For this example, we'll update @code{niri}. The package definition looks like
|
||||||
|
this initially:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(define-public niri
|
||||||
|
(package
|
||||||
|
(name "niri")
|
||||||
|
(version "25.08")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/YaLTeR/niri")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"09nsxd211mly8r1ys2lq6ia4jxgb980h1axrbgw748r0knfbbj7n"))))
|
||||||
|
(build-system cargo-build-system)
|
||||||
|
...
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
We start by running the usual @command{guix refresh -u niri}.
|
||||||
|
|
||||||
|
The @command{-u} flag will update in place the version and hash for the
|
||||||
|
@code{niri} package.
|
||||||
|
|
||||||
|
The package definition will then look like this:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(define-public niri
|
||||||
|
(package
|
||||||
|
(name "niri")
|
||||||
|
(version "25.11")
|
||||||
|
(source (origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/YaLTeR/niri")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0752qm245wc2gak0jhp0fnr0rdj3z54m2h97k3cxbjym9pcn658n"))))
|
||||||
|
(build-system cargo-build-system)
|
||||||
|
...
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
This means the source field was updated successfully, thus we can now proceed to
|
||||||
|
get the updated source with @command{guix build --source niri} as follows:
|
||||||
|
|
||||||
|
@example shell
|
||||||
|
$ cp -r $(./pre-inst-env guix build --source niri) /tmp
|
||||||
|
$ cd /tmp/<hash>-niri-25.11-checkout/
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
In this specific example, the source is a git checkout, thus a directory. If the
|
||||||
|
package source is a compressed archive, you would at this point extract it to a
|
||||||
|
directory to proceed.
|
||||||
|
@end quotation
|
||||||
|
|
||||||
|
Now, given that we have access to the @code{Cargo.toml} file, we can now run
|
||||||
|
the following inside the checkout:
|
||||||
|
|
||||||
|
@example shell
|
||||||
|
$ guix shell rust rust:cargo -- cargo generate-lockfile
|
||||||
|
$ guix shell rust rust:cargo -- cargo audit
|
||||||
|
$ guix shell rust rust:cargo -- cargo license
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
Sometimes the package will require a more up-to-date version of rust, that is
|
||||||
|
not yet the default rust on guix. For these cases you can use:
|
||||||
|
@example shell
|
||||||
|
$ guix shell -e "(@ (gnu packages rust) rust-1.90)" \
|
||||||
|
-e '`(,(@ (gnu packages rust) rust-1.90) "cargo")'
|
||||||
|
@end example
|
||||||
|
@end quotation
|
||||||
|
|
||||||
|
The first command will ensure that all cargo dependencies are up to date
|
||||||
|
and semver compatible, while also providing some other benefits, as further
|
||||||
|
explained in @ref{Common Workflow for Rust Packaging}.
|
||||||
|
|
||||||
|
The following command will warn if there are any known vulnerabilities in the
|
||||||
|
crates being imported. The last one will output the license information of all
|
||||||
|
the dependent crates.
|
||||||
|
|
||||||
|
If everything looks good, we can now replace the contents of the @code{niri}
|
||||||
|
indentifier, located inside the @code{lookup-cargo-inputs} variable on the
|
||||||
|
bottom of the @file{gnu/packages/rust-crates.scm} module, with the newer updated
|
||||||
|
crates by running the importer on the lockfile as follows:
|
||||||
|
|
||||||
|
@example shell
|
||||||
|
$ guix import -i /path/to/gnu/packages/rust-crates.scm \
|
||||||
|
crate -f Cargo.lock niri
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
For the purpose of contributing a package to Guix (@pxref{Contributing,,,
|
||||||
|
guix, GNU Guix Reference Manual}), there is no need to cleanup the leftover
|
||||||
|
crates as a result of the package update. This is tasked to the rust-team
|
||||||
|
(@pxref{Teams,,, guix, GNU Guix Reference Manual}) to periodically run a
|
||||||
|
convenient script in @code{etc/teams/rust} to cleanup unused crates from
|
||||||
|
@file{gnu/packages/rust-crates.scm}.
|
||||||
|
@end quotation
|
||||||
|
|
||||||
|
We then need to check whether the importer has placed some TODOs for us,
|
||||||
|
inside @file{gnu/packages/rust-crates.scm} (you can use @command{git diff --
|
||||||
|
gnu/packages/rust-crates.scm} for this purpose).
|
||||||
|
|
||||||
|
There are a few types of TODO messages that you might encounter during this
|
||||||
|
step, each type requiring you to perform a different action.
|
||||||
|
|
||||||
|
The first one we encounter in our example is:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(define rust-libdisplay-info-sys-0.3.0
|
||||||
|
;; TODO REVIEW: Check bundled sources.
|
||||||
|
(crate-source "libdisplay-info-sys" "0.3.0"
|
||||||
|
"07xmkc2aqcdn6d58321y87rd3gzdr4nx3ncm1mmrr7w1p1ahsn96"))
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
This specific TODO message tells us that there is a high probability of
|
||||||
|
encountering bundled sources within a crate definition generated by the
|
||||||
|
importer.
|
||||||
|
|
||||||
|
We then check if there are any bundled sources within the
|
||||||
|
@code{rust-libdisplay-info-sys-0.3.0} crate. Since there are none (in our
|
||||||
|
example), we can simply remove the TODO line, and continue to the next TODO.
|
||||||
|
|
||||||
|
If there were any bundled sources inside the crate, we would have to patch
|
||||||
|
it with a snippet, in order to unbundle it. You can see some examples on
|
||||||
|
how to unbundle inside @file{gnu/packages/rust-crates.scm} (search for the
|
||||||
|
@code{#:snippet} keyword).
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
If the unbundle is considered too difficult to be executed (e.g. the effort
|
||||||
|
needed to unbundle is unreasonable), the @code{TODO REVIEW} line should be
|
||||||
|
converted to a regular TODO comment explicitly stating the unbundle was not done
|
||||||
|
(e.g. @code{TODO: Unbundle rust-libdisplay-info-sys.}).
|
||||||
|
@end quotation
|
||||||
|
|
||||||
|
Continuing, another TODO message we encounter in this example is the following:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(define rust-smithay-0.7.0.d743e1a
|
||||||
|
;; TODO REVIEW: Define standalone package if this is a workspace.
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference (url "https://github.com/Smithay/smithay.git")
|
||||||
|
(commit "d743e1a317fa0f01d1c4cadd96d277a1ec7b59d9")))
|
||||||
|
(file-name (git-file-name "rust-smithay" "0.7.0.d743e1a"))
|
||||||
|
(sha256 (base32 "11327mhxxf844bs0v5bw1g9bzjssnzhidsissywy6kwng16x727v"))))
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
This specific TODO message tells us that there is a high probability of the
|
||||||
|
@code{rust-smithay-0.7.0.d743e1a} crate being a workspace.
|
||||||
|
|
||||||
|
After verifying that it is indeed a workspace, we now need to make it an
|
||||||
|
actual package in @file{gnu/packages/rust-sources.scm}, referencing it in the
|
||||||
|
crate-source definition (see @ref{Common Workflow for Rust Packaging} for more
|
||||||
|
details).
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
You can verify if a crate is a workspace by cloning the crate repository (in
|
||||||
|
this case @code{https://github.com/Smithay/smithay.git}), checking out the
|
||||||
|
specific revision (in this case @command{git checkout d743e1a}), and looking
|
||||||
|
for @code{[workspace]} in its main @file{Cargo.toml} file. If it does not have a
|
||||||
|
TOML @code{[workspace]} section, then it is not a workspace.
|
||||||
|
@end quotation
|
||||||
|
|
||||||
|
After defining the separate source package for the workspace in
|
||||||
|
@file{gnu/packages/rust-sources.scm} (see @ref{Common Workflow for Rust
|
||||||
|
Packaging} for more details on how to do this), the crate definition for
|
||||||
|
@code{rust-smithay-0.7.0.d743e1a} would then become the following (notice we
|
||||||
|
also remove the TODO line):
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(define rust-smithay-0.7.0.d743e1a package:rust-smithay-0.7.0.d743e1a)
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
If @code{rust-smithay-0.7.0.d743e1a} was not a workspace, we would simply remove
|
||||||
|
the TODO line and move on.
|
||||||
|
|
||||||
|
We then try to build the package with @command{guix build niri}, and make sure
|
||||||
|
whether it builds successfully, which it does.
|
||||||
|
|
||||||
|
As a good practice, we can further check the output of the
|
||||||
|
@code{check-for-pregenerated-files} phase to ensure there are no extraneous
|
||||||
|
pregenerated files inside the crates. If there are any, it is important to
|
||||||
|
snippet them out, like these:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(define rust-winapi-x86-64-pc-windows-gnu-0.4.0
|
||||||
|
(crate-source "winapi-x86_64-pc-windows-gnu" "0.4.0"
|
||||||
|
"0gqq64czqb64kskjryj8isp62m2sgvx25yyj3kpc2myh85w24bki"
|
||||||
|
#:snippet '(delete-file-recursively "lib")))
|
||||||
|
|
||||||
|
(define rust-flate2-1.1.4
|
||||||
|
(crate-source "flate2" "1.1.4"
|
||||||
|
"1a8a3pk2r2dxays4ikc47ygydhpd1dcxlgqdi3r9kiiq9rb4wnnw"
|
||||||
|
#:snippet '(for-each delete-file-recursively '("examples" "tests"))))
|
||||||
|
|
||||||
|
(define rust-flo-curves-0.3.1
|
||||||
|
(crate-source "flo_curves" "0.3.1"
|
||||||
|
"16x293dp8825jh465kgms4yyvl4960j26gh37h3skflq9zxpy8hw"
|
||||||
|
#:snippet '(for-each delete-file '("logo-small.png" "logo.png"))))
|
||||||
|
|
||||||
|
(define rust-interception-sys-0.1.3
|
||||||
|
(crate-source "interception-sys" "0.1.3"
|
||||||
|
"1lgwbml7gzq5a5rriy708w68gx6yiw9cdg7xy2c5vsrrck7pbs5b"
|
||||||
|
#:snippet '(for-each delete-file (find-files "." "\\.(dll|lib)$"))))
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
@node Common Workflow for Resolving Merge Conflicts on Existing Pull Requests
|
||||||
|
@subsubsection Common Workflow for Resolving Merge Conflicts on Existing Pull Requests
|
||||||
|
|
||||||
|
Whenever a Rust package change is merged into our target branch from a different
|
||||||
|
Pull Request, we often encounter many merge conflicts in @code{(gnu packages
|
||||||
|
rust-crates)} when rebasing the Pull Request on top of the target branch. Since
|
||||||
|
we should avoid modifying the rust-crates file manually (e.g. using the git
|
||||||
|
interface to solve merge conflicts), it is recommended (and often much faster)
|
||||||
|
to drop all changes to @code{(gnu packages rust-crates)} and run the lockfile
|
||||||
|
importer once again, manually adding back all the manual changes.
|
||||||
|
|
||||||
|
This workflow describes one of many ways to do the described procedure.
|
||||||
|
|
||||||
|
In this example we'll update the @code{codeberg-cli} package, which has produced
|
||||||
|
some merge conflicts in @file{gnu/packages/rust-crates.scm} when we tried a git
|
||||||
|
pull rebase.
|
||||||
|
|
||||||
|
Before starting, make sure we're not in a rebase environment, by aborting the
|
||||||
|
rebase we tried previously (the one which created the merge conflicts by git
|
||||||
|
pulling):
|
||||||
|
|
||||||
|
@example
|
||||||
|
$ git rebase --abort
|
||||||
|
@end example
|
||||||
|
|
||||||
|
@cindex git rebase --interactive
|
||||||
|
@cindex interactive rebase
|
||||||
|
To begin, we interactively rebase our PR branch by marking as
|
||||||
|
@code{edit} the commit we want to edit, which is the one containing the
|
||||||
|
@file{gnu/packages/rust-crates.scm} changes:
|
||||||
|
|
||||||
|
@example
|
||||||
|
# Change 1 to the number of relevant commits
|
||||||
|
$ git rebase -i HEAD~1
|
||||||
|
@end example
|
||||||
|
|
||||||
|
In our example, we would mark the @code{codeberg-cli} commit like so:
|
||||||
|
|
||||||
|
@example
|
||||||
|
edit 6ef4f1ad043 # gnu: codeberg-cli: Update to 0.5.4.
|
||||||
|
@end example
|
||||||
|
|
||||||
|
After that, we'll be in rebase mode, where we can restore the changes made to
|
||||||
|
@file{gnu/packages/rust-crates.scm}:
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
Notice that we will lose all manual changes we have previously made to
|
||||||
|
@file{gnu/packages/rust-crates.scm} (e.g. snippets, deleting TODO comments,
|
||||||
|
if there were any). We'll need to manually add them back after we run the guix
|
||||||
|
lockfile importer once again, so make sure you have them saved somewhere, for
|
||||||
|
example in your PR link under the @code{Files changed} tab.
|
||||||
|
@end quotation
|
||||||
|
|
||||||
|
@example
|
||||||
|
$ git restore --source=HEAD~ gnu/packages/rust-crates.scm
|
||||||
|
@end example
|
||||||
|
|
||||||
|
Having restored the file, we can stage the changes, commit, finish the rebase
|
||||||
|
and pull rebase from the target branch:
|
||||||
|
|
||||||
|
@example
|
||||||
|
$ git add gnu/packages/rust-crates.scm
|
||||||
|
$ git commit --amend --no-edit
|
||||||
|
$ git rebase --continue
|
||||||
|
$ git pull <remote> <target branch>
|
||||||
|
@end example
|
||||||
|
|
||||||
|
We then proceed to run the guix lockfile importer:
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
Remember to checkout the correct tag you're packaging in the package repository
|
||||||
|
checkout. Don't forget to run @code{cargo generate-lockfile} before running
|
||||||
|
the lockfile importer, see @ref{Common Workflow for Rust Packaging} for more
|
||||||
|
detailed steps on what to do before running the guix lockfile importer.
|
||||||
|
@end quotation
|
||||||
|
|
||||||
|
@example
|
||||||
|
$ guix import --insert=gnu/packages/rust-crates.scm \
|
||||||
|
crate --lockfile=/path/to/Cargo.lock codeberg-cli
|
||||||
|
@end example
|
||||||
|
|
||||||
|
Now is the time we manually add back the snippets and remove the relevant TODOs
|
||||||
|
we have already checked (if there are any).
|
||||||
|
|
||||||
|
After running the lockfile importer and checking if there are any changes to
|
||||||
|
manually add back, we can finally:
|
||||||
|
|
||||||
|
@example
|
||||||
|
$ git add gnu/packages/rust-crates.scm
|
||||||
|
# Our target commit is the last one:
|
||||||
|
$ git commit --amend --no-edit
|
||||||
|
@end example
|
||||||
|
|
||||||
|
We now have a non-conflicting tree, from which we can now update our PR with.
|
||||||
|
|
||||||
@c *********************************************************************
|
@c *********************************************************************
|
||||||
@node System Configuration
|
@node System Configuration
|
||||||
|
|||||||
+159
-12
@@ -8737,6 +8737,52 @@ The example below denotes a version of gnu-standards to fetch:
|
|||||||
|
|
||||||
@end deftp
|
@end deftp
|
||||||
|
|
||||||
|
For Fossil repositories, the module @code{(guix fossil-download)} defines
|
||||||
|
the @code{fossil-fetch} origin method and @code{fossil-reference} data type
|
||||||
|
for support of the Fossil @abbr{SCM, software configuration management} system.
|
||||||
|
|
||||||
|
@deffn {Procedure} fossil-fetch ref hash-algo hash [name]
|
||||||
|
Return a fixed-output derivation that fetches @var{ref}, a
|
||||||
|
@code{<fossil-reference>} object. The output is expected to have recursive
|
||||||
|
hash @var{hash} of type @var{hash-algo} (a symbol). Use @var{name} as
|
||||||
|
the file name, or a generic name if @code{#f}.
|
||||||
|
@end deffn
|
||||||
|
|
||||||
|
@deftp {Data Type} fossil-reference
|
||||||
|
This data type represents a Fossil reference
|
||||||
|
for @code{fossil-fetch} to retrieve.
|
||||||
|
|
||||||
|
@table @asis
|
||||||
|
@item @code{uri} (type: string)
|
||||||
|
The URI of a Fossil repository to clone, in one of the following forms,
|
||||||
|
in which @code{[...]} denotes optional elements:
|
||||||
|
|
||||||
|
@table @code
|
||||||
|
@item http[s]://[userid[:password]@@]host[:port][/path]
|
||||||
|
A HTTP/HTTPS URL.
|
||||||
|
@item [file://]path/to/repo.fossil
|
||||||
|
A file URI, where the path must have an extra leading @code{/}
|
||||||
|
to use an absolute path (without the URI scheme, the repository
|
||||||
|
is opened directly without cloning).
|
||||||
|
@end table
|
||||||
|
|
||||||
|
@item @code{check-in} (type: string)
|
||||||
|
A @url{https://fossil-scm.org/home/doc/trunk/www/checkin_names.wiki,
|
||||||
|
name of the check-in} to fetch, e.g.@: its canonical hexadecimal identifier,
|
||||||
|
associated tag and/or timestamp.
|
||||||
|
@end table
|
||||||
|
|
||||||
|
The example below denotes the @code{version-3.51.1} tag
|
||||||
|
of the SQLite repository:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(fossil-reference
|
||||||
|
(uri "https://sqlite.org/src")
|
||||||
|
(check-in "version-3.51.1"))
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
@end deftp
|
||||||
|
|
||||||
@node Defining Package Variants
|
@node Defining Package Variants
|
||||||
@section Defining Package Variants
|
@section Defining Package Variants
|
||||||
|
|
||||||
@@ -8797,12 +8843,12 @@ dependencies than the original package. For example, the default
|
|||||||
optional dependency, you can define a variant that removes that
|
optional dependency, you can define a variant that removes that
|
||||||
dependency like so:
|
dependency like so:
|
||||||
|
|
||||||
|
@findex package/inherit
|
||||||
@lisp
|
@lisp
|
||||||
(use-modules (gnu packages gdb)) ;for 'gdb'
|
(use-modules (gnu packages gdb)) ;for 'gdb'
|
||||||
|
|
||||||
(define gdb-sans-guile
|
(define gdb-sans-guile
|
||||||
(package
|
(package/inherit gdb
|
||||||
(inherit gdb)
|
|
||||||
(inputs (modify-inputs inputs
|
(inputs (modify-inputs inputs
|
||||||
(delete "guile")))))
|
(delete "guile")))))
|
||||||
@end lisp
|
@end lisp
|
||||||
@@ -8810,6 +8856,23 @@ dependency like so:
|
|||||||
In the body of the @code{inputs} field above, @code{inputs} is bound to
|
In the body of the @code{inputs} field above, @code{inputs} is bound to
|
||||||
the inherited value. Thus, the @code{modify-inputs} form above removes
|
the inherited value. Thus, the @code{modify-inputs} form above removes
|
||||||
the @code{"guile"} package from the @code{inputs} field of @code{gdb}.
|
the @code{"guile"} package from the @code{inputs} field of @code{gdb}.
|
||||||
|
|
||||||
|
@quotation Note
|
||||||
|
The example above uses @code{(package/inherit gdb @dots{})} instead of
|
||||||
|
the usual @code{(package (inherit gdb) @dots{})}. While the latter
|
||||||
|
would work, @code{package/inherit} does extra work: if @code{gdb} has a
|
||||||
|
@code{replacement} field (@pxref{Security Updates}),
|
||||||
|
@code{package/inherit} propagates the @code{inputs} changes of this
|
||||||
|
variant to the replacement.
|
||||||
|
|
||||||
|
In other words, @code{package/inherit} ensures the variant gets a
|
||||||
|
consistent @code{replacement} when the original package has one. Thus,
|
||||||
|
one should generally use @code{package/inherit} when creating a variant
|
||||||
|
for the same version, but not when targeting a different version, as in
|
||||||
|
the @code{hello} example we saw earlier, where the replacement may be
|
||||||
|
incorrect.
|
||||||
|
@end quotation
|
||||||
|
|
||||||
The @code{modify-inputs} macro is a helper that can prove useful anytime
|
The @code{modify-inputs} macro is a helper that can prove useful anytime
|
||||||
you want to remove, add, or replace package inputs.
|
you want to remove, add, or replace package inputs.
|
||||||
|
|
||||||
@@ -15488,7 +15551,7 @@ gnu/packages/qt.scm:452:13: qtbase would be upgraded from 5.15.8 to 5.15.10
|
|||||||
@end example
|
@end example
|
||||||
|
|
||||||
@cindex partial version specification, guix refresh
|
@cindex partial version specification, guix refresh
|
||||||
A per-package equivalent to --target-version is made available by
|
A per-package equivalent to @option{--target-version} is made available by
|
||||||
prefixing the version specification with the @samp{~} (tilde) character.
|
prefixing the version specification with the @samp{~} (tilde) character.
|
||||||
For example:
|
For example:
|
||||||
|
|
||||||
@@ -16049,7 +16112,7 @@ it unchanged.
|
|||||||
@item git-source
|
@item git-source
|
||||||
If the @code{home-page} is a Git repository (as per
|
If the @code{home-page} is a Git repository (as per
|
||||||
@code{git-repository-url?}), and the actual Git repository is tagged
|
@code{git-repository-url?}), and the actual Git repository is tagged
|
||||||
with @code{version} or @code{(string-append ``v'' version)}, change the
|
with a version string, possibly prefixed by ``v'', change the
|
||||||
package origin to the @code{git-fetch} method
|
package origin to the @code{git-fetch} method
|
||||||
(@pxref{origin Reference}). Consider this example:
|
(@pxref{origin Reference}). Consider this example:
|
||||||
|
|
||||||
@@ -16078,14 +16141,16 @@ its @code{source} field like to:
|
|||||||
(inherit guile-json-3)
|
(inherit guile-json-3)
|
||||||
(name "guile-json")
|
(name "guile-json")
|
||||||
(version "4.7.3")
|
(version "4.7.3")
|
||||||
(source (origin
|
(source
|
||||||
(method git-fetch)
|
(origin
|
||||||
(uri (git-reference (url
|
(method git-fetch)
|
||||||
"https://github.com/aconchillo/guile-json")
|
(uri (git-reference
|
||||||
(commit version)))
|
(url "https://github.com/aconchillo/guile-json")
|
||||||
(file-name (git-file-name name version))
|
(commit version)))
|
||||||
(sha256 (base32
|
(file-name (git-file-name name version))
|
||||||
"0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
|
||||||
@end lisp
|
@end lisp
|
||||||
|
|
||||||
@end table
|
@end table
|
||||||
@@ -27202,6 +27267,28 @@ Package object for GVfs.
|
|||||||
@end table
|
@end table
|
||||||
@end deftp
|
@end deftp
|
||||||
|
|
||||||
|
@defvar kmonad-service-type
|
||||||
|
This is the type of the service that runs
|
||||||
|
@uref{https://github.com/kmonad/kmonad, KMonad}. Its value is a
|
||||||
|
@code{kmonad-configuration} object. This service allows spawning
|
||||||
|
@command{kmonad} configurations to manage keyboards.
|
||||||
|
|
||||||
|
@deftp {Data Type} kmonad-configuration
|
||||||
|
Configuration record for the KMonad service.
|
||||||
|
|
||||||
|
@table @asis
|
||||||
|
@item @code{kmonad} (default: @code{kmonad})
|
||||||
|
The KMonad package to use.
|
||||||
|
|
||||||
|
@item @code{keymaps}
|
||||||
|
A list of files with KMonad configurations. One shepherd service will be
|
||||||
|
created to control each configuration. Each configuration should target
|
||||||
|
a distinct input device as KMonad operates on a per-input basis.
|
||||||
|
|
||||||
|
@end table
|
||||||
|
@end deftp
|
||||||
|
@end defvar
|
||||||
|
|
||||||
@defvar colord-service-type
|
@defvar colord-service-type
|
||||||
This is the type of the service that runs @command{colord}, a system
|
This is the type of the service that runs @command{colord}, a system
|
||||||
service with a D-Bus
|
service with a D-Bus
|
||||||
@@ -51663,6 +51750,63 @@ phone-number = 0
|
|||||||
is-married = true
|
is-married = true
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
|
@subsubsection Serializing to environment variables
|
||||||
|
@cindex environment variables, serialization of configuration records
|
||||||
|
|
||||||
|
There are services which expect their configuration as environment variables.
|
||||||
|
The @code{(gnu services configuration environment-variables)} module provides
|
||||||
|
facilities to serialize configuration records from
|
||||||
|
@code{(gnu services configuration)} to list of pairs representing environment
|
||||||
|
variables.
|
||||||
|
|
||||||
|
For example this configuration record:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(define-configuration/no-serialization server
|
||||||
|
(ssh-port
|
||||||
|
(number 22)
|
||||||
|
"The public SSH port of the server.")
|
||||||
|
(fqdn
|
||||||
|
(maybe-string)
|
||||||
|
"The fully qualified domain name of the server.")
|
||||||
|
(active?
|
||||||
|
(boolean #f)
|
||||||
|
"Whether or not the server should be activated."))
|
||||||
|
|
||||||
|
(define my-server
|
||||||
|
(server
|
||||||
|
(ssh-port 20022)
|
||||||
|
(active? #t)))
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
with this call:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
(serialize-environment-variables my-server server-fields
|
||||||
|
#:true-value "1"
|
||||||
|
#:false-value "0")
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
would yield:
|
||||||
|
|
||||||
|
@lisp
|
||||||
|
'(("SSH_PORT" . "20022")
|
||||||
|
("ACTIVE" . "1"))
|
||||||
|
@end lisp
|
||||||
|
|
||||||
|
@anchor{serialize-environment-variables-procedure}
|
||||||
|
@deffn {Procedure} serialize-environment-variables @var{config} @var{fields} @
|
||||||
|
[@var{selection} #f] [@var{negate?} #f] [#:prefix #f] @
|
||||||
|
[#:true-value "true"] [#:false-value "false"]
|
||||||
|
Serializes the fields whose name is included in SELECTION from CONFIG, a
|
||||||
|
configuration from @code{(gnu services configuration)}, and FIELDS, the
|
||||||
|
list of its field records, to a list of pairs. When NEGATE? is #t all services
|
||||||
|
not included in SELECTION will be serialized. Each pair represents an
|
||||||
|
environment variable. The first element of each pair is the variable name, the
|
||||||
|
second is the value. When PREFIX is a string it is prepended to the variable
|
||||||
|
name. TRUE-VALUE and FALSE-VALUE will be used as a representation for
|
||||||
|
respectfully @code{#t} and @code{#f}.
|
||||||
|
@end deffn
|
||||||
|
|
||||||
@c *********************************************************************
|
@c *********************************************************************
|
||||||
@cindex troubleshooting, Guix System
|
@cindex troubleshooting, Guix System
|
||||||
@@ -53405,6 +53549,9 @@ Maximum time a cache entry for SSH keys is valid, in seconds.
|
|||||||
@item @code{extra-content} (default: @code{""}) (type: raw-configuration-string)
|
@item @code{extra-content} (default: @code{""}) (type: raw-configuration-string)
|
||||||
Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}.
|
Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}.
|
||||||
|
|
||||||
|
@item @code{shepherd-requirement} (default: @code{'()}) (type: list-of-symbols)
|
||||||
|
List of services that should be started before this service.
|
||||||
|
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
@end deftp
|
@end deftp
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ exec $pre_inst_env_maybe guix repl -- "$0" "$@"
|
|||||||
;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
|
;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
|
||||||
;;; Copyright © 2025-2026 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2025-2026 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2025 jgart <jgart@dismail.de>
|
;;; Copyright © 2025 jgart <jgart@dismail.de>
|
||||||
|
;;; Copyright © 2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -565,6 +566,7 @@ challenges"))
|
|||||||
"guix/docker.scm"
|
"guix/docker.scm"
|
||||||
"guix/download.scm"
|
"guix/download.scm"
|
||||||
"guix/elf.scm"
|
"guix/elf.scm"
|
||||||
|
"guix/fossil-download.scm"
|
||||||
"guix/ftp-client.scm"
|
"guix/ftp-client.scm"
|
||||||
"guix/gexp.scm"
|
"guix/gexp.scm"
|
||||||
"guix/git-authenticate.scm"
|
"guix/git-authenticate.scm"
|
||||||
@@ -689,6 +691,7 @@ ecosystem."
|
|||||||
(team 'embedded
|
(team 'embedded
|
||||||
#:name "Embedded"
|
#:name "Embedded"
|
||||||
#:scope (list "gnu/packages/bootloaders.scm"
|
#:scope (list "gnu/packages/bootloaders.scm"
|
||||||
|
"gnu/packages/coreboot.scm"
|
||||||
"gnu/packages/firmware.scm")))
|
"gnu/packages/firmware.scm")))
|
||||||
|
|
||||||
(define-team games
|
(define-team games
|
||||||
@@ -942,6 +945,7 @@ importer, and the ocaml-build-system."
|
|||||||
#:scope
|
#:scope
|
||||||
(list "gnu/packages/ocaml.scm"
|
(list "gnu/packages/ocaml.scm"
|
||||||
"gnu/packages/coq.scm"
|
"gnu/packages/coq.scm"
|
||||||
|
"gnu/packages/rocq.scm"
|
||||||
"guix/build/ocaml-build-system.scm"
|
"guix/build/ocaml-build-system.scm"
|
||||||
"guix/build/dune-build-system.scm"
|
"guix/build/dune-build-system.scm"
|
||||||
"guix/build-system/ocaml.scm"
|
"guix/build-system/ocaml.scm"
|
||||||
@@ -1214,6 +1218,7 @@ the \"texlive\" importer."
|
|||||||
"gnu/tests/version-control.scm"
|
"gnu/tests/version-control.scm"
|
||||||
"guix/build/bzr.scm"
|
"guix/build/bzr.scm"
|
||||||
"guix/build/cvs.scm"
|
"guix/build/cvs.scm"
|
||||||
|
"guix/build/fossil.scm"
|
||||||
"guix/build/git.scm"
|
"guix/build/git.scm"
|
||||||
"guix/build/hg.scm"
|
"guix/build/hg.scm"
|
||||||
"guix/build/svn.scm")))
|
"guix/build/svn.scm")))
|
||||||
@@ -1244,6 +1249,11 @@ the \"texlive\" importer."
|
|||||||
"jonsger")
|
"jonsger")
|
||||||
mozilla)
|
mozilla)
|
||||||
|
|
||||||
|
(define-member (person "Denis Carikli"
|
||||||
|
"GNUtoo@cyberdimension.org"
|
||||||
|
"GNUtoo")
|
||||||
|
embedded)
|
||||||
|
|
||||||
(define-member (person "Ludovic Courtès"
|
(define-member (person "Ludovic Courtès"
|
||||||
"ludo@gnu.org"
|
"ludo@gnu.org"
|
||||||
"civodul")
|
"civodul")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env -S gawk -f
|
#!/usr/bin/env -S gawk -f
|
||||||
# GNU Guix --- Functional package management for GNU
|
# GNU Guix --- Functional package management for GNU
|
||||||
# Copyright © 2025 Efraim Flashner <efraim@flashner.co.il>
|
# Copyright © 2025, 2026 Efraim Flashner <efraim@flashner.co.il>
|
||||||
#
|
#
|
||||||
# This file is part of GNU Guix.
|
# This file is part of GNU Guix.
|
||||||
#
|
#
|
||||||
@@ -21,20 +21,22 @@
|
|||||||
# ./etc/teams/rust/audit-rust-crates ./path/to/file.scm
|
# ./etc/teams/rust/audit-rust-crates ./path/to/file.scm
|
||||||
# Prints the output of cargo-audit to the shell.
|
# Prints the output of cargo-audit to the shell.
|
||||||
|
|
||||||
# Make sure we have cargo-audit in our PATH
|
|
||||||
BEGIN {
|
BEGIN {
|
||||||
if (system("which cargo-audit 1> /dev/null"))
|
"which cargo-audit" | getline cargoAudit
|
||||||
exit 1;
|
close("which cargo-audit")
|
||||||
|
cargoAudit = cargoAudit " audit --file -"
|
||||||
|
|
||||||
# Parse a record at a time.
|
# Parse a record at a time.
|
||||||
RS = "\n\n"
|
RS = "\n\n"
|
||||||
cargoAudit = "cargo-audit audit --file -"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Check the crate-source origin-only inputs
|
# Check the crate-source origin-only inputs, like in rust-crates.scm
|
||||||
/crate-source/ {
|
/crate-source/ {
|
||||||
for(i=3; i <= NF-2; i++) {
|
for(i=3; i <= NF-2; i++) {
|
||||||
if($i == "(crate-source") {
|
if($i == "(crate-source") {
|
||||||
cargoLock = cargoLock "[[package]]\nname = " $(i+1) "\nversion = " $(i+2) "\n"
|
crateName = $(i+1)
|
||||||
|
crateVersion = $(i+2)
|
||||||
|
cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\n"
|
||||||
next
|
next
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -44,27 +46,64 @@ BEGIN {
|
|||||||
/crate-uri/ {
|
/crate-uri/ {
|
||||||
for(i=3; i <= NF; i++) {
|
for(i=3; i <= NF; i++) {
|
||||||
if($i == "(version")
|
if($i == "(version")
|
||||||
crateVersion = $(i+1)
|
crateVersion = $(i+1)
|
||||||
if($i == "(crate-uri")
|
if($i == "(crate-uri")
|
||||||
crateName = $(i+1)
|
crateName = $(i+1)
|
||||||
}
|
}
|
||||||
gsub(/)/, "", crateVersion)
|
gsub(/)/, "", crateVersion)
|
||||||
cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\n"
|
cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\n"
|
||||||
|
next
|
||||||
}
|
}
|
||||||
|
|
||||||
# The xxxx-cargo-input variables have a set style
|
# Parse the crates created from packages using 'cargo package'
|
||||||
# TODO: Replace the last dash between the name and the version with a space!
|
/package:rust/ {
|
||||||
# This doesn't take into account swapping between "-" and "_" so we skip it.
|
pkg = $2
|
||||||
#( $2 ~ /-cargo-inputs/ ) {
|
split(pkg, name_version, "-")
|
||||||
# sub(/-cargo-inputs/, "", $2)
|
crateVersion = name_version[length(name_version)]
|
||||||
# gsub(/)/, "", $0)
|
crateName = substr(pkg, 6, (length(pkg) - length(crateVersion) - 6))
|
||||||
# gsub(/rust-/, "", $0)
|
split(crateVersion, versionDots, ".")
|
||||||
# #gensub(/([[:alpha:]])-([[:digit:]]+)/, "\\1 \\2", "g", $i)
|
if(crateVersion && (crateVersion != "(git-version") && (length(versionDots) == 3) && crateName) {
|
||||||
# print "[[package]]\nname = \"" $2 "\"\nversion = \"1.0.0\"\ndependencies = ["
|
cargoLock = cargoLock "[[package]]\nname = \"" crateName "\"\nversion = \"" crateVersion "\"\n"
|
||||||
# for (i = 4; i <= NF; i++) {
|
} else {
|
||||||
# print "\"" $i "\","
|
untested++
|
||||||
# }
|
#print("Unable to test " $0)
|
||||||
# print "]"
|
}
|
||||||
#}
|
next
|
||||||
|
}
|
||||||
|
|
||||||
END { print cargoLock | cargoAudit }
|
# We make an attempt to create the crate name from the package name otherwise
|
||||||
|
/git-reference/ {
|
||||||
|
for(i=3; i <= NF; i++) {
|
||||||
|
if($i == "(version")
|
||||||
|
crateVersion = $(i+1)
|
||||||
|
if($i == "(name")
|
||||||
|
crateName = $(i+1)
|
||||||
|
if($i == "(git-file-name") {
|
||||||
|
crateName = $(i+1)
|
||||||
|
crateVersion = $(i+2)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gsub(/)/, "", crateVersion)
|
||||||
|
gsub(/)/, "", crateName)
|
||||||
|
sub(/rust-/, "", crateName)
|
||||||
|
# The crate version MUST be major.minor.patch
|
||||||
|
split(crateVersion, versionParts, ".")
|
||||||
|
if(crateVersion && (crateVersion != "(git-version") && (length(versionParts) == 3) && crateName) {
|
||||||
|
cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\n"
|
||||||
|
} else {
|
||||||
|
untested++
|
||||||
|
#print("Unable to test " $0)
|
||||||
|
}
|
||||||
|
next
|
||||||
|
}
|
||||||
|
|
||||||
|
# Note those which we were unable to parse
|
||||||
|
/define rust/ {
|
||||||
|
if($3 == "#f)")
|
||||||
|
next
|
||||||
|
print("Unable to parse " $0)
|
||||||
|
}
|
||||||
|
|
||||||
|
{ untested++ }
|
||||||
|
|
||||||
|
END { print("Number of crates untested: " untested); print cargoLock | cargoAudit }
|
||||||
|
|||||||
@@ -26,7 +26,6 @@
|
|||||||
|
|
||||||
(define %sundry-texlive-packages
|
(define %sundry-texlive-packages
|
||||||
(list bibtool
|
(list bibtool
|
||||||
dvisvgm
|
|
||||||
rubber
|
rubber
|
||||||
texmaker
|
texmaker
|
||||||
texstudio
|
texstudio
|
||||||
|
|||||||
+19
-10
@@ -81,7 +81,10 @@ entry will be expired even if it has been accessed recently.")
|
|||||||
"Maximum time a cache entry for SSH keys is valid, in seconds.")
|
"Maximum time a cache entry for SSH keys is valid, in seconds.")
|
||||||
(extra-content
|
(extra-content
|
||||||
(raw-configuration-string "")
|
(raw-configuration-string "")
|
||||||
"Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}."))
|
"Raw content to add to the end of @file{~/.gnupg/gpg-agent.conf}.")
|
||||||
|
(shepherd-requirement
|
||||||
|
(list-of-symbols '())
|
||||||
|
"List of services that should be started before this service."))
|
||||||
|
|
||||||
(define (home-gpg-agent-configuration-file config)
|
(define (home-gpg-agent-configuration-file config)
|
||||||
"Return the @file{gpg-agent.conf} file for @var{config}."
|
"Return the @file{gpg-agent.conf} file for @var{config}."
|
||||||
@@ -104,7 +107,7 @@ entry will be expired even if it has been accessed recently.")
|
|||||||
(define (home-gpg-agent-shepherd-services config)
|
(define (home-gpg-agent-shepherd-services config)
|
||||||
"Return the possibly-empty list of Shepherd services for @var{config}."
|
"Return the possibly-empty list of Shepherd services for @var{config}."
|
||||||
(match-record config <home-gpg-agent-configuration>
|
(match-record config <home-gpg-agent-configuration>
|
||||||
(gnupg ssh-support?)
|
(gnupg ssh-support? shepherd-requirement)
|
||||||
;; 'gpg-agent' is started on demand by GnuPG's programs, but it has to be
|
;; 'gpg-agent' is started on demand by GnuPG's programs, but it has to be
|
||||||
;; started explicitly when OpenSSH support is enabled (info "(gnupg) Agent
|
;; started explicitly when OpenSSH support is enabled (info "(gnupg) Agent
|
||||||
;; Options").
|
;; Options").
|
||||||
@@ -119,15 +122,21 @@ entry will be expired even if it has been accessed recently.")
|
|||||||
#:socket-directory-permissions #o700))))
|
#:socket-directory-permissions #o700))))
|
||||||
(list (shepherd-service
|
(list (shepherd-service
|
||||||
(provision '(gpg-agent ssh-agent))
|
(provision '(gpg-agent ssh-agent))
|
||||||
|
(requirement shepherd-requirement)
|
||||||
(modules '((shepherd support))) ;for '%user-runtime-dir'
|
(modules '((shepherd support))) ;for '%user-runtime-dir'
|
||||||
(start #~(make-systemd-constructor
|
(start
|
||||||
(list #$(file-append gnupg "/bin/gpg-agent")
|
#~(lambda args
|
||||||
"--supervised" "--enable-ssh-support")
|
((make-systemd-constructor
|
||||||
(list #$(endpoint "ssh" "S.gpg-agent.ssh")
|
(list #$(file-append gnupg "/bin/gpg-agent")
|
||||||
#$(endpoint "browser" "S.gpg-agent.browser")
|
"--supervised" "--enable-ssh-support")
|
||||||
#$(endpoint "extra" "S.gpg-agent.extra")
|
(list #$(endpoint "ssh" "S.gpg-agent.ssh")
|
||||||
;; #$(endpoint "scdaemon" "S.scdaemon")
|
#$(endpoint "browser" "S.gpg-agent.browser")
|
||||||
#$(endpoint "std" "S.gpg-agent"))))
|
#$(endpoint "extra" "S.gpg-agent.extra")
|
||||||
|
;; #$(endpoint "scdaemon" "S.scdaemon")
|
||||||
|
#$(endpoint "std" "S.gpg-agent"))
|
||||||
|
;; Inherit graphical session environment.
|
||||||
|
#:environment-variables (environ))
|
||||||
|
args)))
|
||||||
(stop #~(make-systemd-destructor))
|
(stop #~(make-systemd-destructor))
|
||||||
(documentation "Start 'gpg-agent', the GnuPG passphrase
|
(documentation "Start 'gpg-agent', the GnuPG passphrase
|
||||||
agent, with support for handling OpenSSH material."))))
|
agent, with support for handling OpenSSH material."))))
|
||||||
|
|||||||
+34
-6
@@ -56,6 +56,7 @@
|
|||||||
# Copyright © 2022 Alex Griffin <a@ajgrf.com>
|
# Copyright © 2022 Alex Griffin <a@ajgrf.com>
|
||||||
# Copyright © 2022 ( <paren@disroot.org>
|
# Copyright © 2022 ( <paren@disroot.org>
|
||||||
# Copyright © 2022, 2026 jgart <jgart@dismail.de>
|
# Copyright © 2022, 2026 jgart <jgart@dismail.de>
|
||||||
|
# Copyright © 2022-2023, 2025-2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||||
# Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
|
# Copyright © 2023-2025 Zheng Junjie <z572@z572.online>
|
||||||
# Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
|
# Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
|
||||||
# Copyright © 2023 Andy Tai <atai@atai.org>
|
# Copyright © 2023 Andy Tai <atai@atai.org>
|
||||||
@@ -216,6 +217,7 @@ GNU_SYSTEM_MODULES = \
|
|||||||
%D%/packages/convmv.scm \
|
%D%/packages/convmv.scm \
|
||||||
%D%/packages/codex.scm \
|
%D%/packages/codex.scm \
|
||||||
%D%/packages/coq.scm \
|
%D%/packages/coq.scm \
|
||||||
|
%D%/packages/coreboot.scm \
|
||||||
%D%/packages/cpio.scm \
|
%D%/packages/cpio.scm \
|
||||||
%D%/packages/cpp.scm \
|
%D%/packages/cpp.scm \
|
||||||
%D%/packages/cppi.scm \
|
%D%/packages/cppi.scm \
|
||||||
@@ -608,6 +610,7 @@ GNU_SYSTEM_MODULES = \
|
|||||||
%D%/packages/rocm-apps.scm \
|
%D%/packages/rocm-apps.scm \
|
||||||
%D%/packages/rocm-libs.scm \
|
%D%/packages/rocm-libs.scm \
|
||||||
%D%/packages/rocm-tools.scm \
|
%D%/packages/rocm-tools.scm \
|
||||||
|
%D%/packages/rocq.scm \
|
||||||
%D%/packages/rpc.scm \
|
%D%/packages/rpc.scm \
|
||||||
%D%/packages/rpm.scm \
|
%D%/packages/rpm.scm \
|
||||||
%D%/packages/rrdtool.scm \
|
%D%/packages/rrdtool.scm \
|
||||||
@@ -738,6 +741,8 @@ GNU_SYSTEM_MODULES = \
|
|||||||
%D%/services/cgit.scm \
|
%D%/services/cgit.scm \
|
||||||
%D%/services/ci.scm \
|
%D%/services/ci.scm \
|
||||||
%D%/services/configuration.scm \
|
%D%/services/configuration.scm \
|
||||||
|
%D%/services/configuration/environment-variables.scm \
|
||||||
|
%D%/services/configuration/utils.scm \
|
||||||
%D%/services/containers.scm \
|
%D%/services/containers.scm \
|
||||||
%D%/services/cuirass.scm \
|
%D%/services/cuirass.scm \
|
||||||
%D%/services/cups.scm \
|
%D%/services/cups.scm \
|
||||||
@@ -1035,6 +1040,7 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/azr3.patch \
|
%D%/packages/patches/azr3.patch \
|
||||||
%D%/packages/patches/azr3-remove-lash.patch \
|
%D%/packages/patches/azr3-remove-lash.patch \
|
||||||
%D%/packages/patches/barony-fix-textures.patch \
|
%D%/packages/patches/barony-fix-textures.patch \
|
||||||
|
%D%/packages/patches/bam-python3-compat.patch \
|
||||||
%D%/packages/patches/bash-completion-directories.patch \
|
%D%/packages/patches/bash-completion-directories.patch \
|
||||||
%D%/packages/patches/bash-linux-pgrp-pipe.patch \
|
%D%/packages/patches/bash-linux-pgrp-pipe.patch \
|
||||||
%D%/packages/patches/basis-universal-unbundle-libs.patch \
|
%D%/packages/patches/basis-universal-unbundle-libs.patch \
|
||||||
@@ -1125,9 +1131,10 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/clucene-gcc-14.patch \
|
%D%/packages/patches/clucene-gcc-14.patch \
|
||||||
%D%/packages/patches/clucene-pkgconfig.patch \
|
%D%/packages/patches/clucene-pkgconfig.patch \
|
||||||
%D%/packages/patches/coda-use-system-libs.patch \
|
%D%/packages/patches/coda-use-system-libs.patch \
|
||||||
%D%/packages/patches/codex-acp-0.9.2-remove-patch-sections.patch \
|
%D%/packages/patches/codex-acp-0.11.1-disable-code-mode.patch \
|
||||||
%D%/packages/patches/codex-acp-0.9.2-replace-result-flatten.patch \
|
%D%/packages/patches/codex-acp-0.11.1-remove-patch-sections.patch \
|
||||||
%D%/packages/patches/codex-0.98.0-remove-patch-sections.patch \
|
%D%/packages/patches/codex-0.98.0-remove-patch-sections.patch \
|
||||||
|
%D%/packages/patches/rust-codex-0.117.0-remove-patch-sections.patch \
|
||||||
%D%/packages/patches/cogl-fix-double-free.patch \
|
%D%/packages/patches/cogl-fix-double-free.patch \
|
||||||
%D%/packages/patches/collada-dom-boost.patch \
|
%D%/packages/patches/collada-dom-boost.patch \
|
||||||
%D%/packages/patches/collectd-5.11.0-noinstallvar.patch \
|
%D%/packages/patches/collectd-5.11.0-noinstallvar.patch \
|
||||||
@@ -1461,7 +1468,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
|
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
|
||||||
%D%/packages/patches/gimp-fix-metadata-editor.patch \
|
%D%/packages/patches/gimp-fix-metadata-editor.patch \
|
||||||
%D%/packages/patches/gimp-fix-tiff-load.patch \
|
%D%/packages/patches/gimp-fix-tiff-load.patch \
|
||||||
%D%/packages/patches/git-clar-path-max.patch \
|
|
||||||
%D%/packages/patches/git-filter-repo-generate-doc.patch \
|
%D%/packages/patches/git-filter-repo-generate-doc.patch \
|
||||||
%D%/packages/patches/gklib-suitesparse.patch \
|
%D%/packages/patches/gklib-suitesparse.patch \
|
||||||
%D%/packages/patches/glib-appinfo-watch.patch \
|
%D%/packages/patches/glib-appinfo-watch.patch \
|
||||||
@@ -1611,7 +1617,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/hurd-refcounts-assert.patch \
|
%D%/packages/patches/hurd-refcounts-assert.patch \
|
||||||
%D%/packages/patches/hurd-rumpdisk-no-hd.patch \
|
%D%/packages/patches/hurd-rumpdisk-no-hd.patch \
|
||||||
%D%/packages/patches/hurd-startup.patch \
|
%D%/packages/patches/hurd-startup.patch \
|
||||||
%D%/packages/patches/hwloc-1-test-btrfs.patch \
|
|
||||||
%D%/packages/patches/hwloc-add-with-opencl.patch \
|
%D%/packages/patches/hwloc-add-with-opencl.patch \
|
||||||
%D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch \
|
%D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch \
|
||||||
%D%/packages/patches/i7z-gcc-10.patch \
|
%D%/packages/patches/i7z-gcc-10.patch \
|
||||||
@@ -1647,6 +1652,7 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
|
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
|
||||||
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \
|
%D%/packages/patches/id3lib-UTF16-writing-bug.patch \
|
||||||
%D%/packages/patches/ilmbase-fix-tests.patch \
|
%D%/packages/patches/ilmbase-fix-tests.patch \
|
||||||
|
%D%/packages/patches/inetutils-drop-test.patch \
|
||||||
%D%/packages/patches/inferno-fix-crash.patch \
|
%D%/packages/patches/inferno-fix-crash.patch \
|
||||||
%D%/packages/patches/iniparser-remove-fetchcontent-usage.patch \
|
%D%/packages/patches/iniparser-remove-fetchcontent-usage.patch \
|
||||||
%D%/packages/patches/inkscape-libxml2.patch \
|
%D%/packages/patches/inkscape-libxml2.patch \
|
||||||
@@ -1707,6 +1713,7 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
|
%D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
|
||||||
%D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch \
|
%D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch \
|
||||||
%D%/packages/patches/libretranslate-use-flasgger.patch \
|
%D%/packages/patches/libretranslate-use-flasgger.patch \
|
||||||
|
%D%/packages/patches/librewolf-150.0-encoding_rs-rust-fix.patch \
|
||||||
%D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch \
|
%D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch \
|
||||||
%D%/packages/patches/librewolf-compare-paths.patch \
|
%D%/packages/patches/librewolf-compare-paths.patch \
|
||||||
%D%/packages/patches/librewolf-neuter-locale-download.patch \
|
%D%/packages/patches/librewolf-neuter-locale-download.patch \
|
||||||
@@ -1739,7 +1746,7 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/kissfft-tflite-micro.patch \
|
%D%/packages/patches/kissfft-tflite-micro.patch \
|
||||||
%D%/packages/patches/kitty-fix-wayland-protocols.patch \
|
%D%/packages/patches/kitty-fix-wayland-protocols.patch \
|
||||||
%D%/packages/patches/kmod-module-directory.patch \
|
%D%/packages/patches/kmod-module-directory.patch \
|
||||||
%D%/packages/patches/kmscon-runtime-keymap-switch.patch \
|
%D%/packages/patches/kmscon-8-runtime-keymap-switch.patch \
|
||||||
%D%/packages/patches/knot-remove-runtime-deps.patch \
|
%D%/packages/patches/knot-remove-runtime-deps.patch \
|
||||||
%D%/packages/patches/kobodeluxe-paths.patch \
|
%D%/packages/patches/kobodeluxe-paths.patch \
|
||||||
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
|
%D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch \
|
||||||
@@ -1978,6 +1985,7 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch \
|
%D%/packages/patches/nheko-0-12-1-fix-rendering-replies.patch \
|
||||||
%D%/packages/patches/nix-dont-build-html-doc.diff \
|
%D%/packages/patches/nix-dont-build-html-doc.diff \
|
||||||
%D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \
|
%D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \
|
||||||
|
%D%/packages/patches/neovim-tree-sitter-grammar-path.patch \
|
||||||
%D%/packages/patches/network-manager-plugin-ownership.patch \
|
%D%/packages/patches/network-manager-plugin-ownership.patch \
|
||||||
%D%/packages/patches/network-manager-plugin-path.patch \
|
%D%/packages/patches/network-manager-plugin-path.patch \
|
||||||
%D%/packages/patches/newlib-getentropy.patch \
|
%D%/packages/patches/newlib-getentropy.patch \
|
||||||
@@ -2108,6 +2116,7 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/python-random2-getrandbits-test.patch \
|
%D%/packages/patches/python-random2-getrandbits-test.patch \
|
||||||
%D%/packages/patches/python-pillow-use-zlib-1.3.patch \
|
%D%/packages/patches/python-pillow-use-zlib-1.3.patch \
|
||||||
%D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch \
|
%D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch \
|
||||||
|
%D%/packages/patches/python-pynvim-fix-test-command-error.patch \
|
||||||
%D%/packages/patches/python-pypytools-python-3-fixes.patch \
|
%D%/packages/patches/python-pypytools-python-3-fixes.patch \
|
||||||
%D%/packages/patches/python-pyreadstat-link-libiconv.patch \
|
%D%/packages/patches/python-pyreadstat-link-libiconv.patch \
|
||||||
%D%/packages/patches/python-sip-include-dirs.patch \
|
%D%/packages/patches/python-sip-include-dirs.patch \
|
||||||
@@ -2250,6 +2259,7 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/python-werkzeug-tests.patch \
|
%D%/packages/patches/python-werkzeug-tests.patch \
|
||||||
%D%/packages/patches/qdigidoc-bundle-config-files.patch \
|
%D%/packages/patches/qdigidoc-bundle-config-files.patch \
|
||||||
%D%/packages/patches/qdigidoc-bundle-tsl-files.patch \
|
%D%/packages/patches/qdigidoc-bundle-tsl-files.patch \
|
||||||
|
%D%/packages/patches/qdigidoc-fix-icon.patch \
|
||||||
%D%/packages/patches/qemu-build-info-manual.patch \
|
%D%/packages/patches/qemu-build-info-manual.patch \
|
||||||
%D%/packages/patches/qemu-fix-agent-paths.patch \
|
%D%/packages/patches/qemu-fix-agent-paths.patch \
|
||||||
%D%/packages/patches/qemu-fix-test-virtio-version.patch \
|
%D%/packages/patches/qemu-fix-test-virtio-version.patch \
|
||||||
@@ -2380,10 +2390,16 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/rust-1.70-fix-rustix-build.patch \
|
%D%/packages/patches/rust-1.70-fix-rustix-build.patch \
|
||||||
%D%/packages/patches/rust-1.78-unwinding-fix.patch \
|
%D%/packages/patches/rust-1.78-unwinding-fix.patch \
|
||||||
%D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch \
|
%D%/packages/patches/rust-1.81-fix-riscv64-bootstrap.patch \
|
||||||
|
%D%/packages/patches/rust-candle-0.9.1-add-candle-onnx-to-workspace.patch \
|
||||||
%D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch \
|
%D%/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch \
|
||||||
%D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch \
|
%D%/packages/patches/rust-codex-0.98.0-test-shebangs.patch \
|
||||||
%D%/packages/patches/rust-codex-0.98.0-test-timeout.patch \
|
%D%/packages/patches/rust-codex-0.98.0-test-timeout.patch \
|
||||||
%D%/packages/patches/rust-codex-0.98.0-windows-sandbox-protocol-version.patch \
|
%D%/packages/patches/rust-codex-0.98.0-windows-sandbox-protocol-version.patch \
|
||||||
|
%D%/packages/patches/rust-codex-0.117.0-core-remove-self-dep.patch \
|
||||||
|
%D%/packages/patches/rust-codex-0.120.0-core-remove-self-dep.patch \
|
||||||
|
%D%/packages/patches/rust-codex-0.120.0-connectors-cache-test-race.patch \
|
||||||
|
%D%/packages/patches/rust-codex-0.120.0-remove-libwebrtc.patch \
|
||||||
|
%D%/packages/patches/rust-codex-0.120.0-test-timeout.patch \
|
||||||
%D%/packages/patches/rust-ring-0.17-ring-core.patch \
|
%D%/packages/patches/rust-ring-0.17-ring-core.patch \
|
||||||
%D%/packages/patches/rw-igraph-0.10.patch \
|
%D%/packages/patches/rw-igraph-0.10.patch \
|
||||||
%D%/packages/patches/rxvt-unicode-fix-cursor-position.patch \
|
%D%/packages/patches/rxvt-unicode-fix-cursor-position.patch \
|
||||||
@@ -2514,10 +2530,11 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/ultrastar-deluxe-no-freesans.patch \
|
%D%/packages/patches/ultrastar-deluxe-no-freesans.patch \
|
||||||
%D%/packages/patches/unity-test-set-subdir-correctly.patch \
|
%D%/packages/patches/unity-test-set-subdir-correctly.patch \
|
||||||
%D%/packages/patches/unity-test-support-int64.patch \
|
%D%/packages/patches/unity-test-support-int64.patch \
|
||||||
|
%D%/packages/patches/ungoogled-chromium-custom-compiler.patch \
|
||||||
|
%D%/packages/patches/ungoogled-chromium-empty-parsed-rustc-args.patch \
|
||||||
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
|
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
|
||||||
%D%/packages/patches/ungoogled-chromium-RUNPATH.patch \
|
%D%/packages/patches/ungoogled-chromium-RUNPATH.patch \
|
||||||
%D%/packages/patches/ungoogled-chromium-system-nspr.patch \
|
%D%/packages/patches/ungoogled-chromium-system-nspr.patch \
|
||||||
%D%/packages/patches/ungoogled-chromium-unbundle-icu-target.patch \
|
|
||||||
%D%/packages/patches/unknown-horizons-python-3.8-distro.patch \
|
%D%/packages/patches/unknown-horizons-python-3.8-distro.patch \
|
||||||
%D%/packages/patches/unknown-horizons-python-3.9.patch \
|
%D%/packages/patches/unknown-horizons-python-3.9.patch \
|
||||||
%D%/packages/patches/unknown-horizons-python-3.10.patch \
|
%D%/packages/patches/unknown-horizons-python-3.10.patch \
|
||||||
@@ -2618,6 +2635,17 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/yggdrasil-extra-config.patch \
|
%D%/packages/patches/yggdrasil-extra-config.patch \
|
||||||
%D%/packages/patches/ypsilon-Use-GNU-toolchain-as-default.patch \
|
%D%/packages/patches/ypsilon-Use-GNU-toolchain-as-default.patch \
|
||||||
%D%/packages/patches/zabbix-agent2-test-timezone-fix.patch \
|
%D%/packages/patches/zabbix-agent2-test-timezone-fix.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-add-message-notification-action.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-add-guix-container-support.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-collapse-multiline-git-deps.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-exclude-libwebrtc-from-audio.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-disable-dlopen.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-fix-sqlite-memory-mode.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-fix-test-db-isolation.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-fix-workspace-race.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-keep-regular-file-workspaces.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-remove-patch-crates-io.patch \
|
||||||
|
%D%/packages/patches/zed-0.225.10-use-mock-livekit-on-linux.patch \
|
||||||
%D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch \
|
%D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch \
|
||||||
%D%/packages/patches/zig-0.9-fix-runpath.patch \
|
%D%/packages/patches/zig-0.9-fix-runpath.patch \
|
||||||
%D%/packages/patches/zig-0.9-riscv-support.patch \
|
%D%/packages/patches/zig-0.9-riscv-support.patch \
|
||||||
|
|||||||
+34
-4
@@ -1158,7 +1158,7 @@ on memory usage on GNU/Linux systems.")
|
|||||||
(define-public htop
|
(define-public htop
|
||||||
(package
|
(package
|
||||||
(name "htop")
|
(name "htop")
|
||||||
(version "3.4.1")
|
(version "3.5.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -1166,7 +1166,7 @@ on memory usage on GNU/Linux systems.")
|
|||||||
(url "https://github.com/htop-dev/htop")
|
(url "https://github.com/htop-dev/htop")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "058y4a4mvx9m179dyr4wi8mlm6i4ybywshadaj4cvfn9fv0r0nkx"))
|
(base32 "1r07ri0dl9xz0jn1hc2g8q3l0q4clvnxs05yagpzsz0zigp4flj5"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
@@ -1309,7 +1309,8 @@ re-executing them as necessary.")
|
|||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1"))))
|
"11n01vsd51r7qraaaylhhx04hq4s6vcq0896zkz0yp1wvqfbwmm1"))
|
||||||
|
(patches (search-patches "inetutils-drop-test.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -3441,7 +3442,7 @@ modules and plugins that extend Ansible.")
|
|||||||
(list ansible
|
(list ansible
|
||||||
bash-minimal
|
bash-minimal
|
||||||
encfs
|
encfs
|
||||||
fuse-2
|
fuse
|
||||||
util-linux ;; for umount
|
util-linux ;; for umount
|
||||||
findutils
|
findutils
|
||||||
git
|
git
|
||||||
@@ -7169,6 +7170,35 @@ stored in an SQL database.")
|
|||||||
(connects via USB OTG).")
|
(connects via USB OTG).")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public yoctofetch
|
||||||
|
(package
|
||||||
|
(name "yoctofetch")
|
||||||
|
(version "2.0.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://codeberg.org/Phosphenius/yoctofetch.git")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0smkaydv74p2231gafibvqbwsy469w56hya8gz8wq0gw7m2l7zh3"))))
|
||||||
|
; Support for other platforms not available per upstream:
|
||||||
|
; https://codeberg.org/Phosphenius/yoctofetch#supported-platforms
|
||||||
|
(supported-systems '("x86_64-linux" "aarch64-linux"))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f)) ; No tests available.
|
||||||
|
(home-page "https://codeberg.org/Phosphenius/yoctofetch")
|
||||||
|
(synopsis "Fast and low footprint system fetch tool for the Linux UAPI")
|
||||||
|
(description
|
||||||
|
"This package provides a system fetch tool, similar to
|
||||||
|
@command{neofetch}, @command{fastfetch}, etc. It is lightweight and
|
||||||
|
has a focus on performance. It can be used as a greeter by starting
|
||||||
|
it from @file{~/.bashrc} for example.")
|
||||||
|
(license license:agpl3+)))
|
||||||
|
|
||||||
(define-public zzz
|
(define-public zzz
|
||||||
(package
|
(package
|
||||||
(name "zzz")
|
(name "zzz")
|
||||||
|
|||||||
+12
-160
@@ -1,9 +1,4 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
|
|
||||||
;;; Copyright © 2015, 2016, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
|
||||||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
|
||||||
;;; Copyright © 2019, 2021 Marius Bakke <marius@gnu.org>
|
|
||||||
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
|
||||||
;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
|
;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
@@ -22,163 +17,20 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages adns)
|
(define-module (gnu packages adns)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages m4)
|
#:use-module (guix deprecation))
|
||||||
#:use-module (gnu packages pkg-config)
|
|
||||||
#:use-module (guix build-system cmake)
|
|
||||||
#:use-module (guix build-system gnu)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix gexp)
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix utils))
|
|
||||||
|
|
||||||
(define-public adns
|
(define-deprecated/public-alias adns
|
||||||
(package
|
(@ (gnu packages dns) adns))
|
||||||
(name "adns")
|
|
||||||
(version "1.6.1")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
|
|
||||||
(commit (string-append "adns-" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
;; INFO: Tests expect real name resolution to work.
|
|
||||||
#:tests? #f
|
|
||||||
#:configure-flags
|
|
||||||
#~(list
|
|
||||||
;; Make sure the programs under bin/ find libadns.so.
|
|
||||||
(string-append "LDFLAGS=-Wl,-rpath -Wl,"
|
|
||||||
#$output:out
|
|
||||||
"/lib"))))
|
|
||||||
(native-inputs
|
|
||||||
(list m4))
|
|
||||||
(home-page "https://www.gnu.org/software/adns/")
|
|
||||||
(synopsis "Asynchronous DNS client library and utilities")
|
|
||||||
(description
|
|
||||||
"GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
|
|
||||||
Name System} resolution functionality. The library is asynchronous, allowing
|
|
||||||
several concurrent calls. The package also includes several command-line
|
|
||||||
utilities for use in scripts.")
|
|
||||||
(license license:gpl3+)))
|
|
||||||
|
|
||||||
(define-public c-ares
|
(define-deprecated/public-alias c-ares
|
||||||
(package
|
(@ (gnu packages dns) c-ares))
|
||||||
(name "c-ares")
|
|
||||||
(version "1.34.4")
|
|
||||||
(source (origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append
|
|
||||||
"https://github.com/c-ares/c-ares/releases/download/v"
|
|
||||||
version "/" name "-" version ".tar.gz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-before 'check 'filter-live-tests
|
|
||||||
(lambda _
|
|
||||||
;; Filter tests that require internet access.
|
|
||||||
(setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
|
|
||||||
#$@(if (system-hurd?)
|
|
||||||
#~((add-after 'unpack 'skip-tests
|
|
||||||
(lambda _
|
|
||||||
(substitute* "test/ares-test-main.cc"
|
|
||||||
(("(^| )main *\\(.*" all)
|
|
||||||
(string-append all " exit (77);\n")))))
|
|
||||||
(add-after 'filter-live-tests 'filter-hurd-tests
|
|
||||||
(lambda _
|
|
||||||
(setenv "GTEST_FILTER"
|
|
||||||
(string-append
|
|
||||||
(getenv "GTEST_FILTER")
|
|
||||||
":.*Basic/2"
|
|
||||||
":.*CancelImmediate/2"
|
|
||||||
":.*CancelImmediateGetHostByAddr/2"
|
|
||||||
":.*CancelLater/1"
|
|
||||||
":.*FamilyUnspecified/2"
|
|
||||||
":.*FamilyV6/2"
|
|
||||||
":.*GetAddrInfoParallelLookups/1"
|
|
||||||
":.*GetHostByAddrDestroy/2"
|
|
||||||
":.*GetHostByNameCNAMENoData/2"
|
|
||||||
":.*GetHostByNameDestroyAbsolute/2"
|
|
||||||
":.*GetHostByNameDestroyRelative/2"
|
|
||||||
":.*GetHostByNameParallelLookups/1"
|
|
||||||
":.*HostAlias/2"
|
|
||||||
":.*HostAliasMissing/2"
|
|
||||||
":.*HostAliasMissingFile/2"
|
|
||||||
":.*NotImplResponse/2"
|
|
||||||
":.*RefusedResponse/2"
|
|
||||||
":.*Resend/1"
|
|
||||||
":.*RetryWithoutEDNS/2"
|
|
||||||
":.*SearchDomains/2"
|
|
||||||
":.*SearchDomainsBare/2"
|
|
||||||
":.*SearchDomainsServFailOnAAAA/2"
|
|
||||||
":.*SearchDomainsWithResentReply/1"
|
|
||||||
":.*SearchHighNdots/2"
|
|
||||||
":.*SearchNoDataThenFail/2"
|
|
||||||
":.*SearchNoDataThenNoDataBare/2"
|
|
||||||
":.*SearchNoDataThenSuccess/2"
|
|
||||||
":.*ServFailResponse/2"
|
|
||||||
":.*SimpleQuery/2"
|
|
||||||
":.*SockCallback/2"
|
|
||||||
":.*SockConfigureCallback/2"
|
|
||||||
":.*SortListV4/2"
|
|
||||||
":.*SortListV6/2"
|
|
||||||
":.*ThirdServer/2"
|
|
||||||
":.*TruncationRetry/1"
|
|
||||||
":.*UnspecifiedFamilyCname6A4/2"
|
|
||||||
":.*UnspecifiedFamilyV4/2"
|
|
||||||
":.*UnspecifiedFamilyV6/2")))))
|
|
||||||
#~()))))
|
|
||||||
(native-inputs
|
|
||||||
(list pkg-config))
|
|
||||||
(home-page "https://c-ares.haxx.se/")
|
|
||||||
(synopsis "C library for asynchronous DNS requests")
|
|
||||||
(description
|
|
||||||
"C-ares is a C library that performs DNS requests and name resolution
|
|
||||||
asynchronously. It is intended for applications which need to perform DNS
|
|
||||||
queries without blocking, or need to perform multiple DNS queries in parallel.
|
|
||||||
The primary examples of such applications are servers which communicate with
|
|
||||||
multiple clients and programs with graphical user interfaces.")
|
|
||||||
(license (license:x11-style "https://c-ares.haxx.se/license.html"))))
|
|
||||||
|
|
||||||
(define-public c-ares-for-node-lts
|
(define-deprecated/public-alias c-ares-for-node-lts
|
||||||
(hidden-package c-ares))
|
(@ (gnu packages dns) c-ares-for-node-lts))
|
||||||
|
|
||||||
(define-public c-ares-for-node-bootstrap
|
(define-deprecated/public-alias c-ares-for-node-bootstrap
|
||||||
(hidden-package
|
(@ (gnu packages dns) c-ares-for-node-bootstrap))
|
||||||
(package
|
|
||||||
(inherit c-ares)
|
|
||||||
(version "1.18.1")
|
|
||||||
(source (origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append
|
|
||||||
"https://c-ares.haxx.se/download/c-ares-" version
|
|
||||||
".tar.gz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
|
|
||||||
|
|
||||||
;; gRPC requires a c-ares built with CMake in order to get the .cmake modules.
|
(define-deprecated/public-alias c-ares/cmake
|
||||||
;; We can not build c-ares itself with CMake because that would introduce a
|
(@ (gnu packages dns) c-ares/cmake))
|
||||||
;; circular dependency through nghttp2.
|
|
||||||
;; XXX: It would be nice if we could extract the modules somehow and make them
|
|
||||||
;; work with the "normal" c-ares package instead of building a whole new library.
|
|
||||||
(define-public c-ares/cmake
|
|
||||||
(hidden-package
|
|
||||||
(package
|
|
||||||
(inherit c-ares)
|
|
||||||
(build-system cmake-build-system)
|
|
||||||
(arguments
|
|
||||||
`(;; XXX: Tests require name resolution (the normal variant runs no tests).
|
|
||||||
#:tests? #f)))))
|
|
||||||
|
|||||||
@@ -370,7 +370,7 @@ This package includes the following programs:
|
|||||||
libjpeg-turbo
|
libjpeg-turbo
|
||||||
perl
|
perl
|
||||||
python
|
python
|
||||||
v4l-utils-minimal))
|
v4l-utils))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
;; These are in 'requires' field of .pc files.
|
;; These are in 'requires' field of .pc files.
|
||||||
(list glib gtk+))
|
(list glib gtk+))
|
||||||
|
|||||||
+12
-20
@@ -765,7 +765,7 @@ file system.")
|
|||||||
(sha256
|
(sha256
|
||||||
(base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
|
(base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(inputs (list python-requests python-argcomplete python-urllib3
|
(propagated-inputs (list python-requests python-argcomplete python-urllib3
|
||||||
python-looseversion gnupg))
|
python-looseversion gnupg))
|
||||||
(native-inputs (list python-setuptools python-wheel python-requests-cache
|
(native-inputs (list python-setuptools python-wheel python-requests-cache
|
||||||
python-defusedxml))
|
python-defusedxml))
|
||||||
@@ -773,8 +773,7 @@ file system.")
|
|||||||
(list $SSL_CERT_FILE))
|
(list $SSL_CERT_FILE))
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:test-flags
|
#:test-backend #~'unittest
|
||||||
#~(list "-k" "test_*")
|
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'patch-tests
|
(add-after 'unpack 'patch-tests
|
||||||
@@ -793,11 +792,7 @@ file system.")
|
|||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "sdkmanager.py"
|
(substitute* "sdkmanager.py"
|
||||||
(("gpgv")
|
(("gpgv")
|
||||||
(string-append #$(this-package-input "gnupg") "/bin/gpgv")))))
|
(string-append #$(this-package-input "gnupg") "/bin/gpgv"))))))))
|
||||||
(replace 'check
|
|
||||||
(lambda* (#:key tests? test-flags #:allow-other-keys)
|
|
||||||
(when tests?
|
|
||||||
(apply invoke "python" "-m" "unittest" test-flags)))))))
|
|
||||||
(home-page "https://gitlab.com/fdroid/sdkmanager")
|
(home-page "https://gitlab.com/fdroid/sdkmanager")
|
||||||
(synopsis "Replacement for Android sdkmanager written in Python")
|
(synopsis "Replacement for Android sdkmanager written in Python")
|
||||||
(description
|
(description
|
||||||
@@ -1182,14 +1177,16 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
|
|||||||
(define-public fdroidserver
|
(define-public fdroidserver
|
||||||
(package
|
(package
|
||||||
(name "fdroidserver")
|
(name "fdroidserver")
|
||||||
(version "2.4.2")
|
(version "2.4.3")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (pypi-uri "fdroidserver" version))
|
(uri (git-reference
|
||||||
|
(url "https://gitlab.com/fdroid/fdroidserver")
|
||||||
|
(commit version)))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32 "1745fqxr2qfrls4wr6x9w1262b9pxmw9yvzd9b71ya2qmj74q17n"))))
|
||||||
"06xybginrwi5c7bw000wz5s5hzi0aqrxskzwh8qc6wv463w2djax"))))
|
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -1200,22 +1197,17 @@ for communicating with Xiaomi smart appliances over miIO and MIoT protocols.")
|
|||||||
(lambda _
|
(lambda _
|
||||||
(setenv "HOME" "/tmp"))))))
|
(setenv "HOME" "/tmp"))))))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list python-androguard
|
(list python-platformdirs
|
||||||
|
python-androguard
|
||||||
python-apache-libcloud
|
python-apache-libcloud
|
||||||
python-argcomplete
|
|
||||||
python-asn1crypto
|
python-asn1crypto
|
||||||
python-clint
|
python-clint
|
||||||
python-defusedxml
|
python-defusedxml
|
||||||
python-docker
|
|
||||||
python-gitpython
|
python-gitpython
|
||||||
python-mwclient
|
|
||||||
python-oscrypto
|
python-oscrypto
|
||||||
python-paramiko
|
python-paramiko
|
||||||
python-pillow
|
python-pillow
|
||||||
python-platformdirs
|
|
||||||
python-puremagic
|
python-puremagic
|
||||||
python-pyasn1
|
|
||||||
python-pyasn1-modules
|
|
||||||
python-pyyaml
|
python-pyyaml
|
||||||
python-qrcode
|
python-qrcode
|
||||||
python-requests
|
python-requests
|
||||||
|
|||||||
@@ -33,9 +33,8 @@
|
|||||||
;; The URI does not appear to be easily guessable. For
|
;; The URI does not appear to be easily guessable. For
|
||||||
;; example, you cannot download version "9100g" simply
|
;; example, you cannot download version "9100g" simply
|
||||||
;; by replacing "9100h" in the URI.
|
;; by replacing "9100h" in the URI.
|
||||||
(uri (list (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
|
(uri (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
|
||||||
"distfiles/31/anthy-9100h.tar.gz")
|
"distfiles/31/anthy-9100h.tar.gz"))
|
||||||
"https://osdn.dl.osdn.net/anthy/37536/anthy-9100h.tar.gz"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
|
(base32 "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|||||||
+66
-21
@@ -62,6 +62,7 @@
|
|||||||
;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
|
;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
|
||||||
;;; Copyright © 2026 Noé Lopez <noelopez@free.fr>
|
;;; Copyright © 2026 Noé Lopez <noelopez@free.fr>
|
||||||
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
||||||
|
;;; Copyright © 2026 Daniel Martins <email@danielfm.me>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -3438,7 +3439,7 @@ from being able to mix multiple JACK audio streams.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "08ji4lg24flzi6g3yaavfq8hz3kr98q2ripk5m4qk9z172qxbbc9"))))
|
(base32 "0fvnvr74q5khxlj5sylfnkblydmwgdbvj04mhdqw0zzmfqwignhd"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -3703,6 +3704,44 @@ compensation, (de)interleaving, and byte-swapping
|
|||||||
;; original developer.
|
;; original developer.
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public rtcqs
|
||||||
|
(package
|
||||||
|
(name "rtcqs")
|
||||||
|
(version "0.6.7")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://codeberg.org/rtcqs/rtcqs")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1kc3niyaq4m8di68832pgfb1b0m54q5gm68dwlzwwilgxi61ifzc"))))
|
||||||
|
(build-system pyproject-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ;no test suite
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'remove-gui
|
||||||
|
(lambda _
|
||||||
|
(substitute* "pyproject.toml"
|
||||||
|
(("\"FreeSimpleGUI\",?")
|
||||||
|
"")
|
||||||
|
(("rtcqs_gui = \"rtcqs\\.rtcqs_gui:main\"")
|
||||||
|
""))
|
||||||
|
(delete-file "src/rtcqs/rtcqs_gui.py")
|
||||||
|
(delete-file "src/rtcqs/rtcqs_qt_gui.py"))))))
|
||||||
|
(native-inputs (list python-setuptools))
|
||||||
|
(home-page "https://codeberg.org/rtcqs/rtcqs")
|
||||||
|
(synopsis "Linux audio real-time performance analyzer")
|
||||||
|
(description
|
||||||
|
"rtcqs analyzes a Linux system to detect possible bottlenecks that could
|
||||||
|
have a negative impact on real-time audio performance. It checks kernel
|
||||||
|
configuration, IRQ priorities, CPU governor, swappiness, and other settings
|
||||||
|
relevant to low-latency audio work.")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public rtosc
|
(define-public rtosc
|
||||||
(package
|
(package
|
||||||
(name "rtosc")
|
(name "rtosc")
|
||||||
@@ -6490,22 +6529,23 @@ on the ALSA software PCM plugin.")
|
|||||||
(define-public snd
|
(define-public snd
|
||||||
(package
|
(package
|
||||||
(name "snd")
|
(name "snd")
|
||||||
(version "25.2")
|
(version "26.3")
|
||||||
(source (origin
|
(source
|
||||||
(method url-fetch)
|
(origin
|
||||||
(uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/"
|
(method url-fetch)
|
||||||
"snd-" version ".tar.gz"))
|
(uri (string-append "https://ccrma.stanford.edu/software/snd/snd-"
|
||||||
(sha256
|
version ".tar.gz"))
|
||||||
(base32
|
(sha256
|
||||||
"0fgxqk0byxdj6059mb9d5qic2dqjabz49j0szsrn2y3c9nz6iyq4"))))
|
(base32
|
||||||
|
"1d573mjlrn9rhl9g0a3d1rkar34q60ln8mwlbibfalpn8lsz59a0"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:tests? #f ; no tests
|
#:tests? #f ; No tests.
|
||||||
#:out-of-source? #f ; for the 'install-doc' phase
|
#:out-of-source? #f ; Required by 'install-doc'.
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
#~(let ((docdir (string-append #$output "/share/doc/"
|
#~(let
|
||||||
#$name "-" #$version)))
|
((docdir (string-append #$output "/share/doc/snd-" #$version)))
|
||||||
(list "--with-alsa"
|
(list "--with-alsa"
|
||||||
"--with-jack"
|
"--with-jack"
|
||||||
"--with-gmp"
|
"--with-gmp"
|
||||||
@@ -6513,18 +6553,20 @@ on the ALSA software PCM plugin.")
|
|||||||
(string-append "--with-doc-dir=" docdir)))
|
(string-append "--with-doc-dir=" docdir)))
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'install 'install-s7
|
(add-after 'install 'install-s7-h
|
||||||
(lambda _
|
(lambda _
|
||||||
(install-file "s7.h" (string-append #$output "/include"))))
|
(install-file "s7.h" (string-append #$output
|
||||||
|
"/include"))))
|
||||||
(add-after 'install 'install-doc
|
(add-after 'install 'install-doc
|
||||||
(lambda _
|
(lambda _
|
||||||
(let ((doc (string-append #$output "/share/doc/"
|
(let
|
||||||
#$name "-" #$version)))
|
((docdir (string-append #$output "/share/doc/snd-"
|
||||||
|
#$version)))
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (f)
|
(lambda (f)
|
||||||
(install-file f doc))
|
(install-file f docdir))
|
||||||
(find-files "." "\\.html$"))
|
(find-files "." "\\.html$"))
|
||||||
(copy-recursively "pix" (string-append doc "/pix"))))))))
|
(copy-recursively "pix" (string-append docdir "/pix"))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config))
|
(list pkg-config))
|
||||||
(inputs
|
(inputs
|
||||||
@@ -6543,13 +6585,16 @@ on the ALSA software PCM plugin.")
|
|||||||
timidity++
|
timidity++
|
||||||
vorbis-tools
|
vorbis-tools
|
||||||
wavpack))
|
wavpack))
|
||||||
|
(home-page "https://ccrma.stanford.edu/software/snd/snd/snd.html")
|
||||||
(synopsis "Sound editor")
|
(synopsis "Sound editor")
|
||||||
(home-page "https://ccrma.stanford.edu/software/snd/")
|
|
||||||
(description
|
(description
|
||||||
"Snd is a sound editor modelled loosely after Emacs. It can be
|
"Snd is a sound editor modelled loosely after Emacs. It can be
|
||||||
customized and extended using either the s7 Scheme implementation (included in
|
customized and extended using either the s7 Scheme implementation (included in
|
||||||
the Snd sources), Ruby, or Forth.")
|
the Snd sources), Ruby, or Forth.")
|
||||||
(license (license:non-copyleft "file://COPYING"))))
|
(license
|
||||||
|
;; INFO: pkgsrc classifies this as `esdl-license', a license not included
|
||||||
|
;; in OSI or FSF lists, despite being similar to ISC.
|
||||||
|
(license:non-copyleft "file://COPYING"))))
|
||||||
|
|
||||||
(define-public libspecbleach
|
(define-public libspecbleach
|
||||||
(package
|
(package
|
||||||
|
|||||||
@@ -37,6 +37,8 @@
|
|||||||
#:use-module (gnu packages elf)
|
#:use-module (gnu packages elf)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
|
#:use-module (gnu packages ruby-check)
|
||||||
|
#:use-module (gnu packages ruby-xyz)
|
||||||
#:use-module (gnu packages bison)
|
#:use-module (gnu packages bison)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages libffi)
|
#:use-module (gnu packages libffi)
|
||||||
@@ -53,6 +55,7 @@
|
|||||||
#:use-module (guix store)
|
#:use-module (guix store)
|
||||||
#:use-module (guix build-system copy)
|
#:use-module (guix build-system copy)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system ruby)
|
||||||
#:use-module (guix build-system trivial)
|
#:use-module (guix build-system trivial)
|
||||||
#:autoload (guix gnupg) (gnupg-verify*)
|
#:autoload (guix gnupg) (gnupg-verify*)
|
||||||
#:autoload (guix base32) (bytevector->nix-base32-string)
|
#:autoload (guix base32) (bytevector->nix-base32-string)
|
||||||
@@ -513,6 +516,46 @@ function interface (FFI) directly in your shell. In other words, it allows
|
|||||||
you to call routines in shared libraries from within Bash.")
|
you to call routines in shared libraries from within Bash.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public bashly
|
||||||
|
(package
|
||||||
|
(name "bashly")
|
||||||
|
(version "1.3.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (rubygems-uri "bashly" version))
|
||||||
|
(sha256
|
||||||
|
(base32 "17msjzca5ifx8biimdjps655w51yc82d5ys9hwn749bi2f3n8mcz"))))
|
||||||
|
(build-system ruby-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(replace 'check
|
||||||
|
(lambda* (#:key tests? #:allow-other-keys)
|
||||||
|
(when tests?
|
||||||
|
(invoke "rspec" "-c" "spec")))))))
|
||||||
|
(native-inputs (list ruby-rspec))
|
||||||
|
(propagated-inputs (list ruby-colsole
|
||||||
|
ruby-completely
|
||||||
|
ruby-filewatcher
|
||||||
|
ruby-gtx
|
||||||
|
ruby-logger
|
||||||
|
ruby-lp
|
||||||
|
ruby-mister-bin
|
||||||
|
ruby-ostruct
|
||||||
|
ruby-requires
|
||||||
|
ruby-tty-markdown))
|
||||||
|
(synopsis
|
||||||
|
"Create feature-rich Bash scrips using simple YAML configuration")
|
||||||
|
(description
|
||||||
|
"Bashly is a CLI for generating feature-rich Bash command line
|
||||||
|
tools. Bashly lets you focus on your specific code, without worrying about
|
||||||
|
command line argument parsing, usage texts, error messages and other functions
|
||||||
|
that are usually handled by a framework in other programming languages.")
|
||||||
|
(home-page "https://bashly.dev/")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public blesh
|
(define-public blesh
|
||||||
(package
|
(package
|
||||||
(name "blesh")
|
(name "blesh")
|
||||||
|
|||||||
@@ -944,7 +944,20 @@ configurable through a set of options.")
|
|||||||
#~(list (string-append
|
#~(list (string-append
|
||||||
"CC=" #$(this-package-input "openmpi") "/bin/mpicc")
|
"CC=" #$(this-package-input "openmpi") "/bin/mpicc")
|
||||||
(string-append
|
(string-append
|
||||||
"CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))))
|
"CXX=" #$(this-package-input "openmpi") "/bin/mpicxx"))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
;; OSU installs its binaries to /libexec. Have a symlink in /bin to
|
||||||
|
;; improve user experience.
|
||||||
|
(add-after 'install 'symlink-binaries-in-bin
|
||||||
|
(lambda _
|
||||||
|
(mkdir-p (string-append #$output "/bin"))
|
||||||
|
(for-each (lambda (file)
|
||||||
|
(symlink file
|
||||||
|
(string-append #$output "/bin/"
|
||||||
|
(basename file))))
|
||||||
|
(find-files (string-append #$output
|
||||||
|
"/libexec"))))))))
|
||||||
(home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
|
(home-page "https://mvapich.cse.ohio-state.edu/benchmarks/")
|
||||||
(synopsis "Benchmarking suite from the MVAPICH project")
|
(synopsis "Benchmarking suite from the MVAPICH project")
|
||||||
(description
|
(description
|
||||||
|
|||||||
@@ -18335,44 +18335,6 @@ following the assay and produces a file detailing peaks of significant
|
|||||||
enrichment.")
|
enrichment.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public mantis
|
|
||||||
;; This is an arbitrary commit as a year has passed since 0.1 was tagged.
|
|
||||||
(let ((commit "b6979a269172a45201c8366680d8b889f889432b")
|
|
||||||
(revision "2"))
|
|
||||||
(package
|
|
||||||
(name "mantis")
|
|
||||||
(version (git-version "0.1" revision commit))
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/splatlab/mantis")
|
|
||||||
(commit commit)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0dq8a785hnaxx5kq757m5czs8xpcjpcph1inq2nm8h6zfvqyj8xs"))))
|
|
||||||
(build-system cmake-build-system)
|
|
||||||
(arguments
|
|
||||||
'(#:tests? #f ; there are none
|
|
||||||
#:configure-flags (list "-DNH=ON"))) ; do not use SSE4.2 instructions
|
|
||||||
(inputs
|
|
||||||
(list sdsl-lite openssl zlib))
|
|
||||||
(native-inputs
|
|
||||||
(list gcc-7))
|
|
||||||
(home-page "https://github.com/splatlab/mantis")
|
|
||||||
(synopsis "Large-scale sequence-search index data structure")
|
|
||||||
(description "Mantis is a space-efficient data structure that can be
|
|
||||||
used to index thousands of raw-read genomics experiments and facilitate
|
|
||||||
large-scale sequence searches on those experiments. Mantis uses counting
|
|
||||||
quotient filters instead of Bloom filters, enabling rapid index builds and
|
|
||||||
queries, small indexes, and exact results, i.e., no false positives or
|
|
||||||
negatives. Furthermore, Mantis is also a colored de Bruijn graph
|
|
||||||
representation, so it supports fast graph traversal and other topological
|
|
||||||
analyses in addition to large-scale sequence-level searches.")
|
|
||||||
;; uses __uint128_t and inline assembly
|
|
||||||
(supported-systems '("x86_64-linux"))
|
|
||||||
(license license:bsd-3))))
|
|
||||||
|
|
||||||
(define-public sjcount
|
(define-public sjcount
|
||||||
;; There is no tag for version 3.2, nor is there a release archive.
|
;; There is no tag for version 3.2, nor is there a release archive.
|
||||||
(let ((commit "292d3917cadb3f6834c81e509c30e61cd7ead6e5")
|
(let ((commit "292d3917cadb3f6834c81e509c30e61cd7ead6e5")
|
||||||
@@ -22387,37 +22349,6 @@ combinatorial configurations.\", G. Ehrlich - Journal of the ACM (JACM),
|
|||||||
1973. (Algorithm 7.)")
|
1973. (Algorithm 7.)")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public fsom
|
|
||||||
(let ((commit "a6ef318fbd347c53189384aef7f670c0e6ce89a3"))
|
|
||||||
(package
|
|
||||||
(name "fsom")
|
|
||||||
(version (git-version "0.0.0" "1" commit))
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/ekg/fsom/")
|
|
||||||
(commit commit)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "0gw1lpvr812pywg9y546x0h1hhj261xwls41r6kqhddjlrcjc0pi"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:tests? #f ; There are no tests to run.
|
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(delete 'configure) ; There is no configure phase.
|
|
||||||
(replace 'install
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
|
|
||||||
(install-file "fsom" bin)))))))
|
|
||||||
(native-inputs
|
|
||||||
(list gcc-6))
|
|
||||||
(home-page "https://github.com/ekg/fsom")
|
|
||||||
(synopsis "Manage SOM (Self-Organizing Maps) neural networks")
|
|
||||||
(description "A tiny C library for managing SOM (Self-Organizing Maps)
|
|
||||||
neural networks.")
|
|
||||||
(license license:gpl3))))
|
|
||||||
|
|
||||||
(define-public fastahack
|
(define-public fastahack
|
||||||
(package
|
(package
|
||||||
(name "fastahack")
|
(name "fastahack")
|
||||||
|
|||||||
+33
-33
@@ -41,32 +41,16 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages bittorrent)
|
(define-module (gnu packages bittorrent)
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix build-system cmake)
|
|
||||||
#:use-module (guix build-system gnu)
|
|
||||||
#:use-module (guix build-system meson)
|
|
||||||
#:use-module (guix build-system pyproject)
|
|
||||||
#:use-module (guix build-system python)
|
|
||||||
#:use-module (guix build-system qt)
|
|
||||||
#:use-module (guix build-system glib-or-gtk)
|
|
||||||
#:use-module ((guix licenses) #:prefix l:)
|
|
||||||
#:use-module (guix gexp)
|
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
|
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (gnu packages adns)
|
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages boost)
|
||||||
#:use-module (gnu packages nss)
|
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages cmake)
|
#:use-module (gnu packages cmake)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages crypto)
|
#:use-module (gnu packages crypto)
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages curl)
|
||||||
#:use-module (gnu packages cyrus-sasl)
|
#:use-module (gnu packages cyrus-sasl)
|
||||||
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages freedesktop)
|
#:use-module (gnu packages freedesktop)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
@@ -76,8 +60,9 @@
|
|||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages libevent)
|
#:use-module (gnu packages libevent)
|
||||||
#:use-module (gnu packages multiprecision)
|
#:use-module (gnu packages multiprecision)
|
||||||
#:use-module (gnu packages nettle)
|
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
|
#:use-module (gnu packages nettle)
|
||||||
|
#:use-module (gnu packages nss)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
@@ -86,15 +71,30 @@
|
|||||||
#:use-module (gnu packages python-crypto)
|
#:use-module (gnu packages python-crypto)
|
||||||
#:use-module (gnu packages python-web)
|
#:use-module (gnu packages python-web)
|
||||||
#:use-module (gnu packages python-xyz)
|
#:use-module (gnu packages python-xyz)
|
||||||
#:use-module (gnu packages serialization)
|
|
||||||
#:use-module (gnu packages qt)
|
#:use-module (gnu packages qt)
|
||||||
|
#:use-module (gnu packages serialization)
|
||||||
#:use-module (gnu packages sqlite)
|
#:use-module (gnu packages sqlite)
|
||||||
#:use-module (gnu packages ssh)
|
#:use-module (gnu packages ssh)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages version-control)
|
#:use-module (gnu packages version-control)
|
||||||
#:use-module (gnu packages web)
|
#:use-module (gnu packages web)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xorg))
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
|
#:use-module (guix build-system glib-or-gtk)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system meson)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system qt)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
|
||||||
|
#:use-module (guix utils))
|
||||||
|
|
||||||
(define-public transmission
|
(define-public transmission
|
||||||
(package
|
(package
|
||||||
@@ -194,7 +194,7 @@ DHT, µTP, PEX and Magnet Links.")
|
|||||||
;; or any future license endorsed by Mnemosyne LLC.
|
;; or any future license endorsed by Mnemosyne LLC.
|
||||||
;;
|
;;
|
||||||
;; A few files files carry an MIT/X11 license header.
|
;; A few files files carry an MIT/X11 license header.
|
||||||
(license (list l:gpl2 l:gpl3))))
|
(license (list license:gpl2 license:gpl3))))
|
||||||
|
|
||||||
(define-public transmission-remote-gtk
|
(define-public transmission-remote-gtk
|
||||||
(package
|
(package
|
||||||
@@ -224,7 +224,7 @@ DHT, µTP, PEX and Magnet Links.")
|
|||||||
(description "transmission-remote-gtk is a GTK client for remote management
|
(description "transmission-remote-gtk is a GTK client for remote management
|
||||||
of the Transmission BitTorrent client, using its HTTP RPC protocol.")
|
of the Transmission BitTorrent client, using its HTTP RPC protocol.")
|
||||||
(home-page "https://github.com/transmission-remote-gtk/transmission-remote-gtk")
|
(home-page "https://github.com/transmission-remote-gtk/transmission-remote-gtk")
|
||||||
(license l:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public stig
|
(define-public stig
|
||||||
(package
|
(package
|
||||||
@@ -267,7 +267,7 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.")
|
|||||||
"Stig is a @acronym{TUI, Text User Interface} and @acronym{CLI, Command
|
"Stig is a @acronym{TUI, Text User Interface} and @acronym{CLI, Command
|
||||||
Line Interface} client for the BitTorrent client Transmission.")
|
Line Interface} client for the BitTorrent client Transmission.")
|
||||||
(home-page "https://github.com/rndusr/stig")
|
(home-page "https://github.com/rndusr/stig")
|
||||||
(license l:gpl3)))
|
(license license:gpl3)))
|
||||||
|
|
||||||
(define-public libtorrent
|
(define-public libtorrent
|
||||||
(package
|
(package
|
||||||
@@ -291,7 +291,7 @@ Line Interface} client for the BitTorrent client Transmission.")
|
|||||||
with the BitTorrent client rtorrent. It is written in C++ with emphasis on
|
with the BitTorrent client rtorrent. It is written in C++ with emphasis on
|
||||||
speed and efficiency.")
|
speed and efficiency.")
|
||||||
(home-page "https://github.com/rakshasa/libtorrent")
|
(home-page "https://github.com/rakshasa/libtorrent")
|
||||||
(license l:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public rtorrent
|
(define-public rtorrent
|
||||||
(package
|
(package
|
||||||
@@ -320,7 +320,7 @@ speed and efficiency.")
|
|||||||
full encryption, DHT, PEX, and Magnet Links. It can also be controlled via
|
full encryption, DHT, PEX, and Magnet Links. It can also be controlled via
|
||||||
XML-RPC over SCGI.")
|
XML-RPC over SCGI.")
|
||||||
(home-page "https://github.com/rakshasa/rtorrent")
|
(home-page "https://github.com/rakshasa/rtorrent")
|
||||||
(license l:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public tremc
|
(define-public tremc
|
||||||
(let ((commit "d8deaa5ac25bb45a2ca3a930309d6ecc74836a54")
|
(let ((commit "d8deaa5ac25bb45a2ca3a930309d6ecc74836a54")
|
||||||
@@ -354,7 +354,7 @@ XML-RPC over SCGI.")
|
|||||||
(description "Tremc is a console client, with a curses interface, for the
|
(description "Tremc is a console client, with a curses interface, for the
|
||||||
Transmission BitTorrent daemon.")
|
Transmission BitTorrent daemon.")
|
||||||
(home-page "https://github.com/tremc/tremc")
|
(home-page "https://github.com/tremc/tremc")
|
||||||
(license l:gpl3+))))
|
(license license:gpl3+))))
|
||||||
|
|
||||||
(define-public aria2
|
(define-public aria2
|
||||||
(package
|
(package
|
||||||
@@ -419,7 +419,7 @@ download utility. It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.
|
|||||||
Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
|
Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
|
||||||
(properties
|
(properties
|
||||||
'((release-monitoring-url . "https://github.com/aria2/aria2/releases")))
|
'((release-monitoring-url . "https://github.com/aria2/aria2/releases")))
|
||||||
(license l:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public uget
|
(define-public uget
|
||||||
(package
|
(package
|
||||||
@@ -453,7 +453,7 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.")
|
|||||||
"uGet is portable download manager with GTK+ interface supporting
|
"uGet is portable download manager with GTK+ interface supporting
|
||||||
HTTP, HTTPS, BitTorrent and Metalink, supporting multi-connection
|
HTTP, HTTPS, BitTorrent and Metalink, supporting multi-connection
|
||||||
downloads, download scheduling, download rate limiting.")
|
downloads, download scheduling, download rate limiting.")
|
||||||
(license l:lgpl2.1+)))
|
(license license:lgpl2.1+)))
|
||||||
|
|
||||||
(define-public mktorrent
|
(define-public mktorrent
|
||||||
(package
|
(package
|
||||||
@@ -488,8 +488,8 @@ files and whole directories. It can add multiple trackers and web seed URLs,
|
|||||||
and set the @code{private} flag to disallow advertisement through the
|
and set the @code{private} flag to disallow advertisement through the
|
||||||
distributed hash table (@dfn{DHT}) and Peer Exchange. Hashing is multi-threaded
|
distributed hash table (@dfn{DHT}) and Peer Exchange. Hashing is multi-threaded
|
||||||
and will take advantage of multiple processor cores where possible.")
|
and will take advantage of multiple processor cores where possible.")
|
||||||
(license (list l:public-domain ; sha1.*, used to build without OpenSSL
|
(license (list license:public-domain ; sha1.*, used to build without OpenSSL
|
||||||
l:gpl2+)))) ; with permission to link with OpenSSL
|
license:gpl2+)))) ; with permission to link with OpenSSL
|
||||||
|
|
||||||
(define-public libtorrent-rasterbar
|
(define-public libtorrent-rasterbar
|
||||||
(package
|
(package
|
||||||
@@ -541,7 +541,7 @@ and will take advantage of multiple processor cores where possible.")
|
|||||||
"libtorrent-rasterbar is a feature-complete C++ BitTorrent implementation
|
"libtorrent-rasterbar is a feature-complete C++ BitTorrent implementation
|
||||||
focusing on efficiency and scalability. It runs on embedded devices as well as
|
focusing on efficiency and scalability. It runs on embedded devices as well as
|
||||||
desktops.")
|
desktops.")
|
||||||
(license l:bsd-2)))
|
(license license:bsd-2)))
|
||||||
|
|
||||||
(define-public qbittorrent
|
(define-public qbittorrent
|
||||||
(package
|
(package
|
||||||
@@ -585,7 +585,7 @@ libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
|
|||||||
It aims to be a good alternative to all other BitTorrent clients out there.
|
It aims to be a good alternative to all other BitTorrent clients out there.
|
||||||
qBittorrent is fast, stable and provides unicode support as well as many
|
qBittorrent is fast, stable and provides unicode support as well as many
|
||||||
features.")
|
features.")
|
||||||
(license l:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public qbittorrent-no-x
|
(define-public qbittorrent-no-x
|
||||||
(let ((base qbittorrent))
|
(let ((base qbittorrent))
|
||||||
@@ -727,4 +727,4 @@ Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange
|
|||||||
speed limits. Deluge heavily utilises the libtorrent library. It is
|
speed limits. Deluge heavily utilises the libtorrent library. It is
|
||||||
designed to run as both a normal standalone desktop application and as a
|
designed to run as both a normal standalone desktop application and as a
|
||||||
client-server.")
|
client-server.")
|
||||||
(license l:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|||||||
@@ -95,8 +95,8 @@ supported content to the Kodi media center.")
|
|||||||
;; Arbitrary commit of branch master,
|
;; Arbitrary commit of branch master,
|
||||||
;; Update when updating uBlockOrigin.
|
;; Update when updating uBlockOrigin.
|
||||||
(let* ((name "ublock-main-assets")
|
(let* ((name "ublock-main-assets")
|
||||||
(commit "011eef4a5b36a7ebf4adedc486d96b77cfa25c54")
|
(commit "004af606e6a0efc22bc65ab1016b553441cacb71")
|
||||||
(revision "5")
|
(revision "6")
|
||||||
(version (git-version "0" revision commit)))
|
(version (git-version "0" revision commit)))
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -105,14 +105,14 @@ supported content to the Kodi media center.")
|
|||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0ng8a88zdvrxg30fz83gswjy27b3hfx9q11n2i715id7az7kqf9x")))))
|
(base32 "1bfd2d53flrkgvjcr1kj9nbxj4y9a4pcr7m3dycccdhd21x6k0ln")))))
|
||||||
|
|
||||||
(define ublock-prod-assets
|
(define ublock-prod-assets
|
||||||
;; Arbitrary commit of branch gh-pages,
|
;; Arbitrary commit of branch gh-pages,
|
||||||
;; Update when updating uBlockOrigin.
|
;; Update when updating uBlockOrigin.
|
||||||
(let* ((name "ublock-prod-assets")
|
(let* ((name "ublock-prod-assets")
|
||||||
(commit "6844322800de647da0c4fe06dd6a0b212a3942e4")
|
(commit "6c15e4ef91888c610caf73829dc78ae9549ed24a")
|
||||||
(revision "5")
|
(revision "6")
|
||||||
(version (git-version "0" revision commit)))
|
(version (git-version "0" revision commit)))
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -121,12 +121,12 @@ supported content to the Kodi media center.")
|
|||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "13vxq4z1wxivz5xklncxd2sj5aqkyhq919vzbbfp0fgh0imhikib")))))
|
(base32 "0n2h6drqh44b1zgl729bfr70n08mkm536a2vqgivw7dm5dmi8zd3")))))
|
||||||
|
|
||||||
(define ublock-origin
|
(define ublock-origin
|
||||||
(package
|
(package
|
||||||
(name "ublock-origin")
|
(name "ublock-origin")
|
||||||
(version "1.66.2")
|
(version "1.70.0")
|
||||||
(home-page "https://github.com/gorhill/uBlock")
|
(home-page "https://github.com/gorhill/uBlock")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -136,7 +136,7 @@ supported content to the Kodi media center.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"16ph031hb8bf4rxyxvm6jr0bxmy0snza11jfrbjgfb390gax9r63"))))
|
"0j1m80nz86yc69c42hv5di5zza0vkycqmjaydb9jgx0abcvi19x5"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(outputs '("xpi" "firefox" "chromium"))
|
(outputs '("xpi" "firefox" "chromium"))
|
||||||
(properties '((addon-id . "uBlock0@raymondhill.net")))
|
(properties '((addon-id . "uBlock0@raymondhill.net")))
|
||||||
|
|||||||
@@ -44,37 +44,17 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages build-tools)
|
(define-module (gnu packages build-tools)
|
||||||
#:use-module (ice-9 optargs)
|
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
|
||||||
#:use-module (gnu packages c)
|
|
||||||
#:use-module (guix build-system cmake)
|
|
||||||
#:use-module (guix build-system copy)
|
|
||||||
#:use-module (guix build-system gnu)
|
|
||||||
#:use-module (guix build-system guile)
|
|
||||||
#:use-module (guix build-system hare)
|
|
||||||
#:use-module (guix build-system meson)
|
|
||||||
#:use-module (guix build-system pyproject)
|
|
||||||
#:use-module (guix build-system python)
|
|
||||||
#:use-module (guix build-system trivial)
|
|
||||||
#:use-module (guix deprecation)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix gexp)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix modules)
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix search-paths)
|
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (gnu packages adns)
|
|
||||||
#:use-module (gnu packages algebra)
|
#:use-module (gnu packages algebra)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
|
#:use-module (gnu packages c)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages code)
|
#:use-module (gnu packages code)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages cpp)
|
#:use-module (gnu packages cpp)
|
||||||
#:use-module (gnu packages cppi)
|
#:use-module (gnu packages cppi)
|
||||||
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages elf)
|
#:use-module (gnu packages elf)
|
||||||
#:use-module (gnu packages gcc)
|
#:use-module (gnu packages gcc)
|
||||||
#:use-module (gnu packages guile)
|
#:use-module (gnu packages guile)
|
||||||
@@ -105,7 +85,27 @@
|
|||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages unicode)
|
#:use-module (gnu packages unicode)
|
||||||
#:use-module (gnu packages version-control)
|
#:use-module (gnu packages version-control)
|
||||||
#:use-module (gnu packages xml))
|
#:use-module (gnu packages xml)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
|
#:use-module (guix build-system copy)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system guile)
|
||||||
|
#:use-module (guix build-system hare)
|
||||||
|
#:use-module (guix build-system meson)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system trivial)
|
||||||
|
#:use-module (guix deprecation)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix modules)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix search-paths)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:use-module (ice-9 optargs))
|
||||||
|
|
||||||
(define-public acr
|
(define-public acr
|
||||||
(package
|
(package
|
||||||
@@ -196,7 +196,8 @@ according to the system capabilities and the user-selected options.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))))
|
"13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6"))
|
||||||
|
(patches (search-patches "bam-python3-compat.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:make-flags `(,(string-append "CC=" ,(cc-for-target))
|
`(#:make-flags `(,(string-append "CC=" ,(cc-for-target))
|
||||||
@@ -207,7 +208,7 @@ according to the system capabilities and the user-selected options.")
|
|||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(delete 'configure))))
|
(delete 'configure))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python" ,python-2)))
|
(list python-minimal-wrapper))
|
||||||
(inputs
|
(inputs
|
||||||
(list lua))
|
(list lua))
|
||||||
(home-page "https://matricks.github.io/bam/")
|
(home-page "https://matricks.github.io/bam/")
|
||||||
@@ -274,14 +275,14 @@ generate such a compilation database.")
|
|||||||
(define-public bmake
|
(define-public bmake
|
||||||
(package
|
(package
|
||||||
(name "bmake")
|
(name "bmake")
|
||||||
(version "20260313")
|
(version "20260406")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz"))
|
"http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0xgryknmv625idw37rq89mpl5rymwdb15j5w8zxwy1gf8b6z7j3n"))
|
(base32 "09nzd9v12n2pwxmf67056kzjnvxcpk5q2x1fs5qkrsk1ssh5yvpd"))
|
||||||
(patches (search-patches "bmake-run-check-separately.patch"))))
|
(patches (search-patches "bmake-run-check-separately.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
@@ -344,8 +345,8 @@ programs and other files depend.")
|
|||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public gn
|
(define-public gn
|
||||||
(let ((commit "ee5b7e32b961a9da1933e9f46a018ba6cac8ef60")
|
(let ((commit "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a")
|
||||||
(revision "2277")) ;as returned by `git describe`, used below
|
(revision "2354")) ;as returned by `git describe`, used below
|
||||||
(package
|
(package
|
||||||
(name "gn")
|
(name "gn")
|
||||||
(version (git-version "0.0" revision commit))
|
(version (git-version "0.0" revision commit))
|
||||||
@@ -355,7 +356,7 @@ programs and other files depend.")
|
|||||||
(uri (git-reference (url home-page) (commit commit)))
|
(uri (git-reference (url home-page) (commit commit)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"19kkvwxl66vlzlfppbq03fmi59i5g8a1yc71fsfgwqqmx4wywd6w"))
|
"0yz38czmbc72q1hkiv3cwxqh2i8ji2vkkvvk5ws2cjplmn2vj0x9"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
@@ -365,7 +366,8 @@ programs and other files depend.")
|
|||||||
(lambda _
|
(lambda _
|
||||||
(setenv "CC" "gcc")
|
(setenv "CC" "gcc")
|
||||||
(setenv "CXX" "g++")
|
(setenv "CXX" "g++")
|
||||||
(setenv "CXXFLAGS" "-g -O2 -Wno-error=redundant-move")
|
(setenv "CXXFLAGS"
|
||||||
|
"-g -O2 -Wno-error=redundant-move -Wno-error=comment")
|
||||||
(setenv "AR" "ar")))
|
(setenv "AR" "ar")))
|
||||||
(replace 'configure
|
(replace 'configure
|
||||||
(lambda _
|
(lambda _
|
||||||
|
|||||||
+3
-3
@@ -23,7 +23,7 @@
|
|||||||
;;; Copyright © 2023, 2024 David Elsing <david.elsing@posteo.net>
|
;;; Copyright © 2023, 2024 David Elsing <david.elsing@posteo.net>
|
||||||
;;; Copyright @ 2022, Kitzman <kitzman@disroot.org>
|
;;; Copyright @ 2022, Kitzman <kitzman@disroot.org>
|
||||||
;;; Copyright @ 2025 Dariqq <dariqq@posteo.net>
|
;;; Copyright @ 2025 Dariqq <dariqq@posteo.net>
|
||||||
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
;;; Copyright © 2025, 2026 Ashish SHUKLA <ashish.is@lostca.se>
|
||||||
;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
|
;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
|
||||||
;;; Copyright © 2026 Sharlatan Hellseher <sharlatanus@gmail.com>
|
;;; Copyright © 2026 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
@@ -1762,7 +1762,7 @@ string.h, but with a utf8* prefix instead of the str* prefix.")
|
|||||||
(define-public simdutf
|
(define-public simdutf
|
||||||
(package
|
(package
|
||||||
(name "simdutf")
|
(name "simdutf")
|
||||||
(version "7.7.1")
|
(version "9.0.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -1771,7 +1771,7 @@ string.h, but with a utf8* prefix instead of the str* prefix.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0kw4j4qqcfjaii667xa745pklj50m70nqq8cj5agj714acczbk7y"))))
|
(base32 "0f5ccvqj7pfa69m9y1kxp2v1lybx6x8i9pykdqfkr7dydqbhrhx6"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
|
(arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
|
||||||
(synopsis "SIMD Unicode validation and transcoding")
|
(synopsis "SIMD Unicode validation and transcoding")
|
||||||
|
|||||||
+26
-21
@@ -595,7 +595,11 @@ capacity is user-selectable.")
|
|||||||
version "/DVDStyler-" version ".tar.bz2"))
|
version "/DVDStyler-" version ".tar.bz2"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0n3mfjsazvlzk9hl23q3iz7bmxjq7b5lx0ab8nbk1jgl763k9cqb"))))
|
"0n3mfjsazvlzk9hl23q3iz7bmxjq7b5lx0ab8nbk1jgl763k9cqb"))
|
||||||
|
(snippet
|
||||||
|
#~(begin (delete-file "src/dvdvml.c")
|
||||||
|
(delete-file "src/dvdvmy.c")
|
||||||
|
(delete-file "src/dvdvmy.h")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
@@ -625,27 +629,28 @@ capacity is user-selectable.")
|
|||||||
#t)))
|
#t)))
|
||||||
#:tests? #f)) ; No tests.
|
#:tests? #f)) ; No tests.
|
||||||
(inputs ; TODO package bundled wxvillalib
|
(inputs ; TODO package bundled wxvillalib
|
||||||
`(("wxwidgets" ,wxwidgets)
|
(list bash-minimal ; for wrap-program
|
||||||
("wssvg" ,wxsvg)
|
cdrtools
|
||||||
("bash" ,bash-minimal) ; for wrap-program
|
dbus
|
||||||
("dbus" ,dbus)
|
dvd+rw-tools
|
||||||
("cdrtools" ,cdrtools)
|
dvdauthor
|
||||||
("dvd+rw-tools" ,dvd+rw-tools)
|
eudev
|
||||||
("dvdauthor" ,dvdauthor)
|
ffmpeg-4
|
||||||
("eudev" ,eudev)
|
fontconfig
|
||||||
("fontconfig" ,fontconfig)
|
libexif
|
||||||
("libexif" ,libexif)
|
libjpeg-turbo
|
||||||
("libjpeg" ,libjpeg-turbo)
|
wxsvg
|
||||||
("ffmpeg" ,ffmpeg-4)))
|
wxwidgets))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)
|
(list bison
|
||||||
("flex" ,flex)
|
docbook-xml
|
||||||
("python" ,python-2)
|
docbook-xsl
|
||||||
("xmlto" ,xmlto)
|
flex
|
||||||
("gettext" ,gettext-minimal)
|
gettext-minimal
|
||||||
("docbook-xml" ,docbook-xml)
|
pkg-config
|
||||||
("docbook-xsl" ,docbook-xsl)
|
python-minimal-wrapper
|
||||||
("zip" ,zip)))
|
xmlto
|
||||||
|
zip))
|
||||||
(synopsis "DVD authoring application")
|
(synopsis "DVD authoring application")
|
||||||
(description "DVDStyler is a DVD authoring application which allows users
|
(description "DVDStyler is a DVD authoring application which allows users
|
||||||
to burn video files in many formats to DVD discs, complete with individually
|
to burn video files in many formats to DVD discs, complete with individually
|
||||||
|
|||||||
+1
-25
@@ -3131,7 +3131,7 @@ time by mocking the datetime module.")
|
|||||||
(define-public python-flaky
|
(define-public python-flaky
|
||||||
(package
|
(package
|
||||||
(name "python-flaky")
|
(name "python-flaky")
|
||||||
(version "3.8.1")
|
(version "3.8.1") ; On bump, remove some skipped tests in python-cherrypy.
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (pypi-uri "flaky" version))
|
(uri (pypi-uri "flaky" version))
|
||||||
@@ -3719,30 +3719,6 @@ system. The code under test requires no modification to work with pyfakefs.")
|
|||||||
directories and files.")
|
directories and files.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public python-pytest-tornado5
|
|
||||||
(package
|
|
||||||
(name "python-pytest-tornado5")
|
|
||||||
(version "2.0.0")
|
|
||||||
(source (origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (pypi-uri "pytest-tornado5" version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0qb62jw2w0xr6y942yp0qxiy755bismjfpnxaxjjm05gy2pymr8d"))))
|
|
||||||
(build-system pyproject-build-system)
|
|
||||||
(arguments
|
|
||||||
;; Tests require pytest < 6
|
|
||||||
(list #:tests? #f))
|
|
||||||
(propagated-inputs (list python-pytest python-tornado))
|
|
||||||
(native-inputs (list python-setuptools python-wheel))
|
|
||||||
(home-page "https://github.com/vidartf/pytest-tornado")
|
|
||||||
(synopsis
|
|
||||||
"Fixtures and markers to simplify testing of Tornado applications")
|
|
||||||
(description
|
|
||||||
"This package provides a @code{py.test} plugin supplying fixtures and
|
|
||||||
markers to simplify testing of asynchronous tornado applications.")
|
|
||||||
(license license:asl2.0)))
|
|
||||||
|
|
||||||
(define-public guile-proba
|
(define-public guile-proba
|
||||||
(package
|
(package
|
||||||
(name "guile-proba")
|
(name "guile-proba")
|
||||||
|
|||||||
@@ -580,7 +580,7 @@ stored with user-specified precision.")
|
|||||||
python-sphinx))
|
python-sphinx))
|
||||||
(inputs
|
(inputs
|
||||||
(list fftwf
|
(list fftwf
|
||||||
`(,hwloc-2 "lib")
|
`(,hwloc "lib")
|
||||||
libtirpc
|
libtirpc
|
||||||
lmfit
|
lmfit
|
||||||
muparser
|
muparser
|
||||||
|
|||||||
+108
-66
@@ -79,11 +79,13 @@
|
|||||||
'("base/third_party/cityhash" ;Expat
|
'("base/third_party/cityhash" ;Expat
|
||||||
"base/third_party/double_conversion" ;BSD-3
|
"base/third_party/double_conversion" ;BSD-3
|
||||||
"base/third_party/icu" ;Unicode, X11-style
|
"base/third_party/icu" ;Unicode, X11-style
|
||||||
|
"base/third_party/nspr" ;MPL-2.0
|
||||||
"base/third_party/superfasthash" ;BSD-3
|
"base/third_party/superfasthash" ;BSD-3
|
||||||
"base/third_party/symbolize" ;BSD-3
|
"base/third_party/symbolize" ;BSD-3
|
||||||
"base/third_party/xdg_user_dirs" ;Expat
|
"base/third_party/xdg_user_dirs" ;Expat
|
||||||
|
"buildtools/third_party/libc++" ;BSD
|
||||||
|
"buildtools/third_party/libc++abi" ;BSD
|
||||||
"net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
|
"net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
|
||||||
"net/third_party/nss" ;MPL-2.0
|
|
||||||
"net/third_party/quiche" ;BSD-3
|
"net/third_party/quiche" ;BSD-3
|
||||||
"net/third_party/uri_template" ;ASL2.0
|
"net/third_party/uri_template" ;ASL2.0
|
||||||
"third_party/abseil-cpp" ;ASL2.0
|
"third_party/abseil-cpp" ;ASL2.0
|
||||||
@@ -104,8 +106,11 @@
|
|||||||
"third_party/catapult" ;BSD-3
|
"third_party/catapult" ;BSD-3
|
||||||
"third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
|
"third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
|
||||||
"third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
|
"third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
|
||||||
|
"third_party/catapult/third_party/beautifulsoup4-4.9.3" ;Expat
|
||||||
|
"third_party/catapult/third_party/html5lib-1.1" ;Expat
|
||||||
"third_party/catapult/third_party/polymer" ;BSD-3
|
"third_party/catapult/third_party/polymer" ;BSD-3
|
||||||
"third_party/catapult/third_party/six" ;Expat
|
"third_party/catapult/third_party/six" ;Expat
|
||||||
|
"third_party/catapult/third_party/typ" ;ASL2.0
|
||||||
;; XXX: This is a minified version of <https://d3js.org/>.
|
;; XXX: This is a minified version of <https://d3js.org/>.
|
||||||
"third_party/catapult/tracing/third_party/d3" ;BSD-3
|
"third_party/catapult/tracing/third_party/d3" ;BSD-3
|
||||||
"third_party/catapult/tracing/third_party/gl-matrix" ;Expat
|
"third_party/catapult/tracing/third_party/gl-matrix" ;Expat
|
||||||
@@ -120,19 +125,12 @@
|
|||||||
"third_party/cld_3" ;ASL2.0
|
"third_party/cld_3" ;ASL2.0
|
||||||
"third_party/closure_compiler" ;ASL2.0
|
"third_party/closure_compiler" ;ASL2.0
|
||||||
"third_party/compiler-rt" ;ASL2.0
|
"third_party/compiler-rt" ;ASL2.0
|
||||||
"third_party/compiler-rt/src/lib" ;ASL2.0
|
|
||||||
"third_party/compiler-rt/src/lib/builtins" ;ASL2.0
|
|
||||||
"third_party/content_analysis_sdk" ;BSD-3
|
"third_party/content_analysis_sdk" ;BSD-3
|
||||||
"third_party/cpuinfo" ;BSD-2
|
"third_party/cpuinfo" ;BSD-2
|
||||||
"third_party/crabbyavif" ;ASL2.0
|
"third_party/crabbyavif" ;ASL2.0
|
||||||
"third_party/crabbyavif/src/sys/dav1d-sys" ;ASL2.0
|
|
||||||
"third_party/crabbyavif/src/sys/aom-sys" ;ASL2.0
|
|
||||||
"third_party/crabbyavif/src/sys/libgav1-sys" ;ASL2.0
|
|
||||||
"third_party/crabbyavif/src/sys/libyuv-sys" ;ASL2.0
|
|
||||||
"third_party/crabbyavif/src/sys/ndk-sys" ;ASL2.0
|
|
||||||
"third_party/crashpad" ;ASL2.0
|
"third_party/crashpad" ;ASL2.0
|
||||||
"third_party/crashpad/crashpad/third_party/lss" ;ASL2.0
|
"third_party/crashpad/crashpad/third_party/lss" ;ASL2.0
|
||||||
"third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
|
"third_party/crashpad/crashpad/third_party/zlib" ;Zlib
|
||||||
"third_party/crc32c" ;BSD-3
|
"third_party/crc32c" ;BSD-3
|
||||||
"third_party/cros_system_api" ;BSD-3
|
"third_party/cros_system_api" ;BSD-3
|
||||||
"third_party/dav1d" ;BSD-2
|
"third_party/dav1d" ;BSD-2
|
||||||
@@ -140,19 +138,25 @@
|
|||||||
;; TODO: can likely be unbundled when Vulkan is updated.
|
;; TODO: can likely be unbundled when Vulkan is updated.
|
||||||
"third_party/dawn/third_party/khronos" ;ASL2.0
|
"third_party/dawn/third_party/khronos" ;ASL2.0
|
||||||
"third_party/dawn/third_party/gn/webgpu-cts" ;BSD-3
|
"third_party/dawn/third_party/gn/webgpu-cts" ;BSD-3
|
||||||
|
"third_party/dawn/third_party/renderdoc" ;Expat
|
||||||
|
"third_party/dawn/third_party/webgpu-headers" ;BSD-3
|
||||||
|
"third_party/depot_tools" ;BSD-3
|
||||||
|
"third_party/devscripts" ;GPL2.0
|
||||||
"third_party/devtools-frontend" ;BSD-3
|
"third_party/devtools-frontend" ;BSD-3
|
||||||
"third_party/devtools-frontend/src/front_end"
|
"third_party/devtools-frontend/src/front_end"
|
||||||
"third_party/devtools-frontend/src/front_end/third_party"
|
"third_party/devtools-frontend/src/front_end/third_party"
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
|
"third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
|
||||||
"third_party/devtools-frontend/src/front_end/third_party\
|
"third_party/devtools-frontend/src/front_end/third_party\
|
||||||
/additional_readme_paths.json" ;no explicit license; trivial
|
/additional_readme_paths.json" ;no explicit license; trivial
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
|
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0
|
"third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3
|
"third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
|
"third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
|
||||||
|
"third_party/devtools-frontend/src/front_end/third_party/csp_evaluator" ;BSD-3
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/diff" ;ASL2.0
|
"third_party/devtools-frontend/src/front_end/third_party/diff" ;ASL2.0
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0
|
"third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3
|
"third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3
|
||||||
|
"third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
|
||||||
|
"third_party/devtools-frontend/src/front_end/third_party/legacy-javascript" ;ASL-2.0
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
|
"third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/lit" ;BSD-3
|
"third_party/devtools-frontend/src/front_end/third_party/lit" ;BSD-3
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3
|
"third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3
|
||||||
@@ -164,10 +168,12 @@
|
|||||||
"third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/parsel" ; Expat
|
"third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/parsel" ; Expat
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs" ; ASL2.0
|
"third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs" ; ASL2.0
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay" ;ASL2.0
|
"third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay" ;ASL2.0
|
||||||
|
"third_party/devtools-frontend/src/front_end/third_party/source-map-scopes-codec" ;BSD-3
|
||||||
"third_party/devtools-frontend/src/front_end/third_party\
|
"third_party/devtools-frontend/src/front_end/third_party\
|
||||||
/vscode.web-custom-data" ;Expat
|
/vscode.web-custom-data" ;Expat
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/third-party-web" ;Expat
|
"third_party/devtools-frontend/src/front_end/third_party/third-party-web" ;Expat
|
||||||
"third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
|
"third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
|
||||||
|
"third_party/devtools-frontend/src/front_end/third_party/web-vitals" ;Expat
|
||||||
"third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0
|
"third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0
|
||||||
"third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0
|
"third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0
|
||||||
|
|
||||||
@@ -179,6 +185,7 @@
|
|||||||
"third_party/farmhash" ;Expat
|
"third_party/farmhash" ;Expat
|
||||||
"third_party/fast_float" ;ASL2.0, Boost1.0, Expat
|
"third_party/fast_float" ;ASL2.0, Boost1.0, Expat
|
||||||
"third_party/fdlibm" ;non-copyleft
|
"third_party/fdlibm" ;non-copyleft
|
||||||
|
"third_party/federated_compute/chromium/fcp/confidentialcompute" ;ASL2.0
|
||||||
"third_party/federated_compute/src/fcp/base" ;ASL2.0
|
"third_party/federated_compute/src/fcp/base" ;ASL2.0
|
||||||
"third_party/federated_compute/src/fcp/confidentialcompute" ;ASL2.0
|
"third_party/federated_compute/src/fcp/confidentialcompute" ;ASL2.0
|
||||||
"third_party/federated_compute/src/fcp/protos/confidentialcompute" ;ASL2.0
|
"third_party/federated_compute/src/fcp/protos/confidentialcompute" ;ASL2.0
|
||||||
@@ -187,7 +194,9 @@
|
|||||||
"third_party/fft2d" ;non-copyleft
|
"third_party/fft2d" ;non-copyleft
|
||||||
"third_party/flatbuffers" ;ASL2.0
|
"third_party/flatbuffers" ;ASL2.0
|
||||||
"third_party/fp16" ;Expat
|
"third_party/fp16" ;Expat
|
||||||
|
"third_party/freetype" ;GPL2.0
|
||||||
"third_party/fusejs" ;ASL2.0
|
"third_party/fusejs" ;ASL2.0
|
||||||
|
"third_party/fxdiv" ;Expat
|
||||||
"third_party/gemmlowp" ;ASL2.0
|
"third_party/gemmlowp" ;ASL2.0
|
||||||
"third_party/google_input_tools" ;ASL2.0
|
"third_party/google_input_tools" ;ASL2.0
|
||||||
"third_party/google_input_tools/third_party/closure_library" ;ASL2.0
|
"third_party/google_input_tools/third_party/closure_library" ;ASL2.0
|
||||||
@@ -196,6 +205,9 @@
|
|||||||
"third_party/harfbuzz-ng" ;Expat
|
"third_party/harfbuzz-ng" ;Expat
|
||||||
"third_party/highway" ;ASL2.0
|
"third_party/highway" ;ASL2.0
|
||||||
"third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
|
"third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
|
||||||
|
"third_party/hyphenation-patterns" ;Expat
|
||||||
|
;; FIXME: Our icu does not have some headers such as udatamem.h.
|
||||||
|
"third_party/icu" ;Unicode3.0
|
||||||
"third_party/ink" ;ASL2.0
|
"third_party/ink" ;ASL2.0
|
||||||
"third_party/ink_stroke_modeler" ;ASL2.0
|
"third_party/ink_stroke_modeler" ;ASL2.0
|
||||||
"third_party/inspector_protocol" ;BSD-3
|
"third_party/inspector_protocol" ;BSD-3
|
||||||
@@ -208,12 +220,14 @@
|
|||||||
"third_party/libaddressinput" ;ASL2.0
|
"third_party/libaddressinput" ;ASL2.0
|
||||||
"third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
|
"third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
|
||||||
"third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3
|
"third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3
|
||||||
"third_party/libaom/source/libaom/third_party/SVT-AV1" ;BSD-3
|
|
||||||
"third_party/libaom/source/libaom/third_party/vector" ;Expat
|
"third_party/libaom/source/libaom/third_party/vector" ;Expat
|
||||||
"third_party/libaom/source/libaom/third_party/x86inc" ;ISC
|
"third_party/libaom/source/libaom/third_party/x86inc" ;ISC
|
||||||
|
"third_party/libc++" ;Expat
|
||||||
"third_party/libdrm" ; Expat
|
"third_party/libdrm" ; Expat
|
||||||
"third_party/libgav1" ;ASL2.0
|
"third_party/libgav1" ;ASL2.0
|
||||||
"third_party/libjingle_xmpp" ;BSD-3
|
"third_party/libjingle_xmpp" ;BSD-3
|
||||||
|
"third_party/libpfm4" ;BSD
|
||||||
|
"third_party/libpng" ;PNG2.0
|
||||||
"third_party/libphonenumber" ;ASL2.0
|
"third_party/libphonenumber" ;ASL2.0
|
||||||
"third_party/libsecret" ;LGPL2.1+
|
"third_party/libsecret" ;LGPL2.1+
|
||||||
"third_party/libsrtp" ;BSD-3
|
"third_party/libsrtp" ;BSD-3
|
||||||
@@ -227,11 +241,15 @@
|
|||||||
"third_party/libvpx/source/libvpx/third_party/x86inc" ;Expat
|
"third_party/libvpx/source/libvpx/third_party/x86inc" ;Expat
|
||||||
|
|
||||||
"third_party/libwebm" ;BSD-3
|
"third_party/libwebm" ;BSD-3
|
||||||
|
"third_party/libx11" ;BSD
|
||||||
|
"third_party/libxcb-keysyms" ;BSD
|
||||||
"third_party/libxml/chromium" ;BSD-3
|
"third_party/libxml/chromium" ;BSD-3
|
||||||
"third_party/libyuv" ;BSD-3
|
"third_party/libyuv" ;BSD-3
|
||||||
"third_party/libzip" ;BSD-3
|
"third_party/libzip" ;BSD-3
|
||||||
"third_party/lit" ;BSD-3
|
"third_party/lit" ;BSD-3
|
||||||
"third_party/lit/v3_0" ;BSD-3
|
"third_party/lit/v3_0" ;BSD-3
|
||||||
|
"third_party/llvm-libc" ;ASL2.0
|
||||||
|
"third_party/llvm-libc/src/shared" ;ASL2.0
|
||||||
"third_party/lottie" ;Expat
|
"third_party/lottie" ;Expat
|
||||||
"third_party/lss" ;BSD-3
|
"third_party/lss" ;BSD-3
|
||||||
"third_party/lzma_sdk" ;public domain
|
"third_party/lzma_sdk" ;public domain
|
||||||
@@ -244,6 +262,7 @@
|
|||||||
"third_party/modp_b64" ;BSD-3
|
"third_party/modp_b64" ;BSD-3
|
||||||
"third_party/nasm" ;BSD-2
|
"third_party/nasm" ;BSD-2
|
||||||
"third_party/nearby" ;ASL2.0
|
"third_party/nearby" ;ASL2.0
|
||||||
|
"third_party/neon_2_sse" ;BSD-2
|
||||||
"third_party/node" ;Expat
|
"third_party/node" ;Expat
|
||||||
"third_party/oak/chromium/proto" ;ASL2.0
|
"third_party/oak/chromium/proto" ;ASL2.0
|
||||||
"third_party/oak/chromium/proto/attestation" ;ASL2.0
|
"third_party/oak/chromium/proto/attestation" ;ASL2.0
|
||||||
@@ -251,14 +270,20 @@
|
|||||||
"third_party/one_euro_filter" ;BSD-3
|
"third_party/one_euro_filter" ;BSD-3
|
||||||
"third_party/openscreen" ;BSD-3
|
"third_party/openscreen" ;BSD-3
|
||||||
"third_party/openscreen/src/third_party/tinycbor" ;Expat
|
"third_party/openscreen/src/third_party/tinycbor" ;Expat
|
||||||
|
"third_party/opus" ;BSD-3
|
||||||
"third_party/ots" ;BSD-3
|
"third_party/ots" ;BSD-3
|
||||||
"third_party/pdfium" ;BSD-3
|
"third_party/pdfium" ;BSD-3
|
||||||
"third_party/pdfium/third_party/agg23" ;Expat
|
"third_party/pdfium/third_party/agg23" ;Expat
|
||||||
"third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
|
"third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
|
||||||
|
"third_party/pdfium/third_party/lcms" ;Expat
|
||||||
|
"third_party/pdfium/third_party/libopenjpeg" ;BDS-2
|
||||||
"third_party/pdfium/third_party/libtiff" ;non-copyleft
|
"third_party/pdfium/third_party/libtiff" ;non-copyleft
|
||||||
"third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
|
"third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
|
||||||
"third_party/perfetto" ;ASL2.0
|
"third_party/perfetto" ;ASL2.0
|
||||||
"third_party/perfetto/protos/third_party/chromium" ;BSD-3
|
"third_party/perfetto/protos/third_party/chromium" ;BSD-3
|
||||||
|
"third_party/perfetto/protos/third_party/pprof" ;ASL2.0
|
||||||
|
"third_party/perfetto/protos/third_party/primes" ;ASL2.0
|
||||||
|
"third_party/perfetto/protos/third_party/simpleperf" ;ASL2.0
|
||||||
"third_party/pffft" ;the "FFTPACK" license
|
"third_party/pffft" ;the "FFTPACK" license
|
||||||
"third_party/ply" ;BSD-3
|
"third_party/ply" ;BSD-3
|
||||||
"third_party/polymer" ;BSD-3
|
"third_party/polymer" ;BSD-3
|
||||||
@@ -268,6 +293,7 @@
|
|||||||
"third_party/protobuf/third_party/utf8_range" ; Expat
|
"third_party/protobuf/third_party/utf8_range" ; Expat
|
||||||
"third_party/pthreadpool" ;BSD-2
|
"third_party/pthreadpool" ;BSD-2
|
||||||
"third_party/puffin" ;Non-copyleft
|
"third_party/puffin" ;Non-copyleft
|
||||||
|
"third_party/pyyaml" ;Expat
|
||||||
"third_party/pyjson5" ;ASL2.0
|
"third_party/pyjson5" ;ASL2.0
|
||||||
"third_party/rapidhash" ;BSD-2
|
"third_party/rapidhash" ;BSD-2
|
||||||
"third_party/readability" ;ASL2.0
|
"third_party/readability" ;ASL2.0
|
||||||
@@ -279,11 +305,14 @@
|
|||||||
"third_party/search_engines_data" ;BSD-3
|
"third_party/search_engines_data" ;BSD-3
|
||||||
"third_party/securemessage" ;ASL2.0
|
"third_party/securemessage" ;ASL2.0
|
||||||
"third_party/selenium-atoms" ;ASL2.0
|
"third_party/selenium-atoms" ;ASL2.0
|
||||||
|
"third_party/sentencepiece" ;ASL2.0
|
||||||
|
"third_party/sentencepiece/src/third_party/darts_clone" ;BSD-3
|
||||||
"third_party/shell-encryption" ;ASL2.0
|
"third_party/shell-encryption" ;ASL2.0
|
||||||
"third_party/simdutf" ;Non-copyleft
|
"third_party/simdutf" ;Non-copyleft
|
||||||
"third_party/simplejson" ; Non-copyleft
|
"third_party/simplejson" ; Non-copyleft
|
||||||
|
"third_party/six" ;Expat
|
||||||
"third_party/skia" ;BSD-3
|
"third_party/skia" ;BSD-3
|
||||||
"third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
|
"third_party/skia/include/third_party/vulkan" ;BSD-3
|
||||||
"third_party/smhasher" ;Expat, public domain
|
"third_party/smhasher" ;Expat, public domain
|
||||||
|
|
||||||
;; FIXME: the snappy "replacement" shim (see replace_gn_files.py below) does
|
;; FIXME: the snappy "replacement" shim (see replace_gn_files.py below) does
|
||||||
@@ -338,7 +367,6 @@
|
|||||||
"third_party/webrtc/modules/third_party/fft" ;Non-copyleft
|
"third_party/webrtc/modules/third_party/fft" ;Non-copyleft
|
||||||
"third_party/webrtc/modules/third_party/g711" ;Public domain
|
"third_party/webrtc/modules/third_party/g711" ;Public domain
|
||||||
"third_party/webrtc/modules/third_party/g722" ;Public domain
|
"third_party/webrtc/modules/third_party/g722" ;Public domain
|
||||||
"third_party/webrtc/rtc_base/third_party/sigslot" ;Public domain
|
|
||||||
"third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
|
"third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
|
||||||
"third_party/woff2" ;ASL2.0
|
"third_party/woff2" ;ASL2.0
|
||||||
"third_party/wuffs" ;ASL2.0
|
"third_party/wuffs" ;ASL2.0
|
||||||
@@ -372,7 +400,7 @@
|
|||||||
;; run the Blink performance tests, just remove everything to save ~70MiB.
|
;; run the Blink performance tests, just remove everything to save ~70MiB.
|
||||||
'("third_party/blink/perf_tests"))
|
'("third_party/blink/perf_tests"))
|
||||||
|
|
||||||
(define %chromium-version "141.0.7390.65")
|
(define %chromium-version "147.0.7727.55")
|
||||||
(define %ungoogled-revision (string-append %chromium-version "-1"))
|
(define %ungoogled-revision (string-append %chromium-version "-1"))
|
||||||
(define %debian-revision (string-append "debian/" %ungoogled-revision))
|
(define %debian-revision (string-append "debian/" %ungoogled-revision))
|
||||||
|
|
||||||
@@ -384,7 +412,7 @@
|
|||||||
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
|
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1hk4rww2gccly1qv0xnswd77haj02rlza82403dxdjm8fkdfndy6"))))
|
"0l6v4wf16067igawjlh90f3d287mkw0cq4j5lvrxxy17y1skynzc"))))
|
||||||
|
|
||||||
(define %debian-origin
|
(define %debian-origin
|
||||||
(origin
|
(origin
|
||||||
@@ -397,7 +425,7 @@
|
|||||||
((_ version) version))))
|
((_ version) version))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"06s3kvwb3490xb28n6r3q5n1c0ylsvchiw6s4h1rrp8jqzwjbmc6"))))
|
"0gqarll08i7rcs1amapciv263xvzglc8p44ikavq3xd12yyvcd98"))))
|
||||||
|
|
||||||
(define (origin-file origin file)
|
(define (origin-file origin file)
|
||||||
(computed-file
|
(computed-file
|
||||||
@@ -410,26 +438,38 @@
|
|||||||
|
|
||||||
(define %debian-patches
|
(define %debian-patches
|
||||||
(map debian-patch
|
(map debian-patch
|
||||||
'("bookworm/clang19.patch"
|
'("bookworm/foreach.patch"
|
||||||
"bookworm/foreach.patch"
|
"debianization/safe-libcxx.patch"
|
||||||
|
"disable/enterprise-tests.patch"
|
||||||
"disable/node-version-ck.patch"
|
"disable/node-version-ck.patch"
|
||||||
|
"disable/rustc-allow-features.patch"
|
||||||
|
"fixes/bytemuck.patch"
|
||||||
"fixes/gentoo-stylesheet.patch"
|
"fixes/gentoo-stylesheet.patch"
|
||||||
"fixes/libcpp-headers.patch"
|
"fixes/libcpp-headers.patch"
|
||||||
|
"fixes/libpng-testonly.patch"
|
||||||
"fixes/rust-clanglib.patch"
|
"fixes/rust-clanglib.patch"
|
||||||
|
"llvm-19/clang19.patch"
|
||||||
|
"llvm-19/clone-traits.patch"
|
||||||
|
"llvm-19/keyfactory.patch"
|
||||||
|
"llvm-19/value-or.patch"
|
||||||
|
"llvm-22/ignore-for-ubsan.patch"
|
||||||
"system/openjpeg.patch"
|
"system/openjpeg.patch"
|
||||||
;; Remove after rust is past
|
"trixie/cookie-string-view.patch"
|
||||||
;; <https://github.com/rust-lang/rust/pull/141061>.
|
"trixie/nodejs-main.patch")))
|
||||||
"trixie/rust-no-alloc-shim.patch")))
|
|
||||||
|
|
||||||
(define %guix-patches
|
(define %guix-patches
|
||||||
(list (local-file
|
(list (local-file
|
||||||
(assume-valid-file-name
|
(assume-valid-file-name
|
||||||
(search-patch
|
(search-patch
|
||||||
"ungoogled-chromium-extension-search-path.patch")))
|
"ungoogled-chromium-custom-compiler.patch")))
|
||||||
(local-file
|
(local-file
|
||||||
(assume-valid-file-name
|
(assume-valid-file-name
|
||||||
(search-patch
|
(search-patch
|
||||||
"ungoogled-chromium-unbundle-icu-target.patch")))
|
"ungoogled-chromium-empty-parsed-rustc-args.patch")))
|
||||||
|
(local-file
|
||||||
|
(assume-valid-file-name
|
||||||
|
(search-patch
|
||||||
|
"ungoogled-chromium-extension-search-path.patch")))
|
||||||
(local-file
|
(local-file
|
||||||
(assume-valid-file-name
|
(assume-valid-file-name
|
||||||
(search-patch
|
(search-patch
|
||||||
@@ -500,9 +540,8 @@
|
|||||||
"#if 0"))
|
"#if 0"))
|
||||||
(invoke "python" "build/linux/unbundle/replace_gn_files.py"
|
(invoke "python" "build/linux/unbundle/replace_gn_files.py"
|
||||||
"--system-libraries" "flac" "fontconfig" "freetype"
|
"--system-libraries" "flac" "fontconfig" "freetype"
|
||||||
"harfbuzz-ng" "icu" "libjpeg"
|
"harfbuzz-ng" "libjpeg" "libpng" "libwebp" "libxml"
|
||||||
"libpng" "libwebp" "libxml" "libxslt" "openh264" "opus"
|
"libxslt" "openh264" "opus" "zlib")))))
|
||||||
"zlib")))))
|
|
||||||
|
|
||||||
(define opus+custom
|
(define opus+custom
|
||||||
(package/inherit opus
|
(package/inherit opus
|
||||||
@@ -531,7 +570,7 @@
|
|||||||
%chromium-version "-lite.tar.xz"))
|
%chromium-version "-lite.tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"09iwglswnr6d45zz3zsjw7jpm1xlwwkxlz9h5nlhqxyd933a04fq"))
|
"1salvlw5sykx3zmsbp7cgmf7y8yy6jlgb4b4zswzsbjrprk4jnap"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet (force ungoogled-chromium-snippet))))
|
(snippet (force ungoogled-chromium-snippet))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
@@ -548,6 +587,7 @@
|
|||||||
;; directory for an exhaustive list of supported flags.
|
;; directory for an exhaustive list of supported flags.
|
||||||
;; (Note: The 'configure' phase will do that for you.)
|
;; (Note: The 'configure' phase will do that for you.)
|
||||||
#~(list "is_debug=false"
|
#~(list "is_debug=false"
|
||||||
|
"is_component_build=false"
|
||||||
;; Use the "official" release optimizations, as opposed to
|
;; Use the "official" release optimizations, as opposed to
|
||||||
;; a developer build.
|
;; a developer build.
|
||||||
"is_official_build=true"
|
"is_official_build=true"
|
||||||
@@ -555,6 +595,7 @@
|
|||||||
"use_clang_modules=false"
|
"use_clang_modules=false"
|
||||||
"use_custom_libcxx=false" ; support for this is deprecated and to be removed.
|
"use_custom_libcxx=false" ; support for this is deprecated and to be removed.
|
||||||
"optimize_webui=false"
|
"optimize_webui=false"
|
||||||
|
"webnn_use_tflite=false"
|
||||||
"safe_browsing_use_unrar=false"
|
"safe_browsing_use_unrar=false"
|
||||||
"chrome_pgo_phase=0"
|
"chrome_pgo_phase=0"
|
||||||
"use_sysroot=false"
|
"use_sysroot=false"
|
||||||
@@ -572,12 +613,10 @@
|
|||||||
"enable_service_discovery=false"
|
"enable_service_discovery=false"
|
||||||
"enable_vr=false"
|
"enable_vr=false"
|
||||||
"enable_enterprise_companion=false"
|
"enable_enterprise_companion=false"
|
||||||
"enable_glic=false"
|
|
||||||
"enable_iterator_debugging=false"
|
"enable_iterator_debugging=false"
|
||||||
"enable_hangout_services_extension=false"
|
"enable_hangout_services_extension=false"
|
||||||
"enable_widevine=false"
|
"enable_widevine=false"
|
||||||
;; Disable type-checking for the Web UI to avoid a Java dependency.
|
"fatal_linker_warnings=false"
|
||||||
"enable_js_type_check=false"
|
|
||||||
;; Disable code using TensorFlow until it has been scrutinized
|
;; Disable code using TensorFlow until it has been scrutinized
|
||||||
;; by the ungoogled project.
|
;; by the ungoogled project.
|
||||||
"build_with_tflite_lib=false"
|
"build_with_tflite_lib=false"
|
||||||
@@ -589,6 +628,11 @@
|
|||||||
"angle_has_histograms=false"
|
"angle_has_histograms=false"
|
||||||
"angle_build_tests=false"
|
"angle_build_tests=false"
|
||||||
"build_angle_perftests=false"
|
"build_angle_perftests=false"
|
||||||
|
"enable_perfetto_unittests=false"
|
||||||
|
"skia_enable_skshapper_tests=false"
|
||||||
|
"tint_build_unittests=false"
|
||||||
|
"enable_nocompile_tests=false"
|
||||||
|
"enable_screen_ai_browsertests=false"
|
||||||
|
|
||||||
"clang_warning_suppression_file=\"\""
|
"clang_warning_suppression_file=\"\""
|
||||||
|
|
||||||
@@ -597,6 +641,8 @@
|
|||||||
"is_cfi=false"
|
"is_cfi=false"
|
||||||
|
|
||||||
"symbol_level=0"
|
"symbol_level=0"
|
||||||
|
"blink_symbol_level=0"
|
||||||
|
"v8_symbol_level=0"
|
||||||
"v8_enable_backtrace=false"
|
"v8_enable_backtrace=false"
|
||||||
|
|
||||||
;; Define a custom toolchain that simply looks up CC, AR and
|
;; Define a custom toolchain that simply looks up CC, AR and
|
||||||
@@ -628,26 +674,10 @@
|
|||||||
;; invokation and fails if it's just the version number.
|
;; invokation and fails if it's just the version number.
|
||||||
" (f6e511eec 2024-10-15) (built from a source tarball)\"")
|
" (f6e511eec 2024-10-15) (built from a source tarball)\"")
|
||||||
|
|
||||||
;; Chromium's build/rust/std/BUILD.gn has a hardcoded
|
|
||||||
;; list of stdlib rlibs (stdlib_files) that GN uses to
|
|
||||||
;; declare build outputs. GN requires static output
|
|
||||||
;; declarations, so the list must exactly match what
|
|
||||||
;; rlibs exist in the Rust sysroot. Chromium's list
|
|
||||||
;; includes unicode_width because their bundled
|
|
||||||
;; toolchain (Rust 1.89) ships it as a dependency of
|
|
||||||
;; getopts 0.2.23. Our Rust 1.93 has getopts 0.2.24
|
|
||||||
;; which dropped that dependency, so unicode_width is
|
|
||||||
;; not in our sysroot. This GN arg removes it from
|
|
||||||
;; the list. (Chromium's own use of unicode_width via
|
|
||||||
;; codespan-reporting is a separate vendored copy under
|
|
||||||
;; third_party/rust/chromium_crates_io/ and is
|
|
||||||
;; unaffected.)
|
|
||||||
"removed_rust_stdlib_libs=[\"unicode_width\"]"
|
|
||||||
|
|
||||||
;; Prefer system libraries.
|
;; Prefer system libraries.
|
||||||
"use_system_freetype=true"
|
"use_system_freetype=true"
|
||||||
"use_system_harfbuzz=true"
|
"use_system_harfbuzz=true"
|
||||||
"use_system_icu=true"
|
"use_system_icu=false"
|
||||||
"use_system_lcms2=true"
|
"use_system_lcms2=true"
|
||||||
"use_system_libffi=true"
|
"use_system_libffi=true"
|
||||||
"use_system_libjpeg=true"
|
"use_system_libjpeg=true"
|
||||||
@@ -713,9 +743,9 @@
|
|||||||
|
|
||||||
;; Many files try to include ICU headers from "third_party/icu/...".
|
;; Many files try to include ICU headers from "third_party/icu/...".
|
||||||
;; Remove the "third_party/" prefix to use system headers instead.
|
;; Remove the "third_party/" prefix to use system headers instead.
|
||||||
(substitute* (find-files "chrome" "\\.cc$")
|
;(substitute* (find-files "chrome" "\\.cc$")
|
||||||
(("third_party/icu/source/(common|i18n)/")
|
; (("third_party/icu/source/(common|i18n)/")
|
||||||
""))
|
; ""))
|
||||||
|
|
||||||
;; XXX: Should be unnecessary when use_system_lcms2=true.
|
;; XXX: Should be unnecessary when use_system_lcms2=true.
|
||||||
(substitute* "third_party/pdfium/core/fxcodec/icc/icc_transform.h"
|
(substitute* "third_party/pdfium/core/fxcodec/icc/icc_transform.h"
|
||||||
@@ -732,16 +762,19 @@
|
|||||||
(("include \"third_party/curl")
|
(("include \"third_party/curl")
|
||||||
"include \"curl"))
|
"include \"curl"))
|
||||||
|
|
||||||
;; Unknown flags as of clang-19, can be removed when building with
|
;; Our clang libs and rustfmt are not under bindgen root directory.
|
||||||
;; newer clang.
|
(substitute* '("build/rust/rust_bindgen_generator.gni"
|
||||||
(substitute* "build/config/compiler/BUILD.gn"
|
"build/rust/rust_bindgen.gni")
|
||||||
(("-gsimple-template-names") ""))
|
|
||||||
|
|
||||||
;; Clang libs are not under bindgen root directory.
|
|
||||||
(substitute* "build/rust/rust_bindgen_generator.gni"
|
|
||||||
(("(_libclang_path = )rust_bindgen_root" _ libclang)
|
(("(_libclang_path = )rust_bindgen_root" _ libclang)
|
||||||
(string-append libclang "clang_base_path"))))))
|
(string-append libclang "clang_base_path"))
|
||||||
(add-after 'patch-stuff 'add-absolute-references
|
(("(_rustfmt_path = \")\\$\\{rust_bindgen_root\\}" _ rustfmt)
|
||||||
|
(string-append rustfmt "${rust_sysroot_absolute}"))))))
|
||||||
|
(add-after 'patch-stuff 'include-pthreadpool
|
||||||
|
;; FIXME: Somehow the build system cannot locate this header.
|
||||||
|
(lambda _
|
||||||
|
(copy-file "third_party/pthreadpool/src/include/pthreadpool.h"
|
||||||
|
"pthreadpool.h")))
|
||||||
|
(add-after 'include-pthreadpool 'add-absolute-references
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(let ((cups-config (search-input-file inputs "/bin/cups-config"))
|
(let ((cups-config (search-input-file inputs "/bin/cups-config"))
|
||||||
(libnssckbi.so (search-input-file inputs
|
(libnssckbi.so (search-input-file inputs
|
||||||
@@ -763,13 +796,22 @@
|
|||||||
(add-after 'add-absolute-references 'adjust-CPLUS_INCLUDE_PATH
|
(add-after 'add-absolute-references 'adjust-CPLUS_INCLUDE_PATH
|
||||||
;; The libcxx include/c++/v1 directory is not exposed via
|
;; The libcxx include/c++/v1 directory is not exposed via
|
||||||
;; CPLUS_INCLUDE_PATH by default, causing errors like
|
;; CPLUS_INCLUDE_PATH by default, causing errors like
|
||||||
;; "fatal error: 'format' file not found".
|
;; "fatal error: 'format' file not found". Also clang is
|
||||||
|
;; unable to find gcc's bits/c++config.h which is machine
|
||||||
|
;; dependent.
|
||||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||||
(setenv "CPLUS_INCLUDE_PATH"
|
(let* ((libcxx-v1 (search-input-directory inputs
|
||||||
(string-append
|
"include/c++/v1"))
|
||||||
(search-input-directory inputs
|
(target-system #$(nix-system->gnu-triplet
|
||||||
"/include/c++/v1")
|
(or (%current-target-system)
|
||||||
":" (getenv "CPLUS_INCLUDE_PATH")))))
|
(%current-system))))
|
||||||
|
(target-include (string-append "include/c++/"
|
||||||
|
target-system))
|
||||||
|
(gcc-bits (search-input-directory inputs
|
||||||
|
target-include)))
|
||||||
|
(setenv "CPLUS_INCLUDE_PATH"
|
||||||
|
(string-append libcxx-v1 ":" gcc-bits ":"
|
||||||
|
(getenv "CPLUS_INCLUDE_PATH"))))))
|
||||||
(add-before 'configure 'prepare-build-environment
|
(add-before 'configure 'prepare-build-environment
|
||||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||||
(let ((node (search-input-file (or native-inputs inputs)
|
(let ((node (search-input-file (or native-inputs inputs)
|
||||||
@@ -955,7 +997,7 @@
|
|||||||
glib
|
glib
|
||||||
gtk+
|
gtk+
|
||||||
harfbuzz
|
harfbuzz
|
||||||
icu4c
|
icu4c-77
|
||||||
lcms
|
lcms
|
||||||
libcxx
|
libcxx
|
||||||
libffi
|
libffi
|
||||||
|
|||||||
+423
-126
@@ -18,10 +18,10 @@
|
|||||||
|
|
||||||
;;; This module is separate from (gnu packages rust-apps) to avoid a
|
;;; This module is separate from (gnu packages rust-apps) to avoid a
|
||||||
;;; circular module dependency: (gnu packages rust-sources), which
|
;;; circular module dependency: (gnu packages rust-sources), which
|
||||||
;;; defines rust-codex-0.98.0, transitively loads (gnu packages
|
;;; defines rust-codex-0.120.0, transitively loads (gnu packages
|
||||||
;;; rust-apps) through its #:use-module chain. If the codex package
|
;;; rust-apps) through its #:use-module chain. If the codex package
|
||||||
;;; lived in rust-apps.scm, loading rust-sources would trigger loading
|
;;; lived in rust-apps.scm, loading rust-sources would trigger loading
|
||||||
;;; rust-apps before rust-codex-0.98.0 is defined, causing an unbound
|
;;; rust-apps before rust-codex-0.120.0 is defined, causing an unbound
|
||||||
;;; variable error.
|
;;; variable error.
|
||||||
|
|
||||||
(define-module (gnu packages codex)
|
(define-module (gnu packages codex)
|
||||||
@@ -36,33 +36,41 @@
|
|||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages cmake)
|
#:use-module (gnu packages cmake)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages libunwind)
|
#:use-module (gnu packages libunwind)
|
||||||
#:use-module (gnu packages llvm)
|
#:use-module (gnu packages llvm)
|
||||||
|
#:use-module (gnu packages lsof)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages rust-sources)
|
#:use-module (gnu packages rust-sources)
|
||||||
#:use-module (gnu packages sqlite)
|
#:use-module (gnu packages sqlite)
|
||||||
|
#:use-module (gnu packages textutils)
|
||||||
|
#:use-module (gnu packages nss)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages version-control))
|
#:use-module (gnu packages version-control)
|
||||||
|
#:use-module (gnu packages virtualization))
|
||||||
|
|
||||||
(define-public codex
|
(define-public codex
|
||||||
(package
|
(package
|
||||||
(name "codex")
|
(name "codex")
|
||||||
(version (package-version rust-codex-0.98.0))
|
(version (package-version rust-codex-0.120.0))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(inherit (package-source rust-codex-0.98.0))
|
(inherit (package-source rust-codex-0.120.0))
|
||||||
(patches (search-patches
|
(patches (search-patches
|
||||||
"codex-0.98.0-remove-patch-sections.patch"
|
"codex-acp-0.11.1-disable-code-mode.patch"
|
||||||
|
"rust-codex-0.117.0-remove-patch-sections.patch"
|
||||||
|
"rust-codex-0.120.0-connectors-cache-test-race.patch"
|
||||||
|
"rust-codex-0.120.0-remove-libwebrtc.patch"
|
||||||
"rust-codex-0.98.0-test-shebangs.patch"
|
"rust-codex-0.98.0-test-shebangs.patch"
|
||||||
"rust-codex-0.98.0-test-timeout.patch"))))
|
"rust-codex-0.120.0-test-timeout.patch"))))
|
||||||
(build-system cargo-build-system)
|
(build-system cargo-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:install-source? #f
|
#:install-source? #f
|
||||||
#:cargo-install-paths '(list "cli" "exec" "exec-server"
|
#:cargo-install-paths '(list "cli" "exec" "exec-server"
|
||||||
"linux-sandbox" "mcp-server" "network-proxy"
|
"linux-sandbox" "mcp-server"
|
||||||
"app-server" "tui")
|
"app-server" "tui")
|
||||||
;; schema_fixtures_match_generated (upstream fixture is stale:
|
;; schema_fixtures_match_generated (upstream fixture is stale:
|
||||||
;; FileChange::Update in codex-protocol gained old_content,
|
;; FileChange::Update in codex-protocol gained old_content,
|
||||||
@@ -71,72 +79,55 @@
|
|||||||
#:cargo-test-flags '(list "--workspace"
|
#:cargo-test-flags '(list "--workspace"
|
||||||
"--exclude" "codex-app-server-protocol"
|
"--exclude" "codex-app-server-protocol"
|
||||||
"--"
|
"--"
|
||||||
;; These tests exercise sandbox denial and
|
;;; BEGIN Landlock returns NotEnforced
|
||||||
;; escalation, which requires Landlock to
|
;;; in the build container; the sandbox
|
||||||
;; cleanly deny filesystem access. Inside the
|
;;; binary panics instead of cleanly
|
||||||
;; build container Landlock returns NotEnforced
|
;;; denying filesystem access.
|
||||||
;; and the sandbox binary panics instead.
|
;; Sandbox denial and escalation tests.
|
||||||
;; Disabling Landlock would not help either,
|
|
||||||
;; since these tests need a working sandbox to
|
|
||||||
;; have anything to deny and escalate.
|
|
||||||
"--skip" "sandbox_denied_shell_returns_original_output"
|
"--skip" "sandbox_denied_shell_returns_original_output"
|
||||||
|
;; Sandbox denial and escalation tests.
|
||||||
"--skip" "shell_escalated_permissions_rejected_then_ok"
|
"--skip" "shell_escalated_permissions_rejected_then_ok"
|
||||||
|
;; Sandbox denial and escalation tests.
|
||||||
"--skip" "unified_exec_runs_under_sandbox"
|
"--skip" "unified_exec_runs_under_sandbox"
|
||||||
;; These tests (in codex-exec) directly call
|
;; codex-exec: spawn_command_under_linux_sandbox
|
||||||
;; spawn_command_under_linux_sandbox to verify
|
;; panics with LandlockRestrict (exit 101).
|
||||||
;; that python and bash work correctly inside
|
|
||||||
;; the Landlock sandbox. The sandbox binary
|
|
||||||
;; (codex-exec) panics with LandlockRestrict
|
|
||||||
;; (exit code 101) before the inner command
|
|
||||||
;; even starts.
|
|
||||||
"--skip" "python_getpwuid_works_under_sandbox"
|
"--skip" "python_getpwuid_works_under_sandbox"
|
||||||
|
;; Same as above.
|
||||||
"--skip" "python_multiprocessing_lock_works_under_sandbox"
|
"--skip" "python_multiprocessing_lock_works_under_sandbox"
|
||||||
|
;; Same as above.
|
||||||
"--skip" "sandbox_distinguishes_command_and_policy_cwds"
|
"--skip" "sandbox_distinguishes_command_and_policy_cwds"
|
||||||
;; These linux-sandbox tests directly invoke
|
;; linux-sandbox: process_exec_tool_call
|
||||||
;; the Landlock sandbox via
|
;; invokes Landlock; same panic.
|
||||||
;; process_exec_tool_call; same root cause.
|
|
||||||
"--skip" "test_writable_root"
|
"--skip" "test_writable_root"
|
||||||
|
;; Same as above.
|
||||||
"--skip" "test_timeout"
|
"--skip" "test_timeout"
|
||||||
|
;; Same as above.
|
||||||
"--skip" "test_root_read"
|
"--skip" "test_root_read"
|
||||||
|
;; Same as above.
|
||||||
"--skip" "test_dev_null_write"
|
"--skip" "test_dev_null_write"
|
||||||
|
;; Same as above.
|
||||||
"--skip" "test_no_new_privs_is_enabled"
|
"--skip" "test_no_new_privs_is_enabled"
|
||||||
;; This test iterates many approval scenarios;
|
;; One scenario runs through Landlock
|
||||||
;; one of them
|
;; which panics; cargo --skip cannot
|
||||||
;; (danger_full_access_on_request_allows_network)
|
;; target individual scenarios.
|
||||||
;; runs a command through the Landlock sandbox
|
|
||||||
;; binary, which panics with LandlockRestrict
|
|
||||||
;; inside the build container. Cargo --skip
|
|
||||||
;; cannot target individual scenarios, so we
|
|
||||||
;; skip the entire matrix.
|
|
||||||
"--skip" "approval_matrix_covers_all_modes"
|
"--skip" "approval_matrix_covers_all_modes"
|
||||||
;; This test verifies session-level patch
|
;; Landlock panic triggers escalation-retry
|
||||||
;; approval caching: approve once, skip
|
;; which interferes with the approval cache.
|
||||||
;; future prompts for the same file. When
|
|
||||||
;; Landlock is unavailable (as in the Guix
|
|
||||||
;; build container) the sandbox binary panics,
|
|
||||||
;; triggering the escalation-retry path, which
|
|
||||||
;; interferes with the approval cache and
|
|
||||||
;; causes a spurious re-prompt on the second
|
|
||||||
;; patch.
|
|
||||||
"--skip" "approving_apply_patch_for_session_skips_future_prompts_for_same_file"
|
"--skip" "approving_apply_patch_for_session_skips_future_prompts_for_same_file"
|
||||||
;; These tests expect to interrupt a
|
;; These tests expect to interrupt a
|
||||||
;; long-running 'sleep 60' and receive
|
;; long-running 'sleep 60' and receive
|
||||||
;; TurnAborted. Default test config is
|
;; TurnAborted. What happens:
|
||||||
;; OnRequest + ReadOnly. What happens:
|
|
||||||
;;
|
;;
|
||||||
;; 1. ReadOnly wraps the command with
|
;; 1. ReadOnly wraps the command with
|
||||||
;; codex-linux-sandbox (Landlock-based).
|
;; codex-linux-sandbox (Landlock-based).
|
||||||
;; 2. Landlock is unavailable in the Guix
|
;; 2. Landlock is unavailable, so the
|
||||||
;; build container, so the sandbox
|
;; sandbox binary exits instantly.
|
||||||
;; binary exits instantly (~1 ms).
|
|
||||||
;; 3. Orchestrator gets SandboxErr::Denied.
|
;; 3. Orchestrator gets SandboxErr::Denied.
|
||||||
;; wants_no_sandbox_approval(OnRequest)
|
;; wants_no_sandbox_approval(OnRequest)
|
||||||
;; returns false (sandboxing.rs:222),
|
;; returns false, so no escalation --
|
||||||
;; so no escalation -- denial returned
|
;; denial returned directly.
|
||||||
;; directly.
|
|
||||||
;; 4. ToolEmitter::finish sends the error
|
;; 4. ToolEmitter::finish sends the error
|
||||||
;; to the mock model as
|
;; to the mock model.
|
||||||
;; function_call_output.
|
|
||||||
;; 5. Second mock SSE response fires,
|
;; 5. Second mock SSE response fires,
|
||||||
;; turn finishes with TurnComplete.
|
;; turn finishes with TurnComplete.
|
||||||
;; 6. Op::Interrupt arrives 100 ms later,
|
;; 6. Op::Interrupt arrives 100 ms later,
|
||||||
@@ -150,74 +141,213 @@
|
|||||||
;; has only one mock response (so the turn
|
;; has only one mock response (so the turn
|
||||||
;; cannot complete first).
|
;; cannot complete first).
|
||||||
"--skip" "interrupt_persists_turn_aborted_marker_in_next_request"
|
"--skip" "interrupt_persists_turn_aborted_marker_in_next_request"
|
||||||
|
;; Same causal chain as above.
|
||||||
"--skip" "interrupt_tool_records_history_entries"
|
"--skip" "interrupt_tool_records_history_entries"
|
||||||
;; Upstream bug: test hardcodes "0.0.0" in the
|
;; WorkspaceWrite sandbox policy wraps
|
||||||
;; expected user-agent string but the workspace
|
;; commands with codex-linux-sandbox;
|
||||||
;; version is "0.98.0".
|
;; Landlock panics, command never runs,
|
||||||
"--skip" "get_user_agent_returns_current_codex_user_agent"
|
;; exit_code is None instead of Some(0).
|
||||||
;; Same upstream bug: mcp-server tests
|
"--skip" "request_permissions_grants_apply_to_later_exec_command_calls"
|
||||||
;; check the initialize response which
|
;; Same root cause.
|
||||||
;; includes "version": "0.0.0" but the
|
"--skip" "request_permissions_grants_apply_to_later_shell_command_calls"
|
||||||
;; server returns "0.98.0".
|
;; Same root cause.
|
||||||
|
"--skip" "partial_request_permissions_grants_do_not_preapprove_new_permissions"
|
||||||
|
;;; END Landlock
|
||||||
|
;;; BEGIN mcp_process.rs initialize
|
||||||
|
;;; assertion expects "version":"0.0.0"
|
||||||
|
;;; but the server returns "0.120.0".
|
||||||
"--skip" "test_codex_tool_passes_base_instructions"
|
"--skip" "test_codex_tool_passes_base_instructions"
|
||||||
"--skip" "test_shell_command_approval_triggers_elicitation"
|
"--skip" "test_shell_command_approval_triggers_elicitation"
|
||||||
"--skip" "test_patch_approval_triggers_elicitation"
|
"--skip" "test_patch_approval_triggers_elicitation"
|
||||||
;; These codex-exec-server tests need
|
;;; END version mismatch
|
||||||
;; "dotslash", a Meta tool that lazily
|
;;; BEGIN Test isolation bug:
|
||||||
;; downloads pre-built binaries from a
|
;;; unique_temp_dir() in
|
||||||
;; JSON manifest. The test helper
|
;;; state/src/runtime.rs names dirs
|
||||||
;; create_transport runs
|
;;; using nanosecond timestamps, so
|
||||||
;; `dotslash -- fetch <path>` to obtain a
|
;;; parallel tests can collide. The
|
||||||
;; custom bash binary described in
|
;;; SQLite migration runs CREATE TABLE
|
||||||
;; exec-server/tests/suite/bash.
|
;;; threads (without IF NOT EXISTS),
|
||||||
;; dotslash is not available in the build
|
;;; so the second init panics with
|
||||||
;; container.
|
;;; "table threads already exists".
|
||||||
"--skip" "list_tools"
|
|
||||||
"--skip" "accept_elicitation_for_prompt_rule"
|
|
||||||
;;; Test isolation bug: each test in
|
|
||||||
;;; state/src/runtime.rs calls
|
|
||||||
;;; unique_temp_dir() to get its own
|
|
||||||
;;; temporary directory (and thus its
|
|
||||||
;;; own SQLite database). That function
|
|
||||||
;;; names directories using the current
|
|
||||||
;;; nanosecond timestamp, so when tests
|
|
||||||
;;; run in parallel several can receive
|
|
||||||
;;; the same name and open the same
|
|
||||||
;;; database. The initial SQLite
|
|
||||||
;;; migration runs CREATE TABLE threads
|
|
||||||
;;; (without IF NOT EXISTS), so any init
|
|
||||||
;;; after the first panics with "table
|
|
||||||
;;; threads already exists". Any of
|
|
||||||
;;; these tests
|
|
||||||
;;; can be the victim.
|
|
||||||
"--skip" "init_removes_legacy_state_db_files"
|
"--skip" "init_removes_legacy_state_db_files"
|
||||||
"--skip" "upsert_and_get_thread_memory"
|
"--skip" "upsert_and_get_thread_memory"
|
||||||
"--skip" "get_last_n_thread_memories_for_cwd_matches_exactly"
|
"--skip" "get_last_n_thread_memories_for_cwd_matches_exactly"
|
||||||
"--skip" "upsert_thread_memory_errors_for_unknown_thread"
|
"--skip" "upsert_thread_memory_errors_for_unknown_thread"
|
||||||
"--skip" "get_last_n_thread_memories_for_cwd_zero_returns_empty"
|
"--skip" "get_last_n_thread_memories_for_cwd_zero_returns_empty"
|
||||||
"--skip" "get_last_n_thread_memories_for_cwd_does_not_prefix_match"
|
"--skip" "get_last_n_thread_memories_for_cwd_does_not_prefix_match"
|
||||||
"--skip" "deleting_thread_cascades_thread_memory")
|
"--skip" "deleting_thread_cascades_thread_memory"
|
||||||
|
;;; END SQLite test isolation
|
||||||
|
;; The test spawns 'sh' after
|
||||||
|
;; env_clear() with an empty env map;
|
||||||
|
;; glibc execvp uses confstr(_CS_PATH)
|
||||||
|
;; ("/bin:/usr/bin") when PATH is
|
||||||
|
;; unset, but /bin/sh does not exist
|
||||||
|
;; in the build container.
|
||||||
|
"--skip" "cancellation_expiration_keeps_process_alive_until_terminated"
|
||||||
|
;; Proxy baseline_policy returns 403
|
||||||
|
;; "not_allowed_local" for example.com;
|
||||||
|
;; test expects 200.
|
||||||
|
"--skip" "managed_network_proxy_decider_survives_full_access_start"
|
||||||
|
;;; BEGIN bash_snapshot_script() uses
|
||||||
|
;;; "compgen -e" to list exports but
|
||||||
|
;;; bash-minimal lacks programmable
|
||||||
|
;;; completion; export section is empty.
|
||||||
|
;; stdout.contains("VALID_NAME") fails.
|
||||||
|
"--skip" "bash_snapshot_filters_invalid_exports"
|
||||||
|
;; stdout.contains("MULTILINE_CERT") fails.
|
||||||
|
"--skip" "bash_snapshot_preserves_multiline_exports"
|
||||||
|
;; snapshot.contains("PATH") fails.
|
||||||
|
"--skip" "linux_bash_snapshot_includes_sections"
|
||||||
|
;;; END compgen
|
||||||
|
;; substitute* patches PAGER to store
|
||||||
|
;; path of cat; test expects bare "cat".
|
||||||
|
"--skip" "unified_exec_env_injects_defaults"
|
||||||
|
;;; BEGIN V8 disabled (codex-code-mode
|
||||||
|
;;; default-features = false).
|
||||||
|
"--skip" "suite::code_mode::"
|
||||||
|
"--skip" "suite::js_repl::"
|
||||||
|
"--skip" "suite::view_image::js_repl_"
|
||||||
|
;;; END V8 disabled
|
||||||
|
;;; BEGIN same compgen root cause:
|
||||||
|
;;; assert_posix_snapshot_sections
|
||||||
|
;;; asserts snapshot.contains("PATH").
|
||||||
|
"--skip" "linux_shell_command_uses_shell_snapshot"
|
||||||
|
"--skip" "linux_unified_exec_uses_shell_snapshot"
|
||||||
|
"--skip" "shell_command_snapshot_still_intercepts_apply_patch"
|
||||||
|
;;; END compgen / shell snapshot
|
||||||
|
;;; BEGIN These sandbox tests set
|
||||||
|
;;; exclude_slash_tmp: true which makes
|
||||||
|
;;; bwrap exclude /tmp from its mount
|
||||||
|
;;; namespace. Since Guix builds under
|
||||||
|
;;; /tmp, the codex-linux-sandbox binary
|
||||||
|
;;; becomes invisible to bwrap even though
|
||||||
|
;;; the test adds the helper dir as a
|
||||||
|
;;; filesystem carve-out -- the parent /tmp
|
||||||
|
;;; bind-mount is absent so the carve-out
|
||||||
|
;;; has nothing to carve out of.
|
||||||
|
"--skip" "sandbox_reenables_writable_subpaths_under_unreadable_parents"
|
||||||
|
"--skip" "managed_proxy_mode_routes_through_bridge_and_blocks_direct_egress"
|
||||||
|
;;; END exclude_slash_tmp
|
||||||
|
;; Expects 3 TerminalInteraction events
|
||||||
|
;; across timed poll windows; under CPU
|
||||||
|
;; contention events merge into 2.
|
||||||
|
"--skip" "unified_exec_terminal_interaction_captures_delayed_output"
|
||||||
|
;;; BEGIN assert_parallel_duration
|
||||||
|
;;; requires < 1600 ms for parallel ops.
|
||||||
|
;; Two 300 ms test_sync_tool calls.
|
||||||
|
"--skip" "read_file_tools_run_in_parallel"
|
||||||
|
;; Two "sleep 0.25" shell commands.
|
||||||
|
"--skip" "shell_tools_run_in_parallel"
|
||||||
|
;; One test_sync_tool + one shell sleep.
|
||||||
|
"--skip" "mixed_parallel_tools_run_in_parallel"
|
||||||
|
;;; END assert_parallel_duration
|
||||||
|
;; Asserts elapsed >= 4500 ms and
|
||||||
|
;; < 5800 ms for a 5 s timeout; under
|
||||||
|
;; contention elapsed drifts past 5800.
|
||||||
|
"--skip" "remote_models_request_times_out_after_5s"
|
||||||
|
;; Queued inter-agent mail must be
|
||||||
|
;; injected between the reasoning/
|
||||||
|
;; commentary item and the gate release;
|
||||||
|
;; under contention the gate fires before
|
||||||
|
;; the mail is processed, so the snapshot
|
||||||
|
;; shows the stale function_call instead
|
||||||
|
;; of the expected mail message.
|
||||||
|
"--skip" "queued_inter_agent_mail_triggers_follow_up_after_commentary_message_item"
|
||||||
|
;; Same root cause: snapshot mismatch at
|
||||||
|
;; pending_input.rs assert_two_responses_
|
||||||
|
;; input_snapshot; expects mail at position
|
||||||
|
;; 04 but gets function_call/shell instead.
|
||||||
|
"--skip" "queued_inter_agent_mail_triggers_follow_up_after_reasoning_item"
|
||||||
|
;;; BEGIN DNS for hostnames like
|
||||||
|
;;; example.com fails in the build
|
||||||
|
;;; sandbox. host_resolves_to_non_
|
||||||
|
;;; public_ip() in runtime.rs treats
|
||||||
|
;;; failed DNS as non-public and
|
||||||
|
;;; returns NotAllowedLocal, so tests
|
||||||
|
;;; expecting Allowed or Decider get
|
||||||
|
;;; Deny/BaselinePolicy instead.
|
||||||
|
"--skip" "host_blocked_requires_allowlist_match"
|
||||||
|
"--skip" "add_allowed_domain_removes_matching_deny_entry"
|
||||||
|
"--skip" "host_blocked_subdomain_wildcards_exclude_apex"
|
||||||
|
"--skip" "host_blocked_global_wildcard_allowlist_allows_public_hosts_except_denylist"
|
||||||
|
"--skip" "evaluate_host_policy_emits_domain_event_for_decider_ask"
|
||||||
|
"--skip" "evaluate_host_policy_emits_domain_event_for_decider_allow_override"
|
||||||
|
"--skip" "http_connect_accept_blocks_in_limited_mode"
|
||||||
|
"--skip" "http_connect_accept_allows_allowlisted_host_in_full_mode"
|
||||||
|
"--skip" "mitm_policy_blocks_disallowed_method_and_records_telemetry"
|
||||||
|
;;; END DNS failure / NotAllowedLocal
|
||||||
|
;;; BEGIN Flaky: wiremock mock expects
|
||||||
|
;;; 1 POST to /codex/safety/arc but
|
||||||
|
;;; receives 0. Passes in some builds,
|
||||||
|
;;; fails in others with identical code
|
||||||
|
;;; and env. The identical custom_
|
||||||
|
;;; variant always passes; only the
|
||||||
|
;;; CODEX_APPS_MCP_SERVER_NAME variant
|
||||||
|
;;; flakes, suggesting a timing race
|
||||||
|
;;; in the async POST under contention.
|
||||||
|
"--skip" "approve_mode_blocks_when_arc_returns_interrupt_for_model"
|
||||||
|
"--skip" "approve_mode_blocks_when_arc_returns_interrupt_without_annotations"
|
||||||
|
;;; END ARC monitor flake
|
||||||
|
;;; BEGIN nss-certs sets SSL_CERT_FILE
|
||||||
|
;;; which makes build_reqwest_client load
|
||||||
|
;;; 171 CA certs via add_root_certificate.
|
||||||
|
;;; This changes the reqwest TLS backend
|
||||||
|
;;; configuration; the ARC safety POST to
|
||||||
|
;;; the localhost mock server never arrives
|
||||||
|
;;; (wiremock expects 1 request, gets 0).
|
||||||
|
"--skip" "approve_mode_blocks_when_arc_returns_interrupt_for_model"
|
||||||
|
"--skip" "approve_mode_blocks_when_arc_returns_interrupt_without_annotations"
|
||||||
|
;;; END nss-certs / ARC monitor
|
||||||
|
;; Upstream bug: JsonRpcConnection has
|
||||||
|
;; no websocket keepalive or read timeout.
|
||||||
|
;; When the exec-server is killed, the
|
||||||
|
;; client's reader task blocks on
|
||||||
|
;; websocket_reader.next() forever because
|
||||||
|
;; TCP doesn't detect the dead peer without
|
||||||
|
;; a write or keepalive probe. Previously
|
||||||
|
;; masked because empty env made "sleep 10"
|
||||||
|
;; fail instantly; with PATH the process
|
||||||
|
;; lives long enough to hit the deadlock.
|
||||||
|
"--skip" "remote_exec_process_reports_transport_disconnect"
|
||||||
|
;; 500 ms timeout on MCP list response
|
||||||
|
;; (mcp_server_status.rs timeout at
|
||||||
|
;; Duration::from_millis(500)). With
|
||||||
|
;; nss-certs TLS now works, so the
|
||||||
|
;; startup plugin sync HTTP requests
|
||||||
|
;; (chatgpt.com, api.github.com) wait
|
||||||
|
;; for TCP timeout instead of failing
|
||||||
|
;; instantly at TLS, eating the budget.
|
||||||
|
"--skip" "mcp_server_status_list_tools_and_auth_only_skips_slow_inventory_calls")
|
||||||
#:cargo-package-crates
|
#:cargo-package-crates
|
||||||
''(;;; Tier 0: No internal deps.
|
''(;;; Tier 0: No internal deps.
|
||||||
|
"codex-ansi-escape"
|
||||||
"codex-async-utils"
|
"codex-async-utils"
|
||||||
|
"codex-backend-openapi-models"
|
||||||
"codex-client"
|
"codex-client"
|
||||||
"codex-execpolicy"
|
"codex-execpolicy"
|
||||||
"codex-file-search"
|
"codex-file-search"
|
||||||
"codex-git"
|
"codex-git-utils"
|
||||||
"codex-keyring-store"
|
"codex-keyring-store"
|
||||||
|
"codex-process-hardening"
|
||||||
"codex-utils-absolute-path"
|
"codex-utils-absolute-path"
|
||||||
"codex-utils-cache"
|
"codex-utils-cache"
|
||||||
"codex-utils-cargo-bin"
|
"codex-utils-cargo-bin"
|
||||||
|
"codex-utils-elapsed"
|
||||||
|
"codex-utils-fuzzy-match"
|
||||||
"codex-utils-home-dir"
|
"codex-utils-home-dir"
|
||||||
"codex-utils-json-to-toml"
|
"codex-utils-json-to-toml"
|
||||||
|
"codex-utils-path"
|
||||||
|
"codex-utils-plugins"
|
||||||
"codex-utils-pty"
|
"codex-utils-pty"
|
||||||
"codex-utils-readiness"
|
"codex-utils-readiness"
|
||||||
|
"codex-utils-rustls-provider"
|
||||||
|
"codex-utils-sleep-inhibitor"
|
||||||
|
"codex-utils-stream-parser"
|
||||||
"codex-utils-string"
|
"codex-utils-string"
|
||||||
"codex-backend-openapi-models"
|
"codex-utils-template"
|
||||||
"codex-process-hardening"
|
;;; Tier 1.
|
||||||
"codex-ansi-escape"
|
|
||||||
;;; Tier 1: Depends on tier 0.
|
|
||||||
"codex-utils-image"
|
"codex-utils-image"
|
||||||
|
"codex-utils-output-truncation"
|
||||||
"codex-apply-patch"
|
"codex-apply-patch"
|
||||||
"codex-protocol"
|
"codex-protocol"
|
||||||
"codex-windows-sandbox"
|
"codex-windows-sandbox"
|
||||||
@@ -226,35 +356,60 @@
|
|||||||
"codex-secrets"
|
"codex-secrets"
|
||||||
"codex-execpolicy-legacy"
|
"codex-execpolicy-legacy"
|
||||||
"codex-debug-client"
|
"codex-debug-client"
|
||||||
|
"codex-analytics"
|
||||||
|
"codex-rollout"
|
||||||
|
"codex-terminal-detection"
|
||||||
|
"codex-utils-approval-presets"
|
||||||
|
"codex-utils-cli"
|
||||||
;;; Tier 2.
|
;;; Tier 2.
|
||||||
"codex-app-server-protocol"
|
"codex-app-server-protocol"
|
||||||
"codex-rmcp-client"
|
"codex-rmcp-client"
|
||||||
"codex-otel"
|
"codex-otel"
|
||||||
"codex-state"
|
"codex-state"
|
||||||
"codex-core"
|
"codex-features"
|
||||||
"codex-linux-sandbox"
|
"codex-config"
|
||||||
|
"codex-hooks"
|
||||||
|
"codex-instructions"
|
||||||
|
"codex-code-mode"
|
||||||
"codex-feedback"
|
"codex-feedback"
|
||||||
|
"codex-skills"
|
||||||
|
"codex-core"
|
||||||
|
"codex-utils-sandbox-summary"
|
||||||
|
"codex-linux-sandbox"
|
||||||
|
"codex-sandboxing"
|
||||||
|
"codex-connectors"
|
||||||
|
"codex-core-skills"
|
||||||
;;; Tier 3.
|
;;; Tier 3.
|
||||||
"codex-arg0"
|
"codex-arg0"
|
||||||
"codex-lmstudio"
|
"codex-lmstudio"
|
||||||
"codex-login"
|
"codex-login"
|
||||||
"codex-ollama"
|
"codex-ollama"
|
||||||
"codex-common"
|
"codex-utils-oss"
|
||||||
"codex-mcp-server"
|
"codex-mcp-server"
|
||||||
"codex-backend-client"
|
"codex-backend-client"
|
||||||
"codex-responses-api-proxy"
|
"codex-responses-api-proxy"
|
||||||
|
"codex-shell-command"
|
||||||
|
"codex-shell-escalation"
|
||||||
|
"codex-plugin"
|
||||||
|
"codex-model-provider-info"
|
||||||
|
"codex-models-manager"
|
||||||
;;; Tier 4.
|
;;; Tier 4.
|
||||||
"codex-cloud-requirements"
|
"codex-cloud-requirements"
|
||||||
"codex-exec"
|
"codex-exec"
|
||||||
"codex-exec-server"
|
"codex-exec-server"
|
||||||
"codex-stdio-to-uds"
|
|
||||||
"codex-network-proxy"
|
"codex-network-proxy"
|
||||||
|
"codex-stdio-to-uds"
|
||||||
"codex-chatgpt"
|
"codex-chatgpt"
|
||||||
"codex-cloud-tasks-client"
|
"codex-cloud-tasks-client"
|
||||||
|
"codex-cloud-tasks-mock-client"
|
||||||
|
"codex-tools"
|
||||||
|
"codex-mcp"
|
||||||
|
"codex-collaboration-mode-templates"
|
||||||
;;; Tier 5.
|
;;; Tier 5.
|
||||||
"codex-app-server"
|
"codex-app-server"
|
||||||
"codex-app-server-test-client"
|
"codex-app-server-test-client"
|
||||||
"codex-tui"
|
"codex-tui"
|
||||||
|
"codex-response-debug-context"
|
||||||
;;; Tier 6.
|
;;; Tier 6.
|
||||||
"codex-cloud-tasks"
|
"codex-cloud-tasks"
|
||||||
;; The main executable.
|
;; The main executable.
|
||||||
@@ -270,7 +425,7 @@
|
|||||||
;; Update them to match the actual package version.
|
;; Update them to match the actual package version.
|
||||||
(let ((snap-files (find-files "." "\\.snap$")))
|
(let ((snap-files (find-files "." "\\.snap$")))
|
||||||
(substitute* snap-files
|
(substitute* snap-files
|
||||||
(("\\(v0\\.0\\.0\\) ") "(v0.98.0)")))))
|
(("\\(v0\\.0\\.0\\) ") "(v0.120.0) ")))))
|
||||||
(add-after 'chdir-to-workspace 'patch-git-deps-to-vendor
|
(add-after 'chdir-to-workspace 'patch-git-deps-to-vendor
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Replace git dependencies with version references so cargo
|
;; Replace git dependencies with version references so cargo
|
||||||
@@ -279,23 +434,34 @@
|
|||||||
(("nucleo = \\{ git = [^}]+\\}")
|
(("nucleo = \\{ git = [^}]+\\}")
|
||||||
"nucleo = \"0.5.0\"")
|
"nucleo = \"0.5.0\"")
|
||||||
(("runfiles = \\{ git = [^}]+\\}")
|
(("runfiles = \\{ git = [^}]+\\}")
|
||||||
"runfiles = \"0.1.0\""))))
|
"runfiles = \"0.1.0\""))
|
||||||
(add-after 'chdir-to-workspace 'add-version-to-workspace-deps
|
;; Remove workspace members that have unbuildable deps
|
||||||
|
;; (libwebrtc requires git fetch, v8-poc requires V8).
|
||||||
|
(substitute* "Cargo.toml"
|
||||||
|
(("\"v8-poc\",") "")
|
||||||
|
(("\"code-mode\",") ""))
|
||||||
|
;; Disable V8 runtime in codex-code-mode: remove path
|
||||||
|
;; so cargo resolves it from the vendor (where it has
|
||||||
|
;; optional = true on v8) and disable default features.
|
||||||
|
(substitute* "Cargo.toml"
|
||||||
|
(("codex-code-mode = \\{ path = \"code-mode\" \\}")
|
||||||
|
"codex-code-mode = { version = \"0.120.0\", default-features = false }"))))
|
||||||
|
(add-after 'patch-git-deps-to-vendor 'add-version-to-workspace-deps
|
||||||
(lambda _
|
(lambda _
|
||||||
;; cargo package requires all dependencies to have versions.
|
;; cargo package requires all dependencies to have versions.
|
||||||
;; cargo package requires all dependencies to have versions.
|
;; cargo package requires all dependencies to have versions.
|
||||||
;; Add version = "0.98.0" to internal path dependencies.
|
;; Add version = "0.120.0" to internal path dependencies.
|
||||||
(let ((cargo-files (find-files "." "^Cargo\\.toml$")))
|
(let ((cargo-files (find-files "." "^Cargo\\.toml$")))
|
||||||
(substitute* cargo-files
|
(substitute* cargo-files
|
||||||
;; Handle inline deps: name = { path = "..." }
|
;; Handle inline deps: name = { path = "..." }
|
||||||
(("(codex-[a-z0-9-]+) = \\{ path = " all name)
|
(("(codex-[a-z0-9-]+) = \\{ path = " all name)
|
||||||
(string-append name " = { version = \"0.98.0\", path = "))
|
(string-append name " = { version = \"0.120.0\", path = "))
|
||||||
;; Handle inline deps with package: name = { package = "...", path = "..." }
|
;; Handle inline deps with package: name = { package = "...", path = "..." }
|
||||||
(("(codex-[a-z0-9-]+) = \\{ package = " all name)
|
(("(codex-[a-z0-9-]+) = \\{ package = " all name)
|
||||||
(string-append name " = { version = \"0.98.0\", package = "))
|
(string-append name " = { version = \"0.120.0\", package = "))
|
||||||
;; Handle section deps: [dependencies.X] with path = "..."
|
;; Handle section deps: [dependencies.X] with path = "..."
|
||||||
(("^(path = \"\\.\\./[^\"]*\")" all path-line)
|
(("^(path = \"\\.\\./[^\"]*\")" all path-line)
|
||||||
(string-append path-line "\nversion = \"0.98.0\""))))))
|
(string-append path-line "\nversion = \"0.120.0\""))))))
|
||||||
(add-after 'chdir-to-workspace 'patch-hardcoded-paths
|
(add-after 'chdir-to-workspace 'patch-hardcoded-paths
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(let ((bash-bin (string-append
|
(let ((bash-bin (string-append
|
||||||
@@ -325,6 +491,14 @@
|
|||||||
(string-append "\"" bash-bin "/bash "))
|
(string-append "\"" bash-bin "/bash "))
|
||||||
(("\"/bin/sh ")
|
(("\"/bin/sh ")
|
||||||
(string-append "\"" bash-bin "/sh "))
|
(string-append "\"" bash-bin "/sh "))
|
||||||
|
;; Single-quoted paths in test assertion strings,
|
||||||
|
;; e.g. "exec '/bin/bash' -c ...". Must match the
|
||||||
|
;; double-quoted substitutions above so both sides
|
||||||
|
;; of assert_eq!/contains use the store path.
|
||||||
|
(("'/bin/bash'")
|
||||||
|
(string-append "'" bash-bin "/bash'"))
|
||||||
|
(("'/bin/sh'")
|
||||||
|
(string-append "'" bash-bin "/sh'"))
|
||||||
;; coreutils.
|
;; coreutils.
|
||||||
(("\"/bin/(cat|cp|date|echo|head|ls|rm|sleep|true|touch)\"" all cmd)
|
(("\"/bin/(cat|cp|date|echo|head|ls|rm|sleep|true|touch)\"" all cmd)
|
||||||
(string-append "\"" coreutils-bin "/" cmd "\""))
|
(string-append "\"" coreutils-bin "/" cmd "\""))
|
||||||
@@ -339,28 +513,120 @@
|
|||||||
(string-append "\"" git-bin "/git\""))
|
(string-append "\"" git-bin "/git\""))
|
||||||
(("\"/usr/bin/sed\"")
|
(("\"/usr/bin/sed\"")
|
||||||
(string-append "\"" sed-bin "/sed\"")))
|
(string-append "\"" sed-bin "/sed\"")))
|
||||||
|
;; Bare Command::new("git") and Command::new("ls")
|
||||||
|
;; in codex source files that exec internally.
|
||||||
|
(substitute* (find-files "git-utils" "\\.rs$")
|
||||||
|
(("Command::new\\(\"git\"\\)")
|
||||||
|
(string-append "Command::new(\"" git-bin "/git\")")))
|
||||||
|
(substitute* "tui/src/get_git_diff.rs"
|
||||||
|
(("Command::new\\(\"git\"\\)")
|
||||||
|
(string-append "Command::new(\"" git-bin "/git\")")))
|
||||||
|
(substitute* "core/src/turn_diff_tracker.rs"
|
||||||
|
(("Command::new\\(\"git\"\\)")
|
||||||
|
(string-append "Command::new(\"" git-bin "/git\")")))
|
||||||
|
(substitute* "cloud-tasks/src/env_detect.rs"
|
||||||
|
(("Command::new\\(\"git\"\\)")
|
||||||
|
(string-append "Command::new(\"" git-bin "/git\")")))
|
||||||
|
(substitute* "core/src/plugins/startup_sync.rs"
|
||||||
|
(("\"git\",")
|
||||||
|
(string-append "\"" git-bin "/git\",")))
|
||||||
|
(substitute* "file-search/src/lib.rs"
|
||||||
|
(("Command::new\\(\"ls\"\\)")
|
||||||
|
(string-append "Command::new(\"" coreutils-bin "/ls\")")))
|
||||||
|
;; Neutralize pager with absolute path to cat.
|
||||||
|
(substitute* "core/src/unified_exec/process_manager.rs"
|
||||||
|
(("\"PAGER\", \"cat\"")
|
||||||
|
(string-append "\"PAGER\", \"" coreutils-bin "/cat\""))
|
||||||
|
(("\"GIT_PAGER\", \"cat\"")
|
||||||
|
(string-append "\"GIT_PAGER\", \"" coreutils-bin "/cat\""))
|
||||||
|
(("\"GH_PAGER\", \"cat\"")
|
||||||
|
(string-append "\"GH_PAGER\", \"" coreutils-bin "/cat\"")))
|
||||||
|
;; Bare /bin/sleep inside a format! string
|
||||||
|
;; (no surrounding double quotes, so the main
|
||||||
|
;; pattern does not match).
|
||||||
|
(substitute*
|
||||||
|
"shell-escalation/src/unix/escalate_server.rs"
|
||||||
|
(("/bin/sleep")
|
||||||
|
(string-append coreutils-bin "/sleep")))
|
||||||
;; @SHELL@ placeholder from test-shebangs patch
|
;; @SHELL@ placeholder from test-shebangs patch
|
||||||
(substitute*
|
(substitute*
|
||||||
(list "rmcp-client/src/program_resolver.rs"
|
(list "rmcp-client/src/program_resolver.rs"
|
||||||
"tui/src/external_editor.rs")
|
"tui/src/external_editor.rs")
|
||||||
(("@SHELL@")
|
(("@SHELL@")
|
||||||
(string-append bash-bin "/sh")))
|
(string-append bash-bin "/sh")))
|
||||||
;; shebang in test-only file
|
;; Shebangs inside raw string literals (r#"..."#)
|
||||||
|
;; that are written to scripts at runtime. The
|
||||||
|
;; main "/bin/sh" patterns only match double-quoted
|
||||||
|
;; occurrences; these shebangs have no surrounding
|
||||||
|
;; double quotes.
|
||||||
(substitute*
|
(substitute*
|
||||||
"core/tests/suite/user_notification.rs"
|
(list "core/src/plugins/startup_sync_tests.rs"
|
||||||
|
"core/tests/suite/client.rs"
|
||||||
|
"core/tests/suite/js_repl.rs"
|
||||||
|
"core/tests/suite/skill_approval.rs"
|
||||||
|
"core/tests/suite/user_notification.rs"
|
||||||
|
"login/src/auth/auth_tests.rs"
|
||||||
|
"models-manager/src/manager_tests.rs"
|
||||||
|
"sandboxing/src/bwrap_tests.rs")
|
||||||
(("#!/bin/bash")
|
(("#!/bin/bash")
|
||||||
(string-append "#!" bash-bin "/bash"))))))
|
(string-append "#!" bash-bin "/bash"))
|
||||||
|
(("#!/bin/sh")
|
||||||
|
(string-append "#!" bash-bin "/sh")))
|
||||||
|
;; Test helpers pass env: Default::default() to the
|
||||||
|
;; spawn code which calls env_clear(), leaving
|
||||||
|
;; processes with no PATH. Inject the build-time
|
||||||
|
;; PATH so tests find coreutils, bash, etc.
|
||||||
|
(substitute* (find-files "." "\\.rs$")
|
||||||
|
(("env: Default::default\\(\\)")
|
||||||
|
(string-append
|
||||||
|
"env: std::env::var(\"PATH\")"
|
||||||
|
".into_iter()"
|
||||||
|
".map(|p| (\"PATH\".to_string(), p))"
|
||||||
|
".collect()")))
|
||||||
|
;; Test-only absolute path; bare name works via PATH.
|
||||||
|
(substitute* "exec-server/tests/exec_process.rs"
|
||||||
|
(("\"/usr/bin/python3\"")
|
||||||
|
"\"python3\""))
|
||||||
|
;; Same empty-env issue but in JSON literals
|
||||||
|
;; (serde_json::json! macro).
|
||||||
|
(substitute* "exec-server/tests/process.rs"
|
||||||
|
(("\"env\": \\{\\}")
|
||||||
|
(string-append
|
||||||
|
"\"env\": {\"PATH\": \""
|
||||||
|
(getenv "PATH")
|
||||||
|
"\"}"))))))
|
||||||
|
(add-before 'build 'set-bubblewrap-source
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(setenv "CODEX_BWRAP_SOURCE_DIR"
|
||||||
|
(string-append
|
||||||
|
(assoc-ref inputs "bubblewrap-source")
|
||||||
|
"/"))))
|
||||||
|
(add-before 'build 'create-node-version-file
|
||||||
|
(lambda _
|
||||||
|
(call-with-output-file "guix-vendor/node-version.txt"
|
||||||
|
(lambda (port)
|
||||||
|
(display "22.22.0" port)))))
|
||||||
(add-before 'check 'set-home
|
(add-before 'check 'set-home
|
||||||
(lambda _
|
(lambda _
|
||||||
(setenv "HOME" "/tmp")
|
;; HOME must not be a prefix of /tmp, otherwise
|
||||||
|
;; the TUI's path shortener replaces /tmp/... with
|
||||||
|
;; ~/... and 30 snapshot tests fail.
|
||||||
|
(setenv "HOME" "/tmp/guix-home")
|
||||||
|
(mkdir-p "/tmp/guix-home")
|
||||||
(setenv "USER" "nixbld"))))))
|
(setenv "USER" "nixbld"))))))
|
||||||
(native-inputs (list clang ;bindgen uses libclang to parse BoringSSL's C headers
|
(native-inputs `(("bubblewrap" ,bubblewrap) ;tests need bwrap on PATH
|
||||||
cmake-minimal ;BoringSSL is compiled from C source
|
("clang" ,clang)
|
||||||
libunwind ;BoringSSL tests verify stack unwinding in assembly
|
("cmake-minimal" ,cmake-minimal)
|
||||||
perl python-minimal ;for tests
|
("libunwind" ,libunwind)
|
||||||
pkg-config))
|
("lsof" ,lsof) ;app-server tests
|
||||||
|
("nss-certs-for-test" ,nss-certs-for-test) ;OTLP gRPC TLS
|
||||||
|
("perl" ,perl)
|
||||||
|
("procps" ,procps) ;tests use ps
|
||||||
|
("python-minimal" ,python-minimal)
|
||||||
|
("pkg-config" ,pkg-config)
|
||||||
|
("bubblewrap-source" ,(package-source bubblewrap))))
|
||||||
(inputs (cons* bash-minimal coreutils git-minimal sed
|
(inputs (cons* bash-minimal coreutils git-minimal sed
|
||||||
openssl sqlite `(,zstd "lib")
|
libcap oniguruma openssl sqlite zlib `(,zstd "lib")
|
||||||
(cargo-inputs 'codex)))
|
(cargo-inputs 'codex)))
|
||||||
(home-page "https://github.com/openai/codex")
|
(home-page "https://github.com/openai/codex")
|
||||||
(synopsis "AI-assisted coding CLI and TUI")
|
(synopsis "AI-assisted coding CLI and TUI")
|
||||||
@@ -368,13 +634,15 @@
|
|||||||
"Codex is an AI-powered coding assistant that runs in the terminal.
|
"Codex is an AI-powered coding assistant that runs in the terminal.
|
||||||
It provides an interactive TUI for conversations with AI models, with
|
It provides an interactive TUI for conversations with AI models, with
|
||||||
support for shell command execution, file editing, and code generation.
|
support for shell command execution, file editing, and code generation.
|
||||||
Configure providers via @file{~/.codex/config.toml}.")
|
Configure providers via @file{~/.codex/config.toml}.
|
||||||
|
|
||||||
|
codex-code-mode's V8 Javascript executor is disabled.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public codex-acp
|
(define-public codex-acp
|
||||||
(package
|
(package
|
||||||
(name "codex-acp")
|
(name "codex-acp")
|
||||||
(version "0.9.2")
|
(version "0.11.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -383,9 +651,8 @@ Configure providers via @file{~/.codex/config.toml}.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "190sq6s6jfz8dkj1y8305r7x6ln86qqr2j1bnfjci7f1x2wyzmsj"))
|
(base32 "1rlgkbvrbdl5jhf49sjn2mifn2rq6z0vwf0gard23y1bz6sr3wmr"))
|
||||||
(patches (search-patches "codex-acp-0.9.2-remove-patch-sections.patch"
|
(patches (search-patches "codex-acp-0.11.1-remove-patch-sections.patch"))))
|
||||||
"codex-acp-0.9.2-replace-result-flatten.patch"))))
|
|
||||||
(build-system cargo-build-system)
|
(build-system cargo-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -393,13 +660,43 @@ Configure providers via @file{~/.codex/config.toml}.")
|
|||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'patch-codex-deps
|
(add-after 'unpack 'patch-codex-deps
|
||||||
(lambda _
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
;; Rewrite git dependencies to use vendored sources from rust-codex
|
;; Rewrite git dependencies to use vendored sources from rust-codex
|
||||||
(substitute* "Cargo.toml"
|
(substitute* "Cargo.toml"
|
||||||
(("git = \"https://github.com/zed-industries/codex\", branch = \"acp\"")
|
(("git = \"https://github.com/openai/codex\", tag = \"rust-v0.117.0\"")
|
||||||
"version = \"0.0.0\"")))))))
|
"version = \"0.117.0\""))
|
||||||
(native-inputs (list pkg-config))
|
;; Disable V8 runtime in codex-code-mode (transitive dep).
|
||||||
(inputs (cons* openssl sqlite `(,zstd "lib") (cargo-inputs 'codex-acp)))
|
(let ((port (open-file "Cargo.toml" "a")))
|
||||||
|
(display "
|
||||||
|
[dependencies.codex-code-mode]
|
||||||
|
version = \"0.117.0\"
|
||||||
|
default-features = false
|
||||||
|
" port)
|
||||||
|
(close-port port))
|
||||||
|
;; Point codex-linux-sandbox at system bubblewrap source.
|
||||||
|
(setenv "CODEX_BWRAP_SOURCE_DIR"
|
||||||
|
(string-append
|
||||||
|
(assoc-ref inputs "bubblewrap-source")
|
||||||
|
"/"))))
|
||||||
|
(add-before 'check 'set-home
|
||||||
|
(lambda _
|
||||||
|
(setenv "HOME" "/tmp")
|
||||||
|
(setenv "USER" "nixbld")))
|
||||||
|
(add-before 'build 'create-node-version-file
|
||||||
|
(lambda _
|
||||||
|
;; codex-core's js_repl uses include_str! to read
|
||||||
|
;; node-version.txt four directories up from its source;
|
||||||
|
;; create it where the vendored crate expects it.
|
||||||
|
(call-with-output-file "guix-vendor/node-version.txt"
|
||||||
|
(lambda (port)
|
||||||
|
(display "22.22.0" port))))))))
|
||||||
|
(native-inputs
|
||||||
|
`(("cmake-minimal" ,cmake-minimal)
|
||||||
|
("clang" ,clang)
|
||||||
|
("pkg-config" ,pkg-config)
|
||||||
|
("bubblewrap-source" ,(package-source bubblewrap))))
|
||||||
|
(inputs (cons* libcap openssl sqlite zlib `(,zstd "lib")
|
||||||
|
(cargo-inputs 'codex-acp)))
|
||||||
(home-page "https://github.com/zed-industries/codex-acp")
|
(home-page "https://github.com/zed-industries/codex-acp")
|
||||||
(synopsis "ACP-compatible agent bridging Zed Codex with ACP clients")
|
(synopsis "ACP-compatible agent bridging Zed Codex with ACP clients")
|
||||||
(description
|
(description
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ as created by Podman, CRI-O and containerd.")))
|
|||||||
(define-public crun
|
(define-public crun
|
||||||
(package
|
(package
|
||||||
(name "crun")
|
(name "crun")
|
||||||
(version "1.25.1")
|
(version "1.26")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
@@ -160,7 +160,7 @@ as created by Podman, CRI-O and containerd.")))
|
|||||||
"/crun-" version ".tar.gz"))
|
"/crun-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"02kksvnja234k8mpq5j7yms8npbpvh8iz3k03h21lwcqzqsb88rx"))))
|
"1hdwk5dpsz9danxiyfli07b7sqid6hr34qmhs5qjl2dcc00is89j"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -714,7 +714,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
|
|||||||
(define-public podman
|
(define-public podman
|
||||||
(package
|
(package
|
||||||
(name "podman")
|
(name "podman")
|
||||||
(version "5.8.1")
|
(version "5.8.2")
|
||||||
(outputs '("out" "docker"))
|
(outputs '("out" "docker"))
|
||||||
(properties
|
(properties
|
||||||
`((output-synopsis "docker" "docker alias for podman")
|
`((output-synopsis "docker" "docker alias for podman")
|
||||||
@@ -727,7 +727,7 @@ Its main purpose is to support the key usage by @code{docker-init}:
|
|||||||
(url "https://github.com/containers/podman")
|
(url "https://github.com/containers/podman")
|
||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1wdsdc0nj4m1v8mn95dhavi87ad0adqmld70da59gvp2abff5f0f"))
|
(base32 "12bmzbfyjsf0mwnam38cw9ib54wj1znh5b7lxzdyll9cvvkhqisr"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
|||||||
@@ -0,0 +1,226 @@
|
|||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org>
|
||||||
|
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
|
;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
|
||||||
|
;;; Copyright © 2026 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||||
|
;;;
|
||||||
|
;;; 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 coreboot)
|
||||||
|
#:use-module (gnu packages bison)
|
||||||
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages flex)
|
||||||
|
#:use-module (gnu packages pciutils)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix build-system cargo)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
|
#:use-module (guix build-system copy)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system go)
|
||||||
|
#:use-module (guix build-system meson)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system qt)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:use-module (srfi srfi-26))
|
||||||
|
|
||||||
|
(define %coreboot-version "26.03")
|
||||||
|
|
||||||
|
(define %coreboot-origin
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://review.coreboot.org/coreboot")
|
||||||
|
(commit %coreboot-version)))
|
||||||
|
(file-name (git-file-name "coreboot" %coreboot-version))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0436rr0vibh35phvkxrc939njvrmnfq9xw87y1b0nlllglvq07kk"))))
|
||||||
|
|
||||||
|
(define-public bincfg
|
||||||
|
(package
|
||||||
|
(name "bincfg")
|
||||||
|
(version %coreboot-version)
|
||||||
|
(source %coreboot-origin)
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ; no test suite
|
||||||
|
#:make-flags
|
||||||
|
#~(list
|
||||||
|
(string-append "CC=" #$(cc-for-target)))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(delete 'configure) ; no configure script
|
||||||
|
(add-after 'unpack 'chdir
|
||||||
|
(lambda _
|
||||||
|
(chdir "util/bincfg")))
|
||||||
|
(add-after 'build 'build-binaries
|
||||||
|
(lambda* (#:key make-flags #:allow-other-keys)
|
||||||
|
(for-each
|
||||||
|
(lambda (target result)
|
||||||
|
(apply invoke "make" (string-append "gen-" target) make-flags)
|
||||||
|
(rename-file result
|
||||||
|
(string-append target ".bin")))
|
||||||
|
(list
|
||||||
|
;; generate GbE for X200
|
||||||
|
"gbe-ich9m"
|
||||||
|
;; generate GbE for X220/x230
|
||||||
|
"gbe-82579LM"
|
||||||
|
;; generate IFD for X200
|
||||||
|
"ifd-x200")
|
||||||
|
(list
|
||||||
|
"flashregion_3_gbe.bin"
|
||||||
|
"flashregion_3_gbe.bin"
|
||||||
|
"flashregion_0_fd.bin"))))
|
||||||
|
;; The Makefile has no install target.
|
||||||
|
(replace 'install
|
||||||
|
(lambda _
|
||||||
|
(let ((bin (string-append #$output "/bin"))
|
||||||
|
(lib (string-append #$output "/lib/bincfg"))
|
||||||
|
(data (string-append #$output "/share/bincfg")))
|
||||||
|
;; Install the program
|
||||||
|
(install-file "bincfg" bin)
|
||||||
|
;; And its data
|
||||||
|
(for-each
|
||||||
|
(lambda (path)
|
||||||
|
(install-file path data))
|
||||||
|
(append (find-files "." ".*\\.set")
|
||||||
|
(find-files "." ".*\\.spec")))
|
||||||
|
;; And the files generated with the data
|
||||||
|
(for-each
|
||||||
|
(lambda (path)
|
||||||
|
(install-file path lib))
|
||||||
|
(find-files "." ".*\\.bin"))))))))
|
||||||
|
(native-inputs (list bison flex))
|
||||||
|
(home-page "https://coreboot.org")
|
||||||
|
(synopsis "Encoder/decoder for binary formats described in text files")
|
||||||
|
(description "
|
||||||
|
The bincfg program comes with specifications files for the following binary
|
||||||
|
formats:
|
||||||
|
@itemize
|
||||||
|
@item Various DDR3 and DDR4 SPD
|
||||||
|
@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
|
||||||
|
@item Configuration data for the Intel Gigabit Ethernet controller present in
|
||||||
|
the Intel ICH9-M chipset.
|
||||||
|
@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
|
||||||
|
@item Configuration data for the ITE IT8718F SuperIO
|
||||||
|
@end itemize
|
||||||
|
It also comes with example files generated by bincfg.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public ifdtool
|
||||||
|
(package
|
||||||
|
(name "ifdtool")
|
||||||
|
(version %coreboot-version)
|
||||||
|
(source %coreboot-origin)
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:make-flags
|
||||||
|
#~(list (string-append "CC=" #$(cc-for-target))
|
||||||
|
"INSTALL=install"
|
||||||
|
(string-append "PREFIX=" #$output))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'chdir
|
||||||
|
(lambda _
|
||||||
|
(chdir "util/ifdtool")))
|
||||||
|
(delete 'configure)) ; no configure script
|
||||||
|
#:tests? #f)) ; no test suite
|
||||||
|
(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.")
|
||||||
|
(license license:gpl2)))
|
||||||
|
|
||||||
|
(define-public intelmetool
|
||||||
|
(package
|
||||||
|
(name "intelmetool")
|
||||||
|
(version %coreboot-version)
|
||||||
|
(source %coreboot-origin)
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ;no test suite
|
||||||
|
#:make-flags
|
||||||
|
#~(list (string-append "CC=" #$(cc-for-target))
|
||||||
|
"INSTALL=install"
|
||||||
|
(string-append "PREFIX=" #$output))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'chdir
|
||||||
|
(lambda _
|
||||||
|
(chdir "util/intelmetool")))
|
||||||
|
(delete 'configure) ;no configure script
|
||||||
|
(delete 'check))))
|
||||||
|
(inputs (list pciutils zlib))
|
||||||
|
(home-page
|
||||||
|
"https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
|
||||||
|
(synopsis "Intel Management Engine tools")
|
||||||
|
(description "This package provides tools for working with Intel
|
||||||
|
Management Engine (ME). You need to @code{sudo rmmod mei_me} and
|
||||||
|
@code{sudo rmmod mei} before using this tool. Also pass
|
||||||
|
@code{iomem=relaxed} to the Linux kernel command line.")
|
||||||
|
(license license:gpl2)
|
||||||
|
|
||||||
|
;; This is obviously an Intel thing, plus it requires <cpuid.h>.
|
||||||
|
(supported-systems '("x86_64-linux" "i686-linux"))))
|
||||||
|
|
||||||
|
(define-public nvramtool
|
||||||
|
(package
|
||||||
|
(name "nvramtool")
|
||||||
|
(version %coreboot-version)
|
||||||
|
(source %coreboot-origin)
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ; no test suite
|
||||||
|
#:make-flags
|
||||||
|
#~(list (string-append "CC=" #$(cc-for-target))
|
||||||
|
"INSTALL=install"
|
||||||
|
(string-append "PREFIX=" #$output))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'chdir
|
||||||
|
(lambda _
|
||||||
|
(chdir "util/nvramtool")))
|
||||||
|
(delete 'configure)))) ; no configure script
|
||||||
|
(home-page "https://coreboot.org")
|
||||||
|
(synopsis "Command line tool that can edit Coreboot settings")
|
||||||
|
(description "@command{nvramtool} can see and/or modify Coreboot settings
|
||||||
|
like the serial port speed, log level, etc. It requires Coreboot to be compiled
|
||||||
|
with CONFIG_USE_OPTION_TABLE and some options require the iomem=relaxed kernel
|
||||||
|
command line to work. Features:
|
||||||
|
@itemize
|
||||||
|
@item If Coreboot was compiled without CONFIG_STATIC_OPTION_TABLE, it can change
|
||||||
|
its settings, which are applied after a reboot.
|
||||||
|
@item It can modify Coreboot images default settings with
|
||||||
|
@command{nvramtool -C coreboot.rom [...]}.
|
||||||
|
@item It has various options related to the file format used to store these
|
||||||
|
settings.
|
||||||
|
@item It can also read/write the CMOS memory where the Coreboot settings can be
|
||||||
|
located.
|
||||||
|
@end itemize")
|
||||||
|
;; Some files are "GPL-2.0-only or BSD-3-Clause", other are GPL-2.0-only
|
||||||
|
;; and anyway there is. There is also a license declaration in
|
||||||
|
;; cli/nvramtool.8 that applies to "This program" which uses the GPLv2.
|
||||||
|
(license license:gpl2)))
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
|
;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
|
||||||
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||||
;;; Copyright © 2025 Sergio Pastor Pérez <sergio.pastorperez@gmail.com>
|
;;; Copyright © 2025 Sergio Pastor Pérez <sergio.pastorperez@gmail.com>
|
||||||
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
;;; Copyright © 2025, 2026 Ashish SHUKLA <ashish.is@lostca.se>
|
||||||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||||
;;; Copyright © 2025 Romain Garbage <romain.garbage@inria.fr>
|
;;; Copyright © 2025 Romain Garbage <romain.garbage@inria.fr>
|
||||||
;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||||
@@ -3360,7 +3360,7 @@ which can evaluate Jsonnet files and expressions.")))
|
|||||||
(define-public simdjson
|
(define-public simdjson
|
||||||
(package
|
(package
|
||||||
(name "simdjson")
|
(name "simdjson")
|
||||||
(version "3.13.0")
|
(version "4.6.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -3369,7 +3369,7 @@ which can evaluate Jsonnet files and expressions.")))
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"005yli56nrkvlyx9g9cq8dczk42r9a18l162i2s5k81lj3y7mcrp"))))
|
"0729mxnc2wjb94gr4znwlzfmgw5w2v9kd8glvn3vnjhkdnd87zry"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:tests? #f ; tests require downloading dependencies
|
'(#:tests? #f ; tests require downloading dependencies
|
||||||
@@ -3608,7 +3608,7 @@ std::wstring, etc).")
|
|||||||
(define-public fast-float
|
(define-public fast-float
|
||||||
(package
|
(package
|
||||||
(name "fast-float")
|
(name "fast-float")
|
||||||
(version "8.0.2")
|
(version "8.2.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -3617,7 +3617,7 @@ std::wstring, etc).")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"19x1yklf641yrpad6lk4cq3jmird10d5ig8hicm3p9lxh92k78cl"))))
|
"1l13nsl4sgq71m7aifrmmmfyl14vp48vqdh7pb50hxqq6f8bq2b5"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -3628,12 +3628,10 @@ std::wstring, etc).")
|
|||||||
(add-after 'unpack 'patch-cmake-tests
|
(add-after 'unpack 'patch-cmake-tests
|
||||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||||
(substitute* "tests/CMakeLists.txt"
|
(substitute* "tests/CMakeLists.txt"
|
||||||
(("FetchContent_GetProperties\\(supplemental_test_files.*")
|
(("FetchContent_MakeAvailable\\(supplemental_test_files.*")
|
||||||
"")
|
|
||||||
(("if\\(NOT supplemental_test_files_POPULATED.*")
|
|
||||||
(string-append
|
(string-append
|
||||||
"set(supplemental_test_files_BINARY_DIR "
|
"set(supplemental_test_files_BINARY_DIR "
|
||||||
#$fast-float-test-files ")\nif(0)\n"))))))))
|
#$fast-float-test-files ")\n"))))))))
|
||||||
(native-inputs (list doctest fast-float-test-files))
|
(native-inputs (list doctest fast-float-test-files))
|
||||||
(home-page "https://github.com/fastfloat/fast_float")
|
(home-page "https://github.com/fastfloat/fast_float")
|
||||||
(synopsis "Floating point number parser for C++")
|
(synopsis "Floating point number parser for C++")
|
||||||
|
|||||||
+11
-12
@@ -276,18 +276,17 @@ Ed448-Goldilocks and Curve448, using the Decaf encoding.")
|
|||||||
(define-public libsodium
|
(define-public libsodium
|
||||||
(package
|
(package
|
||||||
(name "libsodium")
|
(name "libsodium")
|
||||||
(version "1.0.18")
|
(version "1.0.22")
|
||||||
(source (origin
|
(source
|
||||||
(method url-fetch)
|
(origin
|
||||||
(uri (list (string-append
|
(method git-fetch)
|
||||||
"https://download.libsodium.org/libsodium/"
|
(uri (git-reference
|
||||||
"releases/libsodium-" version ".tar.gz")
|
(url "https://github.com/jedisct1/libsodium")
|
||||||
(string-append
|
(commit (string-append version "-RELEASE"))))
|
||||||
"https://download.libsodium.org/libsodium/"
|
(file-name (git-file-name name version))
|
||||||
"releases/old/libsodium-" version ".tar.gz")))
|
(sha256
|
||||||
(sha256
|
(base32
|
||||||
(base32
|
"05lqdn6nzldsia5mv5a9xfvc5k0kybh9snwv7qsb135gva4bpjwk"))))
|
||||||
"1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g"))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(synopsis "Portable NaCl-based crypto library")
|
(synopsis "Portable NaCl-based crypto library")
|
||||||
(description
|
(description
|
||||||
|
|||||||
@@ -69,6 +69,8 @@
|
|||||||
;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
|
;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
|
||||||
;;; Copyright © 2025 bdunahu <bdunahu@operationnull.com>
|
;;; Copyright © 2025 bdunahu <bdunahu@operationnull.com>
|
||||||
;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
|
;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
|
||||||
|
;;; Copyright © 2026 Peter Polidoro <peter@polidoro.io>
|
||||||
|
;;; Copyright © 2026 Josep Bigorra <jjbigorra@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -125,6 +127,7 @@
|
|||||||
#:use-module (gnu packages gperf)
|
#:use-module (gnu packages gperf)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages guile)
|
#:use-module (gnu packages guile)
|
||||||
|
#:use-module (gnu packages guile-xyz)
|
||||||
#:use-module (gnu packages icu4c)
|
#:use-module (gnu packages icu4c)
|
||||||
#:use-module (gnu packages jemalloc)
|
#:use-module (gnu packages jemalloc)
|
||||||
#:use-module (gnu packages language)
|
#:use-module (gnu packages language)
|
||||||
@@ -197,6 +200,7 @@
|
|||||||
#:use-module (guix build-system emacs)
|
#:use-module (guix build-system emacs)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system go)
|
#:use-module (guix build-system go)
|
||||||
|
#:use-module (guix build-system guile)
|
||||||
#:use-module (guix build-system meson)
|
#:use-module (guix build-system meson)
|
||||||
#:use-module (guix build-system perl)
|
#:use-module (guix build-system perl)
|
||||||
#:use-module (guix build-system pyproject)
|
#:use-module (guix build-system pyproject)
|
||||||
@@ -3096,6 +3100,64 @@ Driver.")
|
|||||||
;; COPYING contains copy of lgpl2.1 - but copyright notices just say "LGPL"
|
;; COPYING contains copy of lgpl2.1 - but copyright notices just say "LGPL"
|
||||||
(home-page "https://www.unixodbc.org")))
|
(home-page "https://www.unixodbc.org")))
|
||||||
|
|
||||||
|
(define-public sqliteodbc
|
||||||
|
(package
|
||||||
|
(name "sqliteodbc")
|
||||||
|
(version "0.99991")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "http://www.ch-werner.de/sqliteodbc/"
|
||||||
|
name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0p4avhqxnd2l49g3vpzwrmdi8wxyqzy0vswalaagmqfdsfwav52d"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ; no check target
|
||||||
|
#:configure-flags
|
||||||
|
#~(list "--disable-static"
|
||||||
|
(string-append "--with-sqlite3=" #$(this-package-input "sqlite"))
|
||||||
|
(string-append "--with-odbc=" #$(this-package-input "unixodbc")))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-before 'install 'create-lib-directory
|
||||||
|
(lambda _
|
||||||
|
(mkdir-p (string-append #$output "/lib"))))
|
||||||
|
(add-after 'install 'remove-extra-sqlite-extensions
|
||||||
|
(lambda _
|
||||||
|
;; Keep this package focused on the ODBC driver itself.
|
||||||
|
(for-each delete-file
|
||||||
|
(find-files (string-append #$output "/lib")
|
||||||
|
"^libsqlite3_mod_.*\\.(la|so)$"))))
|
||||||
|
(add-after 'install 'install-odbcinst.ini
|
||||||
|
(lambda _
|
||||||
|
(let ((dir (string-append #$output "/share/sqliteodbc")))
|
||||||
|
(mkdir-p dir)
|
||||||
|
(call-with-output-file (string-append dir "/odbcinst.ini")
|
||||||
|
(lambda (port)
|
||||||
|
(display
|
||||||
|
(string-append
|
||||||
|
"[SQLite3]\n"
|
||||||
|
"Description = SQLite3 ODBC Driver\n"
|
||||||
|
"Driver = " #$output "/lib/libsqlite3odbc.so\n"
|
||||||
|
"Setup = " #$output "/lib/libsqlite3odbc.so\n"
|
||||||
|
"Threading = 2\n")
|
||||||
|
port)))))))))
|
||||||
|
(native-search-paths
|
||||||
|
(list (search-path-specification
|
||||||
|
(variable "ODBCSYSINI")
|
||||||
|
(files '("share/sqliteodbc"))
|
||||||
|
(separator #f))))
|
||||||
|
(inputs (list sqlite unixodbc))
|
||||||
|
(home-page "http://www.ch-werner.de/sqliteodbc/")
|
||||||
|
(synopsis "ODBC driver for SQLite")
|
||||||
|
(description
|
||||||
|
"SQLiteODBC provides an ODBC driver for SQLite 3 databases. It installs
|
||||||
|
the shared library and a driver registration file so applications using
|
||||||
|
unixODBC can resolve the @code{SQLite3} driver name from a Guix profile.")
|
||||||
|
(license license:tcl/tk)))
|
||||||
|
|
||||||
(define-public nanodbc
|
(define-public nanodbc
|
||||||
(package
|
(package
|
||||||
(name "nanodbc")
|
(name "nanodbc")
|
||||||
@@ -4987,6 +5049,54 @@ postgresql = postgresql://nixbld@/yoyo_test~%")))
|
|||||||
files or Python scripts that define a list of migration steps.")
|
files or Python scripts that define a list of migration steps.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public mutastructura
|
||||||
|
(package
|
||||||
|
(name "mutastructura")
|
||||||
|
(version "0.6.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://codeberg.org/jjba23/mutastructura")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "08vzlc5imavqf3bdzgbh70c7z44xjhf05gr7i2g5ksl49lv39gzh"))))
|
||||||
|
(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")))
|
||||||
|
(copy-recursively "resources"
|
||||||
|
(string-append share "/resources"))
|
||||||
|
(install-file "scripts/mutastructura" bin)
|
||||||
|
(install-file "scripts/log.bash"
|
||||||
|
(string-append share "/scripts/"))
|
||||||
|
(chmod (string-append bin "/mutastructura") #o755)))))))
|
||||||
|
(native-inputs (list guile-3.0))
|
||||||
|
(propagated-inputs (list guile-dbi
|
||||||
|
guile-dbd-mysql
|
||||||
|
guile-dbd-sqlite3
|
||||||
|
guile-dbd-postgresql
|
||||||
|
guile-gcrypt))
|
||||||
|
(inputs (list guile-3.0 bash-minimal))
|
||||||
|
(home-page "https://codeberg.org/jjba23/mutastructura")
|
||||||
|
(synopsis "Relational database schema migrations powered by Guile Scheme")
|
||||||
|
(description
|
||||||
|
"Mutastructura provides a familiar, declarative and transactional
|
||||||
|
approach to managing database states. It exposes a user-friendly
|
||||||
|
@acronym{CLI, command-line interface} and has support for PostgreSQL, MySQL, and SQLite.
|
||||||
|
It also exposes library functions and can be imported and used directly from other Guile code.
|
||||||
|
|
||||||
|
Features include executing migrations transactionally and computing SHA256
|
||||||
|
checksums to track schema evolution in a @code{migrations_history} table.")
|
||||||
|
(license license:agpl3+)))
|
||||||
|
|
||||||
(define-public python-mysqlclient
|
(define-public python-mysqlclient
|
||||||
(package
|
(package
|
||||||
(name "python-mysqlclient")
|
(name "python-mysqlclient")
|
||||||
|
|||||||
+12
-12
@@ -20,18 +20,6 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages debian)
|
(define-module (gnu packages debian)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix gexp)
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (guix build-system cmake)
|
|
||||||
#:use-module (guix build-system copy)
|
|
||||||
#:use-module (guix build-system gnu)
|
|
||||||
#:use-module (guix build-system perl)
|
|
||||||
#:use-module (guix build-system trivial)
|
|
||||||
#:use-module (gnu packages adns)
|
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages backup)
|
#:use-module (gnu packages backup)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
@@ -40,6 +28,7 @@
|
|||||||
#:use-module (gnu packages crypto)
|
#:use-module (gnu packages crypto)
|
||||||
#:use-module (gnu packages databases)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages dbm)
|
#:use-module (gnu packages dbm)
|
||||||
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
#:use-module (gnu packages gnupg)
|
#:use-module (gnu packages gnupg)
|
||||||
#:use-module (gnu packages guile)
|
#:use-module (gnu packages guile)
|
||||||
@@ -53,6 +42,17 @@
|
|||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages web)
|
#:use-module (gnu packages web)
|
||||||
#:use-module (gnu packages wget)
|
#:use-module (gnu packages wget)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
|
#:use-module (guix build-system copy)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system perl)
|
||||||
|
#:use-module (guix build-system trivial)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix utils)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (srfi srfi-26))
|
#:use-module (srfi srfi-26))
|
||||||
|
|
||||||
|
|||||||
+46
-1
@@ -31,7 +31,7 @@
|
|||||||
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
||||||
;;; Copyright © 2024-2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
;;; Copyright © 2024-2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||||
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
||||||
;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
|
;;; Copyright © 2025, 2026 Vinicius Monego <monego@posteo.net>
|
||||||
;;; Copyright © 2025 Grigory Shepelev <shegeley@gmail.com>
|
;;; Copyright © 2025 Grigory Shepelev <shegeley@gmail.com>
|
||||||
;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
|
;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
|
||||||
|
|
||||||
@@ -94,6 +94,8 @@
|
|||||||
#:use-module (gnu packages gnome)
|
#:use-module (gnu packages gnome)
|
||||||
#:use-module (gnu packages gnupg)
|
#:use-module (gnu packages gnupg)
|
||||||
#:use-module (gnu packages golang-build)
|
#:use-module (gnu packages golang-build)
|
||||||
|
#:use-module (gnu packages golang-check)
|
||||||
|
#:use-module (gnu packages golang-compression)
|
||||||
#:use-module (gnu packages golang-xyz)
|
#:use-module (gnu packages golang-xyz)
|
||||||
#:use-module (gnu packages graphics)
|
#:use-module (gnu packages graphics)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
@@ -420,6 +422,49 @@ tables, and it understands a variety of different formats.")
|
|||||||
similarity.")
|
similarity.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public gdu
|
||||||
|
(package
|
||||||
|
(name "gdu")
|
||||||
|
(version "5.35.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/dundee/gdu")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "051xf3wncdiavjwyl9djmni5vd2dqjgn6drkw2nm21c9l0rjfv6d"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:install-source? #f
|
||||||
|
#:import-path "github.com/dundee/gdu/v5/cmd/gdu"
|
||||||
|
#:unpack-path "github.com/dundee/gdu/v5"))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-dgraph-io-badger-v4
|
||||||
|
go-github-com-fatih-color
|
||||||
|
go-github-com-gdamore-tcell-v2
|
||||||
|
go-github-com-h2non-filetype
|
||||||
|
go-github-com-maruel-natural
|
||||||
|
go-github-com-mattn-go-isatty
|
||||||
|
go-github-com-pkg-errors
|
||||||
|
go-github-com-rivo-tview
|
||||||
|
go-github-com-sirupsen-logrus
|
||||||
|
go-github-com-spf13-cobra
|
||||||
|
go-github-com-stretchr-testify
|
||||||
|
go-github-com-ulikunitz-xz
|
||||||
|
go-golang-org-x-sys
|
||||||
|
go-golang-org-x-text
|
||||||
|
go-gopkg-in-yaml-v3
|
||||||
|
go-modernc-org-sqlite))
|
||||||
|
(home-page "https://github.com/dundee/gdu")
|
||||||
|
(synopsis "Disk usage analyzer")
|
||||||
|
(description "Gdu is a disk usage analyzer written in Go. It is intended
|
||||||
|
primarily for SSD disks where it can fully utilize parallel processing, but it
|
||||||
|
also works on HDDs.")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public gpart
|
(define-public gpart
|
||||||
;; The latest (0.3) release is from 2015 and is missing a crash fix.
|
;; The latest (0.3) release is from 2015 and is missing a crash fix.
|
||||||
(let ((commit "ec03350a01ad69708b5a3e2d47b8e002b0eba6c9")
|
(let ((commit "ec03350a01ad69708b5a3e2d47b8e002b0eba6c9")
|
||||||
|
|||||||
@@ -108,9 +108,7 @@
|
|||||||
(lambda _
|
(lambda _
|
||||||
(invoke "cmake" "--install" "."))))))
|
(invoke "cmake" "--install" "."))))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("libconfig" ,libconfig)
|
`(("zlib" ,zlib)))
|
||||||
("libedit" ,libedit)
|
|
||||||
("zlib" ,zlib)))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("lld-wrapper" ,(make-lld-wrapper lld-17 #:lld-as-ld? #t))
|
`(("lld-wrapper" ,(make-lld-wrapper lld-17 #:lld-as-ld? #t))
|
||||||
("llvm" ,llvm-17)
|
("llvm" ,llvm-17)
|
||||||
|
|||||||
+263
-14
@@ -1,12 +1,13 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
||||||
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2015-2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||||
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
||||||
;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2016–2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
|
;;; Copyright © 2016, 2019-2021 Marius Bakke <mbakke@fastmail.com>
|
||||||
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
|
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
|
||||||
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
|
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
|
||||||
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
|
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
|
||||||
@@ -21,9 +22,11 @@
|
|||||||
;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
|
;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com>
|
||||||
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
||||||
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
|
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
|
||||||
|
;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
|
;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com>
|
||||||
;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
|
||||||
;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||||
|
;;; Copyright © 2026 Anderson Torres <anderson.torres.8519@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -46,12 +49,12 @@
|
|||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages curl)
|
|
||||||
#:use-module (gnu packages databases)
|
|
||||||
#:use-module (gnu packages documentation)
|
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages crypto)
|
#:use-module (gnu packages crypto)
|
||||||
|
#:use-module (gnu packages curl)
|
||||||
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages datastructures)
|
#:use-module (gnu packages datastructures)
|
||||||
|
#:use-module (gnu packages documentation)
|
||||||
#:use-module (gnu packages elf)
|
#:use-module (gnu packages elf)
|
||||||
#:use-module (gnu packages flex)
|
#:use-module (gnu packages flex)
|
||||||
#:use-module (gnu packages freedesktop)
|
#:use-module (gnu packages freedesktop)
|
||||||
@@ -65,6 +68,7 @@
|
|||||||
#:use-module (gnu packages libidn)
|
#:use-module (gnu packages libidn)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages lua)
|
#:use-module (gnu packages lua)
|
||||||
|
#:use-module (gnu packages m4)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages nettle)
|
#:use-module (gnu packages nettle)
|
||||||
#:use-module (gnu packages networking)
|
#:use-module (gnu packages networking)
|
||||||
@@ -73,6 +77,8 @@
|
|||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages protobuf)
|
#:use-module (gnu packages protobuf)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
|
#:use-module (gnu packages python-build)
|
||||||
|
#:use-module (gnu packages python-web)
|
||||||
#:use-module (gnu packages python-xyz)
|
#:use-module (gnu packages python-xyz)
|
||||||
#:use-module (gnu packages ragel)
|
#:use-module (gnu packages ragel)
|
||||||
#:use-module (gnu packages serialization)
|
#:use-module (gnu packages serialization)
|
||||||
@@ -84,17 +90,175 @@
|
|||||||
#:use-module (gnu packages web)
|
#:use-module (gnu packages web)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (guix build-system copy)
|
#:use-module (guix build-system copy)
|
||||||
#:use-module (guix build-system glib-or-gtk)
|
#:use-module (guix build-system glib-or-gtk)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system meson))
|
#:use-module (guix build-system meson)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
|
||||||
|
#:use-module (guix utils))
|
||||||
|
|
||||||
|
(define-public adns
|
||||||
|
(package
|
||||||
|
(name "adns")
|
||||||
|
(version "1.6.1")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "git://git.chiark.greenend.org.uk/~ianmdlvl/adns.git")
|
||||||
|
(commit (string-append "adns-" version))))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0ln3l5j7wb1xazrzl76p9xar52p6l2k1cwy7jazxw1acl71k9h5n"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
;; INFO: Tests expect real name resolution to work.
|
||||||
|
#:tests? #f
|
||||||
|
#:configure-flags
|
||||||
|
#~(list
|
||||||
|
;; Make sure the programs under bin/ find libadns.so.
|
||||||
|
(string-append "LDFLAGS=-Wl,-rpath -Wl,"
|
||||||
|
#$output:out
|
||||||
|
"/lib"))))
|
||||||
|
(native-inputs
|
||||||
|
(list m4))
|
||||||
|
(home-page "https://www.gnu.org/software/adns/")
|
||||||
|
(synopsis "Asynchronous DNS client library and utilities")
|
||||||
|
(description
|
||||||
|
"GNU adns is a C library that provides easy-to-use @acronym{DNS, Domain
|
||||||
|
Name System} resolution functionality. The library is asynchronous, allowing
|
||||||
|
several concurrent calls. The package also includes several command-line
|
||||||
|
utilities for use in scripts.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public c-ares
|
||||||
|
(package
|
||||||
|
(name "c-ares")
|
||||||
|
(version "1.34.4")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://github.com/c-ares/c-ares/releases/download/v"
|
||||||
|
version "/" name "-" version ".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0br2msk3bpl5myhjp9vr5j2scpspvbg2fpnz69dcrr4ycpnxnf7s"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-before 'check 'filter-live-tests
|
||||||
|
(lambda _
|
||||||
|
;; Filter tests that require internet access.
|
||||||
|
(setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*")))
|
||||||
|
#$@(if (system-hurd?)
|
||||||
|
#~((add-after 'unpack 'skip-tests
|
||||||
|
(lambda _
|
||||||
|
(substitute* "test/ares-test-main.cc"
|
||||||
|
(("(^| )main *\\(.*" all)
|
||||||
|
(string-append all " exit (77);\n")))))
|
||||||
|
(add-after 'filter-live-tests 'filter-hurd-tests
|
||||||
|
(lambda _
|
||||||
|
(setenv "GTEST_FILTER"
|
||||||
|
(string-append
|
||||||
|
(getenv "GTEST_FILTER")
|
||||||
|
":.*Basic/2"
|
||||||
|
":.*CancelImmediate/2"
|
||||||
|
":.*CancelImmediateGetHostByAddr/2"
|
||||||
|
":.*CancelLater/1"
|
||||||
|
":.*FamilyUnspecified/2"
|
||||||
|
":.*FamilyV6/2"
|
||||||
|
":.*GetAddrInfoParallelLookups/1"
|
||||||
|
":.*GetHostByAddrDestroy/2"
|
||||||
|
":.*GetHostByNameCNAMENoData/2"
|
||||||
|
":.*GetHostByNameDestroyAbsolute/2"
|
||||||
|
":.*GetHostByNameDestroyRelative/2"
|
||||||
|
":.*GetHostByNameParallelLookups/1"
|
||||||
|
":.*HostAlias/2"
|
||||||
|
":.*HostAliasMissing/2"
|
||||||
|
":.*HostAliasMissingFile/2"
|
||||||
|
":.*NotImplResponse/2"
|
||||||
|
":.*RefusedResponse/2"
|
||||||
|
":.*Resend/1"
|
||||||
|
":.*RetryWithoutEDNS/2"
|
||||||
|
":.*SearchDomains/2"
|
||||||
|
":.*SearchDomainsBare/2"
|
||||||
|
":.*SearchDomainsServFailOnAAAA/2"
|
||||||
|
":.*SearchDomainsWithResentReply/1"
|
||||||
|
":.*SearchHighNdots/2"
|
||||||
|
":.*SearchNoDataThenFail/2"
|
||||||
|
":.*SearchNoDataThenNoDataBare/2"
|
||||||
|
":.*SearchNoDataThenSuccess/2"
|
||||||
|
":.*ServFailResponse/2"
|
||||||
|
":.*SimpleQuery/2"
|
||||||
|
":.*SockCallback/2"
|
||||||
|
":.*SockConfigureCallback/2"
|
||||||
|
":.*SortListV4/2"
|
||||||
|
":.*SortListV6/2"
|
||||||
|
":.*ThirdServer/2"
|
||||||
|
":.*TruncationRetry/1"
|
||||||
|
":.*UnspecifiedFamilyCname6A4/2"
|
||||||
|
":.*UnspecifiedFamilyV4/2"
|
||||||
|
":.*UnspecifiedFamilyV6/2")))))
|
||||||
|
#~()))))
|
||||||
|
(native-inputs
|
||||||
|
(list pkg-config))
|
||||||
|
(home-page "https://c-ares.haxx.se/")
|
||||||
|
(synopsis "C library for asynchronous DNS requests")
|
||||||
|
(description
|
||||||
|
"C-ares is a C library that performs DNS requests and name resolution
|
||||||
|
asynchronously. It is intended for applications which need to perform DNS
|
||||||
|
queries without blocking, or need to perform multiple DNS queries in parallel.
|
||||||
|
The primary examples of such applications are servers which communicate with
|
||||||
|
multiple clients and programs with graphical user interfaces.")
|
||||||
|
(license (license:x11-style "https://c-ares.haxx.se/license.html"))))
|
||||||
|
|
||||||
|
(define-public c-ares-for-node-lts
|
||||||
|
(hidden-package c-ares))
|
||||||
|
|
||||||
|
(define-public c-ares-for-node-bootstrap
|
||||||
|
(hidden-package
|
||||||
|
(package
|
||||||
|
(inherit c-ares)
|
||||||
|
(version "1.18.1")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://c-ares.haxx.se/download/c-ares-" version
|
||||||
|
".tar.gz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))))))
|
||||||
|
|
||||||
|
;; INFO: gRPC requires a c-ares built with CMake in order to get the .cmake
|
||||||
|
;; modules. We can not build c-ares itself with CMake because that would
|
||||||
|
;; introduce a circular dependency through nghttp2.
|
||||||
|
;;
|
||||||
|
;; TODO: It would be nice if we could extract the modules somehow and make
|
||||||
|
;; them work with the "normal" c-ares package instead of building a whole new
|
||||||
|
;; library.
|
||||||
|
(define-public c-ares/cmake
|
||||||
|
(hidden-package
|
||||||
|
(package
|
||||||
|
(inherit c-ares)
|
||||||
|
(build-system cmake-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
;; INFO: Tests require name resolution (the normal variant runs no
|
||||||
|
;; tests).
|
||||||
|
#:tests? #f)))))
|
||||||
|
|
||||||
(define-public cloudflare-cli
|
(define-public cloudflare-cli
|
||||||
(let ((commit "2d986d3ec1b0e3158c4bd40e8918947cb74aa392")
|
(let ((commit "2d986d3ec1b0e3158c4bd40e8918947cb74aa392")
|
||||||
@@ -143,6 +307,58 @@ protocol.")
|
|||||||
(home-page "https://github.com/earlchew/cloudflare-cli")
|
(home-page "https://github.com/earlchew/cloudflare-cli")
|
||||||
(license license:expat))))
|
(license license:expat))))
|
||||||
|
|
||||||
|
(define-public ddclient
|
||||||
|
(package
|
||||||
|
(name "ddclient")
|
||||||
|
(version "4.0.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/ddclient/ddclient")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0sz4f7qx4yjg6q6ybhzilb7f0kshz46c54y3i4hq2nww2bhkc8a4"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-before 'bootstrap 'patch-ddclient.in-shebang
|
||||||
|
(lambda _
|
||||||
|
;; This is run in the bootstrap phase, so patch before
|
||||||
|
(patch-shebang "ddclient.in")))
|
||||||
|
(add-after 'install 'wrap-program
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(wrap-program (string-append #$output "/bin/ddclient")
|
||||||
|
`("PERL5LIB" ":" prefix
|
||||||
|
,(map (lambda (input-name)
|
||||||
|
(string-append (assoc-ref inputs input-name)
|
||||||
|
"/lib/perl5/site_perl"))
|
||||||
|
'("perl-json")))))))))
|
||||||
|
(native-inputs
|
||||||
|
(list autoconf
|
||||||
|
automake
|
||||||
|
perl-http-daemon
|
||||||
|
perl-plack
|
||||||
|
perl-test-mockmodule
|
||||||
|
perl-test-tcp
|
||||||
|
perl-test-warnings))
|
||||||
|
(inputs
|
||||||
|
(list curl
|
||||||
|
perl
|
||||||
|
perl-json
|
||||||
|
bash-minimal))
|
||||||
|
(home-page "https://github.com/ddclient/ddclient")
|
||||||
|
(synopsis "Dynamic DNS update client")
|
||||||
|
(description
|
||||||
|
"ddclient is used to update dynamic DNS entries for accounts on many
|
||||||
|
dynamic DNS services. It supports a wide range of routers and protocols,
|
||||||
|
including Cloudflare, Namecheap, DynDNS, FreeDNS, Google Domains, and many
|
||||||
|
more.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public ldns
|
(define-public ldns
|
||||||
(package
|
(package
|
||||||
(name "ldns")
|
(name "ldns")
|
||||||
@@ -338,6 +554,39 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||||||
;; Source files only say GPL2 and GPL3 are allowed.
|
;; Source files only say GPL2 and GPL3 are allowed.
|
||||||
(license (list license:gpl2 license:gpl3))))
|
(license (list license:gpl2 license:gpl3))))
|
||||||
|
|
||||||
|
(define-public dnsupdate
|
||||||
|
(package
|
||||||
|
(name "dnsupdate")
|
||||||
|
(version "0.4.1")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/lopsided98/dnsupdate")
|
||||||
|
(commit version)))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0bp6mm0yhg4hs698xdmvcfad4jqf5rgb1cab88pfzyx9w52x0ag6"))))
|
||||||
|
(build-system pyproject-build-system)
|
||||||
|
(arguments
|
||||||
|
(list #:test-backend #~'unittest
|
||||||
|
#:test-flags #~'("discover" "-p" "*_test.py")))
|
||||||
|
(native-inputs
|
||||||
|
(list python-setuptools))
|
||||||
|
(propagated-inputs
|
||||||
|
(list python-beautifulsoup4
|
||||||
|
python-netifaces
|
||||||
|
python-pyyaml
|
||||||
|
python-requests))
|
||||||
|
(home-page "https://github.com/lopsided98/dnsupdate")
|
||||||
|
(synopsis "Modern and flexible dynamic DNS client")
|
||||||
|
(description
|
||||||
|
"Dnsupdate is a dynamic DNS client that provides support for multiple DNS
|
||||||
|
services, including Afraid.org FreeDNS, Cloudflare, IETF standard DNS
|
||||||
|
updates (nsupdate), and custom HTTP-based services. It uses YAML
|
||||||
|
configuration files and supports multiple address detection methods.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
;; 'bind' is the name of a built-in Guile procedure, which is why we choose a
|
;; 'bind' is the name of a built-in Guile procedure, which is why we choose a
|
||||||
;; different name here.
|
;; different name here.
|
||||||
(define-public isc-bind
|
(define-public isc-bind
|
||||||
|
|||||||
@@ -1069,7 +1069,7 @@ characterization result in a liberty library file.")
|
|||||||
(define-public kicad
|
(define-public kicad
|
||||||
(package
|
(package
|
||||||
(name "kicad")
|
(name "kicad")
|
||||||
(version "10.0.0")
|
(version "10.0.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -1077,7 +1077,7 @@ characterization result in a liberty library file.")
|
|||||||
(commit version)))
|
(commit version)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1470x1276yvd8li3w25zjg73fkpl2qp4dsx7adanafq5c4l47rmc"))
|
"1mnlv8fyz03pfg8pkqwdl5gjz6vsk98c6414lf3wkvrkb85ljaav"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
@@ -1185,7 +1185,9 @@ characterization result in a liberty library file.")
|
|||||||
"Kicad is a program for the formation of printed circuit
|
"Kicad is a program for the formation of printed circuit
|
||||||
boards and electrical circuits. The software has a number of programs that
|
boards and electrical circuits. The software has a number of programs that
|
||||||
perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
|
perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing
|
||||||
electrical diagrams), gerbview (viewing Gerber files) and others.")
|
electrical diagrams), gerbview (viewing Gerber files) and others. To use
|
||||||
|
SQLite-backed database libraries, install the optional @code{sqliteodbc}
|
||||||
|
package.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public kicad-doc
|
(define-public kicad-doc
|
||||||
@@ -1200,7 +1202,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1k0ayxsy0nnv9qxkii9yrxs7jx9y3wfjpsv5yl9wql3vdg3qay69"))))
|
"1c0vn13rp0z12rlqhl321pk2gj9577dyky6xj3i6hb040i3v7zrr"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags (list "-DBUILD_FORMATS=html"
|
`(#:configure-flags (list "-DBUILD_FORMATS=html"
|
||||||
@@ -1232,7 +1234,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0khfnln0f2zsz5hy31nw2rr0nflb2z3s9n9f7g41g03m9l3s43v2"))))
|
"0iz4lb33wdsw4f82a0ln8ycgaf39gjws03mvl2j1q9npwj6xl1cm"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(native-inputs (list python-wrapper))
|
(native-inputs (list python-wrapper))
|
||||||
(arguments
|
(arguments
|
||||||
@@ -1262,7 +1264,7 @@ libraries.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0ymmd1rzrczpvcqzw1mld9x8xhbka0vvjy3kdqwysg4ri97f5wrm"))))
|
"0jqgyi1yb2zc6w56ba7xama0wnhrqwbbnf2fqvr47xihvdcvs87v"))))
|
||||||
(synopsis "Official KiCad footprint libraries")
|
(synopsis "Official KiCad footprint libraries")
|
||||||
(description "This package contains the official KiCad footprint libraries.")))
|
(description "This package contains the official KiCad footprint libraries.")))
|
||||||
|
|
||||||
@@ -1279,7 +1281,7 @@ libraries.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0k91iw661fpzb7saryjxdcdvk1kis7dhbcpzp7xzjk84i4jvxrp5"))))
|
"0jr70ry6inzc2fy3s300z0zlmihbq95ba1zckyd1wwbpplaj1gbl"))))
|
||||||
(synopsis "Official KiCad 3D model libraries")
|
(synopsis "Official KiCad 3D model libraries")
|
||||||
(description "This package contains the official KiCad 3D model libraries.")))
|
(description "This package contains the official KiCad 3D model libraries.")))
|
||||||
|
|
||||||
@@ -3792,7 +3794,7 @@ to enforce it.")
|
|||||||
(define-public python-vunit
|
(define-public python-vunit
|
||||||
(package
|
(package
|
||||||
(name "python-vunit")
|
(name "python-vunit")
|
||||||
(version "5.0.0-dev.9") ;v4.7.0 dates back from 2 years ago.
|
(version "5.0.0-dev.10") ;v4.7.0 dates back from 2 years ago.
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -3801,7 +3803,7 @@ to enforce it.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1j9rvlshzi4mdy7wah1j8ri63drkjb47xly22q40wvl2xp2ghqgs"))))
|
(base32 "1gr9ghwgqly9zf0sf15ai20sac520rs84b9i5qjxdqpj26ayyl1q"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
@@ -290,7 +290,7 @@ based upon the Common Locale Data Repository (CLDR).")
|
|||||||
(package
|
(package
|
||||||
(inherit elixir-ex-cldr-minimal)
|
(inherit elixir-ex-cldr-minimal)
|
||||||
(name "elixir-ex-cldr")
|
(name "elixir-ex-cldr")
|
||||||
(version "2.43.2")
|
(version "2.47.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
;; The hex.pm package ships only the en locale.
|
;; The hex.pm package ships only the en locale.
|
||||||
@@ -300,7 +300,7 @@ based upon the Common Locale Data Repository (CLDR).")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1wgwp74ya0gkvd5pk4qv9s38p85r5yw370y4wv7jywy3hrbrj9f5"))))
|
(base32 "1rivy61aq0c9zfklm4bpvvkj7lzjgy316rwxl8qz92xqp6xa292y"))))
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:phases
|
#:phases
|
||||||
|
|||||||
@@ -303,7 +303,17 @@ purposes. Its goal is to be as close as possible to
|
|||||||
(list
|
(list
|
||||||
#:test-flags
|
#:test-flags
|
||||||
;; These tests require network access to badssl.com.
|
;; These tests require network access to badssl.com.
|
||||||
#~(list "--exclude" "network")))
|
#~(list "--exclude" "network")
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'make-reproducible
|
||||||
|
(lambda _
|
||||||
|
;; Buffer size has been increased in OTP 28+. For more info see:
|
||||||
|
;; https://github.com/erlang/otp/issues/9722#issuecomment-2808683303
|
||||||
|
(substitute* "test/httpoison_test.exs"
|
||||||
|
(("stream/20") "stream/100")
|
||||||
|
(("<= expected_length") "<= expected_length * 1.1")
|
||||||
|
((">= max_length") ">= max_length * 0.9")))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list erlang-cowboy
|
(list erlang-cowboy
|
||||||
elixir-earmark
|
elixir-earmark
|
||||||
|
|||||||
@@ -164,7 +164,8 @@ Mix.CLI.main()"
|
|||||||
'("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
|
'("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))
|
||||||
programs))))))))
|
programs))))))))
|
||||||
(outputs '("out" "src"))
|
(outputs '("out" "src"))
|
||||||
(inputs (list bash-minimal erlang rebar3 git))
|
(inputs (list bash-minimal erlang rebar3))
|
||||||
|
(native-inputs (list git-minimal))
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
(list (search-path-specification
|
(list (search-path-specification
|
||||||
(variable "GUIX_ELIXIR_LIBS")
|
(variable "GUIX_ELIXIR_LIBS")
|
||||||
|
|||||||
+705
-97
File diff suppressed because it is too large
Load Diff
@@ -1902,7 +1902,7 @@ PicoBlaze; and Zilog Z80 families, plus many of their variants.")
|
|||||||
(inputs
|
(inputs
|
||||||
(list readline ucsim))
|
(list readline ucsim))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list bison boost flex python-2 texinfo zlib))
|
(list bison boost flex python-minimal-wrapper texinfo zlib))
|
||||||
(home-page "https://sdcc.sourceforge.net/")
|
(home-page "https://sdcc.sourceforge.net/")
|
||||||
(synopsis "C compiler suite for 8-bit microcontrollers")
|
(synopsis "C compiler suite for 8-bit microcontrollers")
|
||||||
(description "SDCC is a retargetable, optimizing Standard C compiler suite
|
(description "SDCC is a retargetable, optimizing Standard C compiler suite
|
||||||
|
|||||||
@@ -3452,7 +3452,7 @@ This is a part of the TiLP project.")
|
|||||||
(define-public mame
|
(define-public mame
|
||||||
(package
|
(package
|
||||||
(name "mame")
|
(name "mame")
|
||||||
(version "0.252")
|
(version "0.287")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -3461,16 +3461,16 @@ This is a part of the TiLP project.")
|
|||||||
(commit (apply string-append "mame" (string-split version #\.)))))
|
(commit (apply string-append "mame" (string-split version #\.)))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "07qhcm1v47sy2wj30nx3cbhvcbgki0cl83gabr0miiw60fhgyn6j"))
|
(base32 "1p9v71gvaqiyj6sa1b0wkdksa9wnr6yr2a43ckycljjfas5s36kq"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
;; Remove bundled libraries.
|
;; Remove bundled libraries.
|
||||||
'(begin
|
'(begin
|
||||||
(with-directory-excursion "3rdparty"
|
(with-directory-excursion "3rdparty"
|
||||||
(for-each delete-file-recursively
|
(for-each delete-file-recursively
|
||||||
'("asio" "expat" "glm" "libflac" "libjpeg" "lua"
|
'("asio" "expat" "glm" "flac" "libjpeg" "lua"
|
||||||
"portaudio" "portmidi" "pugixml" "rapidjson" "SDL2"
|
"portaudio" "portmidi" "pugixml" "rapidjson"
|
||||||
"SDL2-override" "sqlite3" "utf8proc" "zlib")))))))
|
"sqlite3" "utf8proc" "zlib")))))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -3604,7 +3604,9 @@ This is a part of the TiLP project.")
|
|||||||
libjpeg-turbo
|
libjpeg-turbo
|
||||||
libxi
|
libxi
|
||||||
libxinerama
|
libxinerama
|
||||||
lua
|
;; MAME requires Lua compiled as C++ to work correctly.
|
||||||
|
;; See https://www.mamedev.org/?p=523
|
||||||
|
lua-5.4-for-c++
|
||||||
portaudio
|
portaudio
|
||||||
portmidi
|
portmidi
|
||||||
pugixml
|
pugixml
|
||||||
|
|||||||
@@ -2730,7 +2730,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
|
|||||||
(define-public freecad
|
(define-public freecad
|
||||||
(package
|
(package
|
||||||
(name "freecad")
|
(name "freecad")
|
||||||
(version "1.1.0")
|
(version "1.1.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -2740,7 +2740,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly workbench.")
|
|||||||
(recursive? #t))) ;needed for the AddonManager
|
(recursive? #t))) ;needed for the AddonManager
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
|
(base32 "05dx7ifx33705mxb0vc82j0mzzkazakgadfgq5bws30qrxp49xgg"))
|
||||||
(snippet
|
(snippet
|
||||||
#~(begin
|
#~(begin
|
||||||
(use-modules (guix build utils))
|
(use-modules (guix build utils))
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
(define-public erlang
|
(define-public erlang
|
||||||
(package
|
(package
|
||||||
(name "erlang")
|
(name "erlang")
|
||||||
(version "27.3.4.6")
|
(version "28.4.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
;; The tarball from http://erlang.org/download contains many
|
;; The tarball from http://erlang.org/download contains many
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0dhz2c7w28ss0ypj7jh88pfs3kc8hbwiiq91in1j2miy5sn4cp3x"))
|
"1dsdmp2rccc0rhzy2w8r4amxmc6nr9hbi053j2s0bg9db30b48rc"))
|
||||||
(patches (search-patches "erlang-man-path.patch"))))
|
(patches (search-patches "erlang-man-path.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
"/OTP-" version "/otp_doc_man_" version ".tar.gz"))
|
"/OTP-" version "/otp_doc_man_" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1j1fcli7ma9vi4qyv67lq7yiznhpnfvcmh57bn8qxvha6ky2pngm"))))))
|
"1g17wzv8j12g9272yvv55nj4wqs09hxkv3i0vnp7d6gcs24bmphi"))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list ncurses openssl wxwidgets))
|
(list ncurses openssl wxwidgets))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
|
|||||||
@@ -220,6 +220,7 @@ testing InfiniBand networks.")
|
|||||||
"--disable-assertions"
|
"--disable-assertions"
|
||||||
"--disable-params-check"
|
"--disable-params-check"
|
||||||
|
|
||||||
|
"--enable-mt"
|
||||||
(string-append "--with-verbs="
|
(string-append "--with-verbs="
|
||||||
#$(this-package-input "rdma-core"))
|
#$(this-package-input "rdma-core"))
|
||||||
|
|
||||||
|
|||||||
@@ -148,6 +148,11 @@ client.")
|
|||||||
(list (search-path-specification
|
(list (search-path-specification
|
||||||
(variable "FCITX_ADDON_DIRS")
|
(variable "FCITX_ADDON_DIRS")
|
||||||
(files '("lib/fcitx5")))
|
(files '("lib/fcitx5")))
|
||||||
|
(search-path-specification
|
||||||
|
(variable "GUIX_GTK2_IM_MODULE_FILE")
|
||||||
|
(file-type 'regular)
|
||||||
|
(separator #f)
|
||||||
|
(files '("lib/gtk-2.0/2.10.0/immodules-gtk2.cache")))
|
||||||
(search-path-specification
|
(search-path-specification
|
||||||
(variable "GUIX_GTK3_IM_MODULE_FILE")
|
(variable "GUIX_GTK3_IM_MODULE_FILE")
|
||||||
(file-type 'regular)
|
(file-type 'regular)
|
||||||
|
|||||||
@@ -165,7 +165,7 @@
|
|||||||
;; <https://bitcoincore.org/en/lifecycle/#schedule>.
|
;; <https://bitcoincore.org/en/lifecycle/#schedule>.
|
||||||
(package
|
(package
|
||||||
(name "bitcoin-core")
|
(name "bitcoin-core")
|
||||||
(version "30.2")
|
(version "31.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
@@ -173,7 +173,7 @@
|
|||||||
version "/bitcoin-" version ".tar.gz"))
|
version "/bitcoin-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1jw4djh22v0nih0n7irdbknfbqavlc4l3b8176b5qgc88a60pl3g"))))
|
"1qxkcyq8nwq6sw4qi660z8n8356mqdsf4jvpq5ndkvrsx9gfz80b"))))
|
||||||
(build-system qt-build-system)
|
(build-system qt-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:qtbase qtbase
|
(list #:qtbase qtbase
|
||||||
@@ -197,9 +197,7 @@
|
|||||||
"python3" "./test/functional/test_runner.py" "--timeout-factor=2"
|
"python3" "./test/functional/test_runner.py" "--timeout-factor=2"
|
||||||
(string-append "--jobs=" (number->string (parallel-job-count)))))))))
|
(string-append "--jobs=" (number->string (parallel-job-count)))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list bash ; provides the sh command for system_tests
|
(list pkg-config
|
||||||
coreutils ; provides the cat, echo and false commands for system_tests
|
|
||||||
pkg-config
|
|
||||||
python ; for the tests
|
python ; for the tests
|
||||||
python-pyzmq ; for the tests
|
python-pyzmq ; for the tests
|
||||||
qttools))
|
qttools))
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
;;; Copyright © 2014 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||||
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||||
;;; Copyright © 2016, 2018, 2021 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2016, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
;;; Copyright © 2017 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||||
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
|
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
|
||||||
@@ -84,7 +84,6 @@
|
|||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages mtools)
|
#:use-module (gnu packages mtools)
|
||||||
#:use-module (gnu packages pciutils)
|
#:use-module (gnu packages pciutils)
|
||||||
#:use-module (gnu packages pciutils)
|
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
@@ -524,162 +523,6 @@ Loke and Heimdall communicate via the custom Samsung-developed protocol typicall
|
|||||||
referred to as the \"Odin 3 protocol\".")
|
referred to as the \"Odin 3 protocol\".")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public ifdtool
|
|
||||||
(package
|
|
||||||
(name "ifdtool")
|
|
||||||
(version "25.09")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://review.coreboot.org/coreboot")
|
|
||||||
(commit version)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:make-flags
|
|
||||||
#~(list (string-append "CC=" #$(cc-for-target))
|
|
||||||
"INSTALL=install"
|
|
||||||
(string-append "PREFIX=" #$output))
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'chdir
|
|
||||||
(lambda _
|
|
||||||
(chdir "util/ifdtool")))
|
|
||||||
(delete 'configure)) ; no configure script
|
|
||||||
#:tests? #f)) ; no test suite
|
|
||||||
(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.")
|
|
||||||
(license license:gpl2)))
|
|
||||||
|
|
||||||
(define-public bincfg
|
|
||||||
(package
|
|
||||||
(name "bincfg")
|
|
||||||
(version "25.09")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://review.coreboot.org/coreboot")
|
|
||||||
(commit version)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:tests? #f ; no test suite
|
|
||||||
#:make-flags
|
|
||||||
#~(list
|
|
||||||
(string-append "CC=" #$(cc-for-target)))
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(delete 'configure) ; no configure script
|
|
||||||
(add-after 'unpack 'chdir
|
|
||||||
(lambda _
|
|
||||||
(chdir "util/bincfg")))
|
|
||||||
(add-after 'build 'build-binaries
|
|
||||||
(lambda* (#:key make-flags #:allow-other-keys)
|
|
||||||
(for-each
|
|
||||||
(lambda (target result)
|
|
||||||
(apply invoke "make" (string-append "gen-" target) make-flags)
|
|
||||||
(rename-file result
|
|
||||||
(string-append target ".bin")))
|
|
||||||
(list
|
|
||||||
;; generate GbE for X200
|
|
||||||
"gbe-ich9m"
|
|
||||||
;; generate GbE for X220/x230
|
|
||||||
"gbe-82579LM"
|
|
||||||
;; generate IFD for X200
|
|
||||||
"ifd-x200")
|
|
||||||
(list
|
|
||||||
"flashregion_3_gbe.bin"
|
|
||||||
"flashregion_3_gbe.bin"
|
|
||||||
"flashregion_0_fd.bin"))))
|
|
||||||
;; The Makefile has no install target.
|
|
||||||
(replace 'install
|
|
||||||
(lambda _
|
|
||||||
(let ((bin (string-append #$output "/bin"))
|
|
||||||
(lib (string-append #$output "/lib/bincfg"))
|
|
||||||
(data (string-append #$output "/share/bincfg")))
|
|
||||||
;; Install the program
|
|
||||||
(install-file "bincfg" bin)
|
|
||||||
;; And its data
|
|
||||||
(for-each
|
|
||||||
(lambda (path)
|
|
||||||
(install-file path data))
|
|
||||||
(append (find-files "." ".*\\.set")
|
|
||||||
(find-files "." ".*\\.spec")))
|
|
||||||
;; And the files generated with the data
|
|
||||||
(for-each
|
|
||||||
(lambda (path)
|
|
||||||
(install-file path lib))
|
|
||||||
(find-files "." ".*\\.bin"))))))))
|
|
||||||
(native-inputs (list bison flex))
|
|
||||||
(home-page "https://coreboot.org")
|
|
||||||
(synopsis "Encoder/decoder for binary formats described in text files")
|
|
||||||
(description "
|
|
||||||
The bincfg program comes with specifications files for the following binary
|
|
||||||
formats:
|
|
||||||
@itemize
|
|
||||||
@item Various DDR3 and DDR4 SPD
|
|
||||||
@item Configuration data for the Intel 82579LM Gigabit Ethernet PHY
|
|
||||||
@item Configuration data for the Intel Gigabit Ethernet controller present in
|
|
||||||
the Intel ICH9-M chipset.
|
|
||||||
@item Intel Firmware Descriptor data for the Lenovo ThinkPad X200
|
|
||||||
@item Configuration data for the ITE IT8718F SuperIO
|
|
||||||
@end itemize
|
|
||||||
It also comes with example files generated by bincfg.")
|
|
||||||
(license license:gpl3+)))
|
|
||||||
|
|
||||||
(define-public intelmetool
|
|
||||||
(package
|
|
||||||
(name "intelmetool")
|
|
||||||
(version "25.09")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://review.coreboot.org/coreboot")
|
|
||||||
(commit version)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:tests? #f ;no test suite
|
|
||||||
#:make-flags
|
|
||||||
#~(list (string-append "CC=" #$(cc-for-target))
|
|
||||||
"INSTALL=install"
|
|
||||||
(string-append "PREFIX=" #$output))
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'chdir
|
|
||||||
(lambda _
|
|
||||||
(chdir "util/intelmetool")))
|
|
||||||
(delete 'configure) ;no configure script
|
|
||||||
(delete 'check))))
|
|
||||||
(inputs (list pciutils zlib))
|
|
||||||
(home-page
|
|
||||||
"https://github.com/coreboot/coreboot/tree/main/util/intelmetool/")
|
|
||||||
(synopsis "Intel Management Engine tools")
|
|
||||||
(description "This package provides tools for working with Intel
|
|
||||||
Management Engine (ME). You need to @code{sudo rmmod mei_me} and
|
|
||||||
@code{sudo rmmod mei} before using this tool. Also pass
|
|
||||||
@code{iomem=relaxed} to the Linux kernel command line.")
|
|
||||||
(license license:gpl2)
|
|
||||||
|
|
||||||
;; This is obviously an Intel thing, plus it requires <cpuid.h>.
|
|
||||||
(supported-systems '("x86_64-linux" "i686-linux"))))
|
|
||||||
|
|
||||||
(define-public me-cleaner
|
(define-public me-cleaner
|
||||||
(package
|
(package
|
||||||
(name "me-cleaner")
|
(name "me-cleaner")
|
||||||
|
|||||||
+33
-40
@@ -4658,46 +4658,6 @@ is a stylish type with a polished yet relaxed feel. Its versatility makes it
|
|||||||
suitable for a wide range of uses.")
|
suitable for a wide range of uses.")
|
||||||
(license license:silofl1.1))))
|
(license license:silofl1.1))))
|
||||||
|
|
||||||
(define-public font-cozette
|
|
||||||
(package
|
|
||||||
(name "font-cozette")
|
|
||||||
(version "1.13.0")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/slavfox/Cozette")
|
|
||||||
(commit (string-append "v." version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"178i812n4sfsvid7jhnm683jlxqmrv4ck6qbb4nwyllhwg3gyq60"))))
|
|
||||||
(build-system font-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'dont-depend-on-git
|
|
||||||
(lambda _
|
|
||||||
(substitute* "build.py"
|
|
||||||
;; Merely importing this module requires a git repository.
|
|
||||||
;; We don't use get_changelog, so just disable the import.
|
|
||||||
(("from cozette_builder\\.changeloggen import get_changelog")
|
|
||||||
""))))
|
|
||||||
(add-before 'install 'build
|
|
||||||
(lambda _
|
|
||||||
(invoke "python3" "build.py" "fonts"))))))
|
|
||||||
(native-inputs
|
|
||||||
(list fontforge
|
|
||||||
python
|
|
||||||
python-crayons
|
|
||||||
python-fonttools
|
|
||||||
python-numpy
|
|
||||||
python-pillow))
|
|
||||||
(home-page "https://github.com/slavfox/Cozette")
|
|
||||||
(synopsis "Bitmap programming font")
|
|
||||||
(description "Cozette is a 6x13px (bounding box) bitmap font based on Dina
|
|
||||||
and heavily inspired by Creep.")
|
|
||||||
(license license:expat)))
|
|
||||||
|
|
||||||
(define-public font-montserrat
|
(define-public font-montserrat
|
||||||
(package
|
(package
|
||||||
(name "font-montserrat")
|
(name "font-montserrat")
|
||||||
@@ -5559,6 +5519,39 @@ technical and idiosyncratic feel—perfect for headers and pull-quotes. Made to
|
|||||||
work well together with Mona Sans.")
|
work well together with Mona Sans.")
|
||||||
(license license:silofl1.1)))
|
(license license:silofl1.1)))
|
||||||
|
|
||||||
|
(define-public font-open-sans
|
||||||
|
(package
|
||||||
|
(name "font-open-sans")
|
||||||
|
(version "3.003")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/googlefonts/opensans")
|
||||||
|
(commit "bd7e37632246368c60fdcbd374dbf9bad11969b6")))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1mlnybaci1cr8z5xzxm7l2xpwfq27x9hqv649hc2ni1cjsyhpjp8"))))
|
||||||
|
(build-system font-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
;; Install the variable fonts only.
|
||||||
|
(let ((%install (assoc-ref %standard-phases 'install)))
|
||||||
|
(with-directory-excursion "fonts/variable"
|
||||||
|
(%install #:outputs outputs))))))))
|
||||||
|
(home-page "https://github.com/googlefonts/opensans")
|
||||||
|
(synopsis "Humanist sans-serif typeface by Steve Matteson")
|
||||||
|
(description
|
||||||
|
"Open Sans is an open source humanist sans-serif typeface
|
||||||
|
that was designed by Steve Matteson under commission from Google. It was
|
||||||
|
released in 2011 and is based on his earlier design called Droid Sans, which
|
||||||
|
was specifically created for Android mobile devices but with slight
|
||||||
|
modifications to its width.")
|
||||||
|
(license license:silofl1.1)))
|
||||||
|
|
||||||
(define-public font-peppercarrot
|
(define-public font-peppercarrot
|
||||||
(package
|
(package
|
||||||
|
|||||||
@@ -3454,7 +3454,7 @@ interfaces.")
|
|||||||
(string-append (assoc-ref outputs "out")
|
(string-append (assoc-ref outputs "out")
|
||||||
"/share/doc/" ,name)))))))
|
"/share/doc/" ,name)))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list cmake-minimal pkg-config))
|
(list cmake-minimal pkg-config scdoc))
|
||||||
(inputs (list elogind
|
(inputs (list elogind
|
||||||
bash-minimal
|
bash-minimal
|
||||||
grim
|
grim
|
||||||
|
|||||||
+152
-62
@@ -97,6 +97,7 @@
|
|||||||
;;; Copyright © 2025 Aiden Isik <aidenisik+git@member.fsf.org>
|
;;; Copyright © 2025 Aiden Isik <aidenisik+git@member.fsf.org>
|
||||||
;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
|
;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
|
||||||
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
||||||
|
;;; Copyright © 2026 Nikita Alkhovik <forgoty13@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -114,40 +115,32 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages games)
|
(define-module (gnu packages games)
|
||||||
#:use-module (ice-9 match)
|
#:autoload (gnu packages pascal) (fpc)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix svn-download)
|
|
||||||
#:use-module (guix gexp)
|
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (gnu packages acl)
|
#:use-module (gnu packages acl)
|
||||||
#:use-module (gnu packages adns)
|
#:use-module (gnu packages admin)
|
||||||
#:use-module (gnu packages algebra)
|
#:use-module (gnu packages algebra)
|
||||||
|
#:use-module (gnu packages assembly)
|
||||||
|
#:use-module (gnu packages audio)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
|
#:use-module (gnu packages avahi)
|
||||||
#:use-module (gnu packages backup)
|
#:use-module (gnu packages backup)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages build-tools)
|
|
||||||
#:use-module (gnu packages admin)
|
|
||||||
#:use-module (gnu packages audio)
|
|
||||||
#:use-module (gnu packages avahi)
|
|
||||||
#:use-module (gnu packages assembly)
|
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages bison)
|
#:use-module (gnu packages bison)
|
||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages boost)
|
||||||
|
#:use-module (gnu packages build-tools)
|
||||||
#:use-module (gnu packages c)
|
#:use-module (gnu packages c)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages cmake)
|
#:use-module (gnu packages cmake)
|
||||||
#:use-module (gnu packages compression)
|
|
||||||
#:use-module (gnu packages code)
|
#:use-module (gnu packages code)
|
||||||
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages cpp)
|
#:use-module (gnu packages cpp)
|
||||||
#:use-module (gnu packages curl)
|
|
||||||
#:use-module (gnu packages crypto)
|
#:use-module (gnu packages crypto)
|
||||||
|
#:use-module (gnu packages curl)
|
||||||
#:use-module (gnu packages cyrus-sasl)
|
#:use-module (gnu packages cyrus-sasl)
|
||||||
#:use-module (gnu packages documentation)
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages docbook)
|
#:use-module (gnu packages docbook)
|
||||||
|
#:use-module (gnu packages documentation)
|
||||||
#:use-module (gnu packages emacs)
|
#:use-module (gnu packages emacs)
|
||||||
#:use-module (gnu packages emulators)
|
#:use-module (gnu packages emulators)
|
||||||
#:use-module (gnu packages flex)
|
#:use-module (gnu packages flex)
|
||||||
@@ -202,8 +195,8 @@
|
|||||||
#:use-module (gnu packages maths)
|
#:use-module (gnu packages maths)
|
||||||
#:use-module (gnu packages messaging)
|
#:use-module (gnu packages messaging)
|
||||||
#:use-module (gnu packages mp3)
|
#:use-module (gnu packages mp3)
|
||||||
#:use-module (gnu packages music)
|
|
||||||
#:use-module (gnu packages multiprecision)
|
#:use-module (gnu packages multiprecision)
|
||||||
|
#:use-module (gnu packages music)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages netpbm)
|
#:use-module (gnu packages netpbm)
|
||||||
#:use-module (gnu packages networking)
|
#:use-module (gnu packages networking)
|
||||||
@@ -212,7 +205,6 @@
|
|||||||
#:use-module (gnu packages oneapi)
|
#:use-module (gnu packages oneapi)
|
||||||
#:use-module (gnu packages opencl)
|
#:use-module (gnu packages opencl)
|
||||||
#:use-module (gnu packages pcre)
|
#:use-module (gnu packages pcre)
|
||||||
#:autoload (gnu packages pascal) (fpc)
|
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages perl-check)
|
#:use-module (gnu packages perl-check)
|
||||||
#:use-module (gnu packages perl-compression)
|
#:use-module (gnu packages perl-compression)
|
||||||
@@ -230,9 +222,9 @@
|
|||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages regex)
|
#:use-module (gnu packages regex)
|
||||||
#:use-module (gnu packages ruby-xyz)
|
#:use-module (gnu packages ruby-xyz)
|
||||||
#:use-module (gnu packages shells)
|
|
||||||
#:use-module (gnu packages sdl)
|
#:use-module (gnu packages sdl)
|
||||||
#:use-module (gnu packages serialization)
|
#:use-module (gnu packages serialization)
|
||||||
|
#:use-module (gnu packages shells)
|
||||||
#:use-module (gnu packages sqlite)
|
#:use-module (gnu packages sqlite)
|
||||||
#:use-module (gnu packages squirrel)
|
#:use-module (gnu packages squirrel)
|
||||||
#:use-module (gnu packages swig)
|
#:use-module (gnu packages swig)
|
||||||
@@ -249,22 +241,31 @@
|
|||||||
#:use-module (gnu packages wget)
|
#:use-module (gnu packages wget)
|
||||||
#:use-module (gnu packages wxwidgets)
|
#:use-module (gnu packages wxwidgets)
|
||||||
#:use-module (gnu packages xdisorg)
|
#:use-module (gnu packages xdisorg)
|
||||||
#:use-module (gnu packages xorg)
|
|
||||||
#:use-module (gnu packages xiph)
|
#:use-module (gnu packages xiph)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (guix build-system copy)
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages)
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix build-system cmake)
|
||||||
|
#:use-module (guix build-system copy)
|
||||||
#:use-module (guix build-system glib-or-gtk)
|
#:use-module (guix build-system glib-or-gtk)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system go)
|
#:use-module (guix build-system go)
|
||||||
#:use-module (guix build-system haskell)
|
#:use-module (guix build-system haskell)
|
||||||
#:use-module (guix build-system meson)
|
#:use-module (guix build-system meson)
|
||||||
#:use-module (guix build-system perl)
|
#:use-module (guix build-system perl)
|
||||||
#:use-module (guix build-system python)
|
|
||||||
#:use-module (guix build-system pyproject)
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system python)
|
||||||
#:use-module (guix build-system qt)
|
#:use-module (guix build-system qt)
|
||||||
#:use-module (guix build-system scons)
|
#:use-module (guix build-system scons)
|
||||||
#:use-module (guix build-system trivial)
|
#:use-module (guix build-system trivial)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix svn-download)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:use-module (ice-9 match)
|
||||||
#:use-module ((srfi srfi-1) #:hide (zip))
|
#:use-module ((srfi srfi-1) #:hide (zip))
|
||||||
#:use-module (srfi srfi-26))
|
#:use-module (srfi srfi-26))
|
||||||
|
|
||||||
@@ -483,7 +484,7 @@ mouse and joystick control, and original music.")
|
|||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://git.sr.ht/~drummyfish/Anarch")
|
(url "https://gitlab.com/drummyfish/anarch")
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
@@ -4276,11 +4277,11 @@ interface or via an external visual interface such as GNU XBoard.")
|
|||||||
(("TestIOTouchDragAnywhere (test_integration)" all _) _))))
|
(("TestIOTouchDragAnywhere (test_integration)" all _) _))))
|
||||||
(add-before 'bootstrap 'autoreconf
|
(add-before 'bootstrap 'autoreconf
|
||||||
(lambda _
|
(lambda _
|
||||||
;; automake is out of date in the source
|
;; automake is out of date in the source
|
||||||
;; autoreconf updates the automake scripts
|
;; autoreconf updates the automake scripts
|
||||||
(invoke "autoreconf")
|
(invoke "autoreconf")
|
||||||
;; Build fails when autom4te.cache exists.
|
;; Build fails when autom4te.cache exists.
|
||||||
(delete-file-recursively "autom4te.cache")
|
(delete-file-recursively "autom4te.cache")
|
||||||
#t))
|
#t))
|
||||||
(add-after 'install 'delete-freedinkedit-desktop
|
(add-after 'install 'delete-freedinkedit-desktop
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
@@ -4610,6 +4611,105 @@ for common mesh file formats, and collision detection.")
|
|||||||
(home-page "https://irrlicht.sourceforge.io/")
|
(home-page "https://irrlicht.sourceforge.io/")
|
||||||
(license license:zlib)))
|
(license license:zlib)))
|
||||||
|
|
||||||
|
(define-public pegasus-frontend
|
||||||
|
(let ((commit "c3462e68bf3a178420b44f356998255f8d82a113")
|
||||||
|
(revision "weekly_2024w38"))
|
||||||
|
(package
|
||||||
|
(name "pegasus-frontend")
|
||||||
|
(version (git-version "0.0" revision commit))
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/mmatyas/pegasus-frontend")
|
||||||
|
(commit commit)))
|
||||||
|
(sha256
|
||||||
|
(base32 "1p350nlbif33mw5cbqxwli5yf47dxpransxlj2wp8xvh4w1rb3jx"))
|
||||||
|
(file-name (git-file-name name version))))
|
||||||
|
(build-system qt-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:qtbase qtbase-5
|
||||||
|
#:make-flags
|
||||||
|
#~(list (string-append "INSTALL_DESKTOPDIR="
|
||||||
|
#$output "/share/applications")
|
||||||
|
(string-append "INSTALL_ICONDIR="
|
||||||
|
#$output "/share/icons/hicolor"))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'copy-modules
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(copy-recursively #$(this-package-native-input
|
||||||
|
"SortFilterProxyModel")
|
||||||
|
"./thirdparty/SortFilterProxyModel")
|
||||||
|
(copy-recursively #$(this-package-native-input
|
||||||
|
"pegasus-theme-grid")
|
||||||
|
"./src/themes/pegasus-theme-grid")
|
||||||
|
(copy-recursively #$(this-package-native-input
|
||||||
|
"pegasus-frontend-translations") "./lang")))
|
||||||
|
(add-before 'check 'prepare-test-env
|
||||||
|
(lambda* (#:key tests? #:allow-other-keys)
|
||||||
|
(when tests?
|
||||||
|
(setenv "QT_QPA_PLATFORM" "offscreen")
|
||||||
|
(setenv "QT_QUICK_BACKEND" "software"))))
|
||||||
|
(add-after 'qt-wrap 'gst-wrap
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(wrap-program (string-append #$output "/bin/pegasus-fe")
|
||||||
|
`("GST_PLUGIN_PATH" suffix
|
||||||
|
,(search-path-as-list '("lib/gstreamer-1.0")
|
||||||
|
(map cdr inputs)))))))))
|
||||||
|
(inputs (list sdl2
|
||||||
|
bash-minimal
|
||||||
|
qtbase-5
|
||||||
|
qtsvg-5
|
||||||
|
qtdeclarative-5
|
||||||
|
qtgraphicaleffects
|
||||||
|
qtmultimedia-5
|
||||||
|
qtgamepad-5
|
||||||
|
gst-plugins-base
|
||||||
|
gst-plugins-bad
|
||||||
|
gst-plugins-good))
|
||||||
|
(native-inputs (list qttools-5
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url
|
||||||
|
"https://github.com/mmatyas/pegasus-frontend-translations")
|
||||||
|
(commit
|
||||||
|
"46c7cecec745bdd4c61bfc7ecb967156ad208642")))
|
||||||
|
(file-name "pegasus-frontend-translations")
|
||||||
|
(sha256 (base32
|
||||||
|
"0rvlx199wdrjxr8pgibga556zf4njq4w2n31fdirqgb631rgyqxd")))
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url
|
||||||
|
"https://github.com/mmatyas/pegasus-theme-grid")
|
||||||
|
(commit
|
||||||
|
"5951db6f2a4fe0db6a4fd6f00da1f280cadfa536")))
|
||||||
|
(file-name "pegasus-theme-grid")
|
||||||
|
(sha256 (base32
|
||||||
|
"1nfnq6lppdm9ni6jk48l1i7hk90m8w2p13swl5nr4zwczln8dbz1")))
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url
|
||||||
|
"https://github.com/mmatyas/SortFilterProxyModel")
|
||||||
|
(commit
|
||||||
|
"2061f8136ba372fd06c1928a610258b7d88cb144")))
|
||||||
|
(file-name "SortFilterProxyModel")
|
||||||
|
(sha256 (base32
|
||||||
|
"16va8fcf7v6kfm8r9zym0516qrk4vlsy5wmpd3r3002wpz8q39h2")))))
|
||||||
|
(synopsis
|
||||||
|
"Graphical frontend for launching and managing game collection")
|
||||||
|
(description
|
||||||
|
"Pegasus is a graphical frontend for browsing your game library and
|
||||||
|
launching all kinds of games from the same place. It's focusing on
|
||||||
|
customizability, cross platform support (including embedded)
|
||||||
|
and high performance.")
|
||||||
|
(home-page "https://pegasus-frontend.org")
|
||||||
|
(license license:gpl3+))))
|
||||||
|
|
||||||
(define-public mars
|
(define-public mars
|
||||||
;; No official release since 2013: use the latest commit.
|
;; No official release since 2013: use the latest commit.
|
||||||
(let ((commit "84664cda094efe6e49d9b1550e4f4f98c33eefa2")
|
(let ((commit "84664cda094efe6e49d9b1550e4f4f98c33eefa2")
|
||||||
@@ -5421,7 +5521,7 @@ falling, themeable graphics and sounds, and replays.")
|
|||||||
(name "wesnoth")
|
(name "wesnoth")
|
||||||
;; Even-numbered minor versions indicate stable versions:
|
;; Even-numbered minor versions indicate stable versions:
|
||||||
;; https://wiki.wesnoth.org/ReleasingWesnoth#Version_numbering
|
;; https://wiki.wesnoth.org/ReleasingWesnoth#Version_numbering
|
||||||
(version "1.18.6")
|
(version "1.18.7")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -5430,27 +5530,17 @@ falling, themeable graphics and sounds, and replays.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0cdlczxczqgzdaqwydb9gfgi7d9jc39li72p2rb5nk1rlgfff79s"))))
|
"0hdrp4xm9d8kj8id2g5q0wwdwykx4a0f1cs8a7fghmv0czryfv7f"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:tests? #f ;no test target
|
(list #:tests? #f ;no test target
|
||||||
#:configure-flags #~'("-DENABLE_SYSTEM_LUA=ON")
|
#:configure-flags #~'("-DENABLE_SYSTEM_LUA=ON")))
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-before 'configure 'pre-configure
|
|
||||||
(lambda _
|
|
||||||
;; XXX: Our Lua doesn't have a C++ library, force C linkage.
|
|
||||||
(substitute* '("src/lua/wrapper_lua.h"
|
|
||||||
"src/lua/wrapper_lualib.h"
|
|
||||||
"src/lua/wrapper_lauxlib.h")
|
|
||||||
(("#include \"(lua|lualib|lauxlib)\\.h\"")
|
|
||||||
"#include \"lua.hpp\"")))))))
|
|
||||||
(inputs
|
(inputs
|
||||||
(list boost-1.83
|
(list boost-1.83
|
||||||
curl
|
curl
|
||||||
dbus
|
dbus
|
||||||
libvorbis
|
libvorbis
|
||||||
lua-5.4
|
lua-5.4-for-c++
|
||||||
openssl
|
openssl
|
||||||
pango
|
pango
|
||||||
sdl2
|
sdl2
|
||||||
@@ -5837,7 +5927,7 @@ Transport Tycoon Deluxe.")
|
|||||||
(add-after 'unpack 'patch-sources
|
(add-after 'unpack 'patch-sources
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(substitute* "src/music/fluidsynth.cpp"
|
(substitute* "src/music/fluidsynth.cpp"
|
||||||
(("default_sf\\[\\] = \\{" all)
|
(("_default_soundfonts\\[\\] = \\{" all)
|
||||||
(string-append all "
|
(string-append all "
|
||||||
\t/* Guix hardcoded :P */
|
\t/* Guix hardcoded :P */
|
||||||
\t\"" (search-input-file inputs "/share/soundfonts/FreePatsGM.sf2") "\",
|
\t\"" (search-input-file inputs "/share/soundfonts/FreePatsGM.sf2") "\",
|
||||||
@@ -5864,7 +5954,7 @@ Transport Tycoon Deluxe.")
|
|||||||
(package
|
(package
|
||||||
(inherit openttd)
|
(inherit openttd)
|
||||||
(name "openttd-jgrpp")
|
(name "openttd-jgrpp")
|
||||||
(version "0.70.2")
|
(version "0.71.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -5873,7 +5963,7 @@ Transport Tycoon Deluxe.")
|
|||||||
(commit (string-append "jgrpp-" version))))
|
(commit (string-append "jgrpp-" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1jzzvribf2cqvjl9cympyx9qpplljvmhqrrlw7aq4ckzl92d87z3"))))
|
(base32 "1cy1ghc1mc61hdz8lykx2ggs5nld30jdgj8y4vdli2v1ffhy7xy9"))))
|
||||||
(inputs (modify-inputs inputs
|
(inputs (modify-inputs inputs
|
||||||
(append zstd harfbuzz)))
|
(append zstd harfbuzz)))
|
||||||
(arguments
|
(arguments
|
||||||
@@ -6649,7 +6739,7 @@ in-window at 640x480 resolution or fullscreen.")
|
|||||||
(define-public warzone2100
|
(define-public warzone2100
|
||||||
(package
|
(package
|
||||||
(name "warzone2100")
|
(name "warzone2100")
|
||||||
(version "4.6.1")
|
(version "4.6.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/warzone2100/releases/"
|
(uri (string-append "mirror://sourceforge/warzone2100/releases/"
|
||||||
@@ -6665,7 +6755,7 @@ in-window at 640x480 resolution or fullscreen.")
|
|||||||
"inih" "re2" "utf8proc" "utfcpp")))))
|
"inih" "re2" "utf8proc" "utfcpp")))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"02x5ihkpfkpjxwvh00d8yqzd796af7d684nk96hzhhq28qw5bb16"))))
|
"0fmiy0pm56yy69c0nhynjdiaslwlfg8cdvfl5s78g5pzdi1y47s3"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments (list #:configure-flags #~'("-GNinja"
|
(arguments (list #:configure-flags #~'("-GNinja"
|
||||||
"-DWZ_DISTRIBUTOR=Guix"
|
"-DWZ_DISTRIBUTOR=Guix"
|
||||||
@@ -6702,7 +6792,7 @@ in-window at 640x480 resolution or fullscreen.")
|
|||||||
opusfile
|
opusfile
|
||||||
physfs
|
physfs
|
||||||
re2
|
re2
|
||||||
sdl2
|
sdl3
|
||||||
sqlite
|
sqlite
|
||||||
utf8proc
|
utf8proc
|
||||||
utfcpp
|
utfcpp
|
||||||
@@ -9143,7 +9233,7 @@ elements to achieve a simple goal in the most complex way possible.")
|
|||||||
(define-public the-powder-toy
|
(define-public the-powder-toy
|
||||||
(package
|
(package
|
||||||
(name "the-powder-toy")
|
(name "the-powder-toy")
|
||||||
(version "99.3.384")
|
(version "99.5.394")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -9152,7 +9242,7 @@ elements to achieve a simple goal in the most complex way possible.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0l067j0bbzvr0i2prxrgb0af4xdpl648x741jgnyp4bjzdbm61x7"))
|
(base32 "0wd0sg3lpl9xafyj76syvpdjh574cxjmxaf9kssfjjxs20y3hjn8"))
|
||||||
(snippet
|
(snippet
|
||||||
#~(begin (use-modules (guix build utils))
|
#~(begin (use-modules (guix build utils))
|
||||||
(substitute* "meson.build"
|
(substitute* "meson.build"
|
||||||
@@ -10143,7 +10233,7 @@ your score gets higher, you level up and the blocks fall faster.")
|
|||||||
"-DES_USE_SYSTEM_LIBRARIES=1")
|
"-DES_USE_SYSTEM_LIBRARIES=1")
|
||||||
#:make-flags #~(list (string-append "PREFIX=" #$output))
|
#:make-flags #~(list (string-append "PREFIX=" #$output))
|
||||||
#:build-type "Release"
|
#:build-type "Release"
|
||||||
#:tests? (not (target-x86-32?))
|
#:tests? (not (target-x86-32?))
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'fix-paths
|
(add-after 'unpack 'fix-paths
|
||||||
@@ -11127,7 +11217,7 @@ levels to unlock.")
|
|||||||
(define-public simgear
|
(define-public simgear
|
||||||
(package
|
(package
|
||||||
(name "simgear")
|
(name "simgear")
|
||||||
(version "2024.1.4")
|
(version "2024.1.5")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -11139,7 +11229,7 @@ levels to unlock.")
|
|||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1k855yxq06gv42f83c3k9hrsz05xxj6vi1c60227zm0dx3jkb4jq"))
|
(base32 "1ygdc8xkrj7qzm9zklibb1v5w3jp718707zmiwl8fn63sxanbqsq"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
@@ -11191,7 +11281,7 @@ and also provides the base for the FlightGear Flight Simulator.")
|
|||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0xlpry1g5xci4qmj37rjk4sdhg9zada0vw6a047gsm7cq5p7pkxk"))
|
(base32 "0hpfvacnba2kcyjwm01lkrqkz0gccvljjil8b0ai42l38hxn5r5h"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
@@ -11275,12 +11365,12 @@ and also provides the base for the FlightGear Flight Simulator.")
|
|||||||
("flightgear-data"
|
("flightgear-data"
|
||||||
,(origin
|
,(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/flightgear/release-"
|
(uri (string-append "https://mirrors.ibiblio.org/flightgear/ftp/release-"
|
||||||
(version-major+minor version) "/"
|
(version-major+minor version) "/"
|
||||||
"FlightGear-" version "-data.txz"))
|
"FlightGear-" version "-data.txz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0pgwxpm5cdm0y6klrmpqspmhmqsfxshz4jljw2kd4wy18fqzd1s6"))))))
|
"0d81yz9jqmg2jzw5rm769pl1j18pvh2mjkx61l13kw76ja8p6159"))))))
|
||||||
(home-page "https://www.flightgear.org/")
|
(home-page "https://www.flightgear.org/")
|
||||||
(synopsis "Flight simulator")
|
(synopsis "Flight simulator")
|
||||||
(description "The goal of the FlightGear project is to create a
|
(description "The goal of the FlightGear project is to create a
|
||||||
@@ -12184,7 +12274,7 @@ for using any UCI engine and also to connect UCI engines to Lichess and IRC.")
|
|||||||
(base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv"))))
|
(base32 "1kkcnpkzgybm7rqg7nafd7sqd5m4alns6l4j5zcf3p41jdc9s3iv"))))
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system glib-or-gtk-build-system)
|
||||||
(inputs (list automake autoconf pkg-config intltool
|
(inputs (list automake autoconf pkg-config intltool
|
||||||
gettext-minimal libtool glib gtk+-2 boost))
|
gettext-minimal libtool glib gtk+-2 boost))
|
||||||
(arguments (list #:tests? #f)) ; No tests in source.
|
(arguments (list #:tests? #f)) ; No tests in source.
|
||||||
(home-page "http://nine-mens-morris.net/downloads.html")
|
(home-page "http://nine-mens-morris.net/downloads.html")
|
||||||
(synopsis "Implementation of the board game Nine Men's Morris")
|
(synopsis "Implementation of the board game Nine Men's Morris")
|
||||||
@@ -13408,8 +13498,8 @@ rules to solve permissions issues.")
|
|||||||
|
|
||||||
(define-public steam-devices-udev-rules
|
(define-public steam-devices-udev-rules
|
||||||
;; Last release from 2019-04-10
|
;; Last release from 2019-04-10
|
||||||
(let ((commit "13443480a64fe8f10676606bd57da6de89f8ccb1")
|
(let ((commit "7dde9ecb3c386363ecd9bd0a3b77e4756d200704")
|
||||||
(revision "1"))
|
(revision "2"))
|
||||||
(package
|
(package
|
||||||
(name "steam-devices-udev-rules")
|
(name "steam-devices-udev-rules")
|
||||||
(version (git-version "1.0.0.61" revision commit))
|
(version (git-version "1.0.0.61" revision commit))
|
||||||
@@ -13421,7 +13511,7 @@ rules to solve permissions issues.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0i086gmnk93q76sw1laa9br6b7zj2r6nrrw7d64y4q9wcrlxw2bi"))))
|
"0w0xkgi9fpvdbpl57f8fy2nwy2icm6iag39b8ifpkijlxgclx1p3"))))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:install-plan '(("./" "lib/udev/rules.d"
|
'(#:install-plan '(("./" "lib/udev/rules.d"
|
||||||
|
|||||||
@@ -2936,7 +2936,7 @@ to the OSM opening hours specification.")
|
|||||||
(define-public josm
|
(define-public josm
|
||||||
(package
|
(package
|
||||||
(name "josm")
|
(name "josm")
|
||||||
(version "19539")
|
(version "19555")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method svn-fetch)
|
(method svn-fetch)
|
||||||
(uri (svn-reference
|
(uri (svn-reference
|
||||||
@@ -2945,7 +2945,7 @@ to the OSM opening hours specification.")
|
|||||||
(recursive? #f)))
|
(recursive? #f)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"05kslpvdwl4fldjzl6m2kmqvbmjv5yvipfavg01l30ywhw2c7v7v"))
|
"0kpshdj8kf9ag7h1qqrh9jqc6c9iv8v369mk60a8g7cbzf0xpblw"))
|
||||||
(file-name (string-append name "-" version "-checkout"))
|
(file-name (string-append name "-" version "-checkout"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
|
||||||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
|
||||||
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -19,47 +16,8 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages gkrellm)
|
(define-module (gnu packages gkrellm)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module (gnu packages monitoring)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix deprecation))
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix build-system gnu)
|
|
||||||
#:use-module (gnu packages gettext)
|
|
||||||
#:use-module (gnu packages gtk)
|
|
||||||
#:use-module (gnu packages pkg-config)
|
|
||||||
#:use-module (gnu packages xorg))
|
|
||||||
|
|
||||||
(define-public gkrellm
|
(define-deprecated/public-alias gkrellm
|
||||||
(package
|
(@ (guix packages monitoring) gkrellm))
|
||||||
(name "gkrellm")
|
|
||||||
(version "2.3.11")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append "http://gkrellm.srcbox.net/releases/gkrellm-"
|
|
||||||
version ".tar.bz2"))
|
|
||||||
(sha256
|
|
||||||
(base32 "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(inputs
|
|
||||||
`(("gettext" ,gettext-minimal)
|
|
||||||
("gtk+" ,gtk+-2)
|
|
||||||
("libice" ,libice)
|
|
||||||
("libsm" ,libsm)))
|
|
||||||
(native-inputs
|
|
||||||
(list pkg-config))
|
|
||||||
(arguments
|
|
||||||
`(#:tests? #f ; there is no check target
|
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(delete 'configure)) ; no configure script
|
|
||||||
#:make-flags
|
|
||||||
(let ((out (assoc-ref %outputs "out")))
|
|
||||||
(list (string-append "INSTALLROOT=" out)
|
|
||||||
"CC=gcc"))))
|
|
||||||
(home-page "http://gkrellm.srcbox.net/")
|
|
||||||
(synopsis "System monitors")
|
|
||||||
(description
|
|
||||||
"GKrellM is a single process stack of system monitors which supports
|
|
||||||
applying themes to match its appearance to your window manager, Gtk, or any
|
|
||||||
other theme.")
|
|
||||||
(license license:gpl3+)))
|
|
||||||
|
|||||||
@@ -39,6 +39,7 @@
|
|||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages cmake)
|
#:use-module (gnu packages cmake)
|
||||||
|
#:use-module (gnu packages ebook)
|
||||||
#:use-module (gnu packages enchant)
|
#:use-module (gnu packages enchant)
|
||||||
#:use-module (gnu packages fonts)
|
#:use-module (gnu packages fonts)
|
||||||
#:use-module (gnu packages freedesktop)
|
#:use-module (gnu packages freedesktop)
|
||||||
@@ -681,7 +682,7 @@ and a high score table.")
|
|||||||
(define-public komikku
|
(define-public komikku
|
||||||
(package
|
(package
|
||||||
(name "komikku")
|
(name "komikku")
|
||||||
(version "1.99.0")
|
(version "50.1.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -691,7 +692,7 @@ and a high score table.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
|
"0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -740,8 +741,10 @@ and a high score table.")
|
|||||||
python-cloudscraper
|
python-cloudscraper
|
||||||
python-colorthief
|
python-colorthief
|
||||||
python-dateparser
|
python-dateparser
|
||||||
|
python-ebooklib
|
||||||
python-emoji
|
python-emoji
|
||||||
python-keyring
|
python-keyring
|
||||||
|
python-jxlpy
|
||||||
python-lxml
|
python-lxml
|
||||||
python-magic
|
python-magic
|
||||||
python-natsort
|
python-natsort
|
||||||
@@ -777,7 +780,7 @@ developed with the aim of being used with the Librem 5 phone.")
|
|||||||
(define-public komikku-servers
|
(define-public komikku-servers
|
||||||
(package
|
(package
|
||||||
(name "komikku-servers")
|
(name "komikku-servers")
|
||||||
(version "1.99.0")
|
(version "50.1.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -787,7 +790,7 @@ developed with the aim of being used with the Librem 5 phone.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
|
"0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
@@ -1335,6 +1335,74 @@ animation of closing windowed applications.")
|
|||||||
GNOME Shell, including the top panel, dash and overview.")
|
GNOME Shell, including the top panel, dash and overview.")
|
||||||
(license license:gpl3)))
|
(license license:gpl3)))
|
||||||
|
|
||||||
|
(define-public gnome-shell-extension-caffeine
|
||||||
|
(package
|
||||||
|
(name "gnome-shell-extension-caffeine")
|
||||||
|
(version "59")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url
|
||||||
|
"https://github.com/eonpatapon/gnome-shell-extension-caffeine")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0sv0iqfb6kjhgcg4pb59n91dyf667vax96kfhz5ik5hhx9n0z43w"))))
|
||||||
|
(build-system copy-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:install-plan
|
||||||
|
#~'(("caffeine@patapon.info"
|
||||||
|
"share/gnome-shell/extensions/caffeine@patapon.info"
|
||||||
|
#:include-regexp ("icons" "locale" "preferences" "schemas"
|
||||||
|
"\\.js(on)?$")))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-before 'install 'compile-schemas
|
||||||
|
(lambda _
|
||||||
|
(with-directory-excursion "caffeine@patapon.info/schemas"
|
||||||
|
(invoke "glib-compile-schemas" ".")))))))
|
||||||
|
(native-inputs (list `(,glib "bin")))
|
||||||
|
(synopsis "Disable screensaver and auto suspend in Gnome")
|
||||||
|
(description "This extension provides a quick setting toggle to enable or
|
||||||
|
disable the Gnome auto-suspend and screensaver.")
|
||||||
|
(home-page "https://github.com/eonpatapon/gnome-shell-extension-caffeine")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public gnome-shell-extension-hot-edge
|
||||||
|
(package
|
||||||
|
(name "gnome-shell-extension-hot-edge")
|
||||||
|
(version "27")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/jdoda/hotedge")
|
||||||
|
(commit "90e9cdd6f2a171a676a96a4e6ad0126316317e4d")))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "08jqz6n04yvqa77930sghgip5qfj8i4dm8wsm5cqjc4sqm4pn9yy"))))
|
||||||
|
(build-system copy-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:install-plan
|
||||||
|
#~'(("." "share/gnome-shell/extensions/hotedge@jonathan.jdoda.ca"
|
||||||
|
#:include-regexp ("\\.css$" "\\.js(on)?$" "schemas")))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-before 'install 'compile-schemas
|
||||||
|
(lambda _
|
||||||
|
(with-directory-excursion "schemas"
|
||||||
|
(invoke "glib-compile-schemas" ".")))))))
|
||||||
|
(native-inputs (list `(,glib "bin")))
|
||||||
|
(synopsis "Add a hot edge to the bottom of the screen in Gnome")
|
||||||
|
(description
|
||||||
|
"Add a hot edge that activates the overview to the bottom of the screen.
|
||||||
|
This provides a better mouse-based workflow and can be an alternative to a dock.")
|
||||||
|
(home-page "https://github.com/jdoda/hotedge")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public gnome-shell-extension-radio
|
(define-public gnome-shell-extension-radio
|
||||||
(let ((commit "860e55b9e704eb3dde43e6bbeccec5748242498e")
|
(let ((commit "860e55b9e704eb3dde43e6bbeccec5748242498e")
|
||||||
(revision "0"))
|
(revision "0"))
|
||||||
|
|||||||
+121
-32
@@ -2598,6 +2598,92 @@ of Evince is to replace the multiple document viewers that exist
|
|||||||
on the GNOME Desktop with a single simple application.")
|
on the GNOME Desktop with a single simple application.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
|
(define-public papers
|
||||||
|
(package
|
||||||
|
(name "papers")
|
||||||
|
(version "50.0")
|
||||||
|
(source (origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "mirror://gnome/sources/papers/"
|
||||||
|
(version-major version) "/"
|
||||||
|
"papers-" version ".tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32 "01dws72fb19i9jwp3r0khr7ym2ns51fifdzafb5dcr5w8vmj06rh"))))
|
||||||
|
(build-system meson-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:glib-or-gtk? #t
|
||||||
|
#:configure-flags
|
||||||
|
#~(list (string-append "-Dc_link_args=-Wl,-rpath=" #$output "/lib"))
|
||||||
|
#:imported-modules `(,@%meson-build-system-modules
|
||||||
|
,@%cargo-build-system-modules)
|
||||||
|
#:modules `(((guix build cargo-build-system) #:prefix cargo:)
|
||||||
|
(guix build meson-build-system)
|
||||||
|
(guix build utils))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'prepare-for-build
|
||||||
|
(lambda _
|
||||||
|
(substitute* "meson.build"
|
||||||
|
(("gtk_update_icon_cache: true")
|
||||||
|
"gtk_update_icon_cache: false")
|
||||||
|
(("update_desktop_database: true")
|
||||||
|
"update_desktop_database: false"))
|
||||||
|
(substitute* "meson.build"
|
||||||
|
(("'Cargo.lock',")
|
||||||
|
""))
|
||||||
|
(delete-file "Cargo.lock")))
|
||||||
|
(add-after 'configure 'prepare-cargo-build-system
|
||||||
|
(lambda args
|
||||||
|
(for-each
|
||||||
|
(lambda (phase)
|
||||||
|
(format #t "Running cargo phase: ~a~%" phase)
|
||||||
|
(apply (assoc-ref cargo:%standard-phases phase)
|
||||||
|
#:vendor-dir "vendor"
|
||||||
|
#:cargo-target #$(cargo-triplet)
|
||||||
|
args))
|
||||||
|
'(unpack-rust-crates
|
||||||
|
configure
|
||||||
|
check-for-pregenerated-files
|
||||||
|
patch-cargo-checksums))
|
||||||
|
|
||||||
|
(setenv "RUSTFLAGS"
|
||||||
|
(string-append (or (getenv "RUSTFLAGS") "")
|
||||||
|
" -C link-arg=-Wl,-rpath,"
|
||||||
|
#$output "/lib")))))))
|
||||||
|
(native-inputs
|
||||||
|
(cons* blueprint-compiler
|
||||||
|
gettext-minimal
|
||||||
|
`(,glib "bin")
|
||||||
|
gobject-introspection
|
||||||
|
gi-docgen
|
||||||
|
itstool
|
||||||
|
pkg-config
|
||||||
|
rust
|
||||||
|
`(,rust "cargo")
|
||||||
|
(or (and=> (%current-target-system)
|
||||||
|
(compose list make-rust-sysroot))
|
||||||
|
'())))
|
||||||
|
(inputs
|
||||||
|
(cons* appstream
|
||||||
|
djvulibre
|
||||||
|
exempi
|
||||||
|
gtk
|
||||||
|
libadwaita
|
||||||
|
libarchive
|
||||||
|
libspelling
|
||||||
|
libtiff
|
||||||
|
nautilus ; for nautilus extension
|
||||||
|
poppler-next
|
||||||
|
zlib
|
||||||
|
(cargo-inputs 'papers)))
|
||||||
|
(home-page "https://apps.gnome.org/Papers")
|
||||||
|
;; TODO: drop “new” when updating to GNOME 49 or newer.
|
||||||
|
(synopsis "GNOME's new document viewer")
|
||||||
|
(description "Papers is a document viewer capable of displaying multiple
|
||||||
|
and single page document formats like PDF and DejaVu.")
|
||||||
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public gsettings-desktop-schemas
|
(define-public gsettings-desktop-schemas
|
||||||
(package
|
(package
|
||||||
(name "gsettings-desktop-schemas")
|
(name "gsettings-desktop-schemas")
|
||||||
@@ -10542,7 +10628,6 @@ playing media, scanning, and much more.")
|
|||||||
cheese
|
cheese
|
||||||
decibels
|
decibels
|
||||||
epiphany
|
epiphany
|
||||||
evince
|
|
||||||
file-roller
|
file-roller
|
||||||
gnome-calculator
|
gnome-calculator
|
||||||
gnome-calendar
|
gnome-calendar
|
||||||
@@ -10562,6 +10647,7 @@ playing media, scanning, and much more.")
|
|||||||
localsearch
|
localsearch
|
||||||
loupe
|
loupe
|
||||||
nautilus
|
nautilus
|
||||||
|
papers
|
||||||
simple-scan
|
simple-scan
|
||||||
showtime
|
showtime
|
||||||
xdg-desktop-portal-gnome
|
xdg-desktop-portal-gnome
|
||||||
@@ -11258,20 +11344,20 @@ basically a text box in which notes can be written.")
|
|||||||
(define-public gucharmap
|
(define-public gucharmap
|
||||||
(let ((unicode-files
|
(let ((unicode-files
|
||||||
'(("Blocks.txt"
|
'(("Blocks.txt"
|
||||||
"041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1")
|
"05fbpc7miqpv7yic5xkm74ybzxkaf5r58ww21a1iwxqr3apyzvf0")
|
||||||
("DerivedAge.txt"
|
("DerivedAge.txt"
|
||||||
"04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6")
|
"160r7wwidj3c2jl4cw3am0c5d0l7qndis9xx38h0y8fwidvdzv7q")
|
||||||
("NamesList.txt"
|
("NamesList.txt"
|
||||||
"0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61")
|
"1x1smmn2kmy8clf6ny2njln75i888lidckc6ssyp2gdhgasdrkhd")
|
||||||
("Scripts.txt"
|
("Scripts.txt"
|
||||||
"18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx")
|
"1grmn3bd4m0rcmz544h94kimlj3gf1f343s8177ddrxfmg9m0plz")
|
||||||
("UnicodeData.txt"
|
("UnicodeData.txt"
|
||||||
"07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap")
|
"0327jqfw2hyq8x986cfhwrp717r2jl7ydjjwvzp7biarrcfzq7if")
|
||||||
("Unihan.zip"
|
("Unihan.zip"
|
||||||
"1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"))))
|
"0pjbyf77lbaxdhwidvpgp81cw13lfhlaw1ynn9vsmkssahmqp97p"))))
|
||||||
(package
|
(package
|
||||||
(name "gucharmap")
|
(name "gucharmap")
|
||||||
(version "12.0.1")
|
(version "17.0.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
@@ -11280,16 +11366,19 @@ basically a text box in which notes can be written.")
|
|||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0m915hm2b2d6r3vs1l80rqpssvg78pv8j6nv54yg62kzknnqmpir"))))
|
"0sfixlmk7qajcvls6kv2hfczmjafjcr54aczwcdfmp5jjll4m17r"))))
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules ((ice-9 match)
|
`(#:modules ((ice-9 match)
|
||||||
(guix build glib-or-gtk-build-system)
|
(guix build meson-build-system)
|
||||||
(guix build utils))
|
(guix build utils))
|
||||||
|
#:glib-or-gtk? #t
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
(list
|
(list
|
||||||
"CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
|
"-Ducd_path=../unicode-data"
|
||||||
"--with-unicode-data=../unicode-data")
|
"-Dvapi=false"
|
||||||
|
;; gtk-doc fails because it didn't generate a devhelp2 file
|
||||||
|
"-Ddocs=false")
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'prepare-unicode-data
|
(add-after 'unpack 'prepare-unicode-data
|
||||||
@@ -11302,26 +11391,26 @@ basically a text box in which notes can be written.")
|
|||||||
',unicode-files))
|
',unicode-files))
|
||||||
#t)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("desktop-file-utils" ,desktop-file-utils)
|
(cons* desktop-file-utils
|
||||||
("glib:bin" ,glib "bin") ; for glib-compile-resources.
|
(list glib "bin")
|
||||||
("gobject-introspection" ,gobject-introspection)
|
gobject-introspection
|
||||||
("intltool" ,intltool)
|
intltool
|
||||||
("itstool" ,itstool)
|
itstool
|
||||||
("pkg-config" ,pkg-config)
|
pkg-config
|
||||||
,@(map (match-lambda
|
python
|
||||||
((file hash)
|
unzip
|
||||||
`(,file
|
(map (match-lambda
|
||||||
,(origin
|
((file hash)
|
||||||
(method url-fetch)
|
(origin
|
||||||
(uri (string-append
|
(method url-fetch)
|
||||||
"http://www.unicode.org/Public/12.0.0/ucd/"
|
(uri (string-append
|
||||||
file))
|
"https://www.unicode.org/Public/17.0.0/ucd/"
|
||||||
(sha256 (base32 hash))))))
|
file))
|
||||||
unicode-files)
|
(sha256 (base32 hash)))))
|
||||||
("unzip" ,unzip)))
|
unicode-files)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("gtk+" ,gtk+)
|
(list gtk+
|
||||||
("xmllint" ,libxml2)))
|
libxml2))
|
||||||
(home-page "https://wiki.gnome.org/Apps/Gucharmap")
|
(home-page "https://wiki.gnome.org/Apps/Gucharmap")
|
||||||
(synopsis "Unicode character picker and font browser")
|
(synopsis "Unicode character picker and font browser")
|
||||||
(description
|
(description
|
||||||
|
|||||||
@@ -165,14 +165,14 @@ tool to extract metadata from a file and print the results.")
|
|||||||
(define-public libmicrohttpd
|
(define-public libmicrohttpd
|
||||||
(package
|
(package
|
||||||
(name "libmicrohttpd")
|
(name "libmicrohttpd")
|
||||||
(version "1.0.2")
|
(version "1.0.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
|
(uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1ix843yqhcl8d5gh5652pw2scx4p5n836ca80ymms5rl136lycnz"))))
|
"0shj6kk4xp3k45vv696bzgx4s2jzpvhp11syck1zb70rmrxba5kq"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:configure-flags
|
(list #:configure-flags
|
||||||
|
|||||||
+24
-24
@@ -43,34 +43,33 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages gnupg)
|
(define-module (gnu packages gnupg)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (gnu packages adns)
|
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages bash)
|
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages crypto)
|
#:use-module (gnu packages crypto)
|
||||||
|
#:use-module (gnu packages curl)
|
||||||
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages emacs)
|
#:use-module (gnu packages emacs)
|
||||||
#:use-module (gnu packages enlightenment)
|
#:use-module (gnu packages enlightenment)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
|
#:use-module (gnu packages glib)
|
||||||
|
#:use-module (gnu packages gnome)
|
||||||
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages guile)
|
#:use-module (gnu packages guile)
|
||||||
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages openldap)
|
#:use-module (gnu packages openldap)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages perl-check)
|
#:use-module (gnu packages perl-check)
|
||||||
|
#:use-module (gnu packages pkg-config)
|
||||||
|
#:use-module (gnu packages popt)
|
||||||
#:use-module (gnu packages pth)
|
#:use-module (gnu packages pth)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages python-build)
|
#:use-module (gnu packages python-build)
|
||||||
#:use-module (gnu packages python-xyz)
|
#:use-module (gnu packages python-xyz)
|
||||||
#:use-module (gnu packages qt)
|
#:use-module (gnu packages qt)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages compression)
|
|
||||||
#:use-module (gnu packages gtk)
|
|
||||||
#:use-module (gnu packages glib)
|
|
||||||
#:use-module (gnu packages gnome)
|
|
||||||
#:use-module (gnu packages pkg-config)
|
|
||||||
#:use-module (gnu packages ncurses)
|
|
||||||
#:use-module (gnu packages security-token)
|
#:use-module (gnu packages security-token)
|
||||||
#:use-module (gnu packages sqlite)
|
#:use-module (gnu packages sqlite)
|
||||||
#:use-module (gnu packages swig)
|
#:use-module (gnu packages swig)
|
||||||
@@ -78,23 +77,24 @@
|
|||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages tor)
|
#:use-module (gnu packages tor)
|
||||||
#:use-module (gnu packages web)
|
#:use-module (gnu packages web)
|
||||||
#:use-module (gnu packages xorg)
|
|
||||||
#:use-module (gnu packages xml)
|
|
||||||
#:use-module (gnu packages popt)
|
|
||||||
#:use-module (gnu packages xdisorg)
|
#:use-module (gnu packages xdisorg)
|
||||||
#:use-module (guix gexp)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (guix packages)
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module (guix download)
|
#:use-module (gnu packages)
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix build-system copy)
|
#:use-module (guix build-system copy)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system perl)
|
|
||||||
#:use-module (guix build-system python)
|
|
||||||
#:use-module (guix build-system pyproject)
|
|
||||||
#:use-module (guix build-system qt)
|
|
||||||
#:use-module (ice-9 match)
|
|
||||||
#:use-module (guix build-system meson)
|
#:use-module (guix build-system meson)
|
||||||
|
#:use-module (guix build-system perl)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system qt)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix utils)
|
||||||
|
#:use-module (ice-9 match)
|
||||||
#:use-module (srfi srfi-1))
|
#:use-module (srfi srfi-1))
|
||||||
|
|
||||||
(define-public libgpg-error
|
(define-public libgpg-error
|
||||||
|
|||||||
@@ -48,6 +48,34 @@
|
|||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (ice-9 match))
|
#:use-module (ice-9 match))
|
||||||
|
|
||||||
|
(define-public fsviewer
|
||||||
|
(package
|
||||||
|
(name "fsviewer")
|
||||||
|
(version "0.2.7")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/roblillack/fsviewer")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"067fvbq7b4lbnn1flmwf8lm0vq4n6qz5yz6hhab30l4gksfk51cg"))
|
||||||
|
(file-name (git-file-name name version))))
|
||||||
|
(build-system cmake-build-system)
|
||||||
|
(arguments (list #:tests? #f)) ;no tests
|
||||||
|
(inputs
|
||||||
|
(list windowmaker libxmu libxpm))
|
||||||
|
(native-inputs
|
||||||
|
(list pkg-config))
|
||||||
|
(home-page "https://github.com/roblillack/fsviewer")
|
||||||
|
(synopsis "File viewer for Window Maker")
|
||||||
|
(description "FSViewer is a NeXT FileViewer lookalike for Window
|
||||||
|
Maker supporting browser mode and list mode. This version is a fork of
|
||||||
|
FSViewer.app originally written by George Clernon (1998-99) and later
|
||||||
|
maintained by Guido Scholz (2002-07).")
|
||||||
|
(license license:gpl2)))
|
||||||
|
|
||||||
(define-public gnustep-make
|
(define-public gnustep-make
|
||||||
(package
|
(package
|
||||||
(name "gnustep-make")
|
(name "gnustep-make")
|
||||||
|
|||||||
+170
-10
@@ -605,9 +605,9 @@ in the case of Firefox, it is browser/locales/all-locales."
|
|||||||
"zh-TW"))
|
"zh-TW"))
|
||||||
|
|
||||||
;;; Please keep these versions in sync with icedove.
|
;;; Please keep these versions in sync with icedove.
|
||||||
(define %icecat-base-version "140.9.0")
|
(define %icecat-base-version "140.10.0")
|
||||||
(define %icecat-version (string-append %icecat-base-version "-gnu1"))
|
(define %icecat-version (string-append %icecat-base-version "-gnu1"))
|
||||||
(define %icecat-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
|
(define %icecat-build-id "20260421000000") ;must be of the form YYYYMMDDhhmmss
|
||||||
|
|
||||||
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
|
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
|
||||||
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
|
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
|
||||||
@@ -627,9 +627,9 @@ in the case of Firefox, it is browser/locales/all-locales."
|
|||||||
"firefox-" upstream-firefox-version ".source.tar.xz"))
|
"firefox-" upstream-firefox-version ".source.tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0b79x61w51fjf12p5sr9pipg4b3fjdnbsg0j20fdai3jq6jb4wmr"))))
|
"06996548nfmn4r4mfw3wvgb1mp35majc5hjyhs1krgp33ck2m1f0"))))
|
||||||
|
|
||||||
(gnuzilla-commit "10a8be3fcf725ed01ffb7279ec27c2fba55dd2d2")
|
(gnuzilla-commit "02125f31250c0240ee2ab1aa629ce66d4ffb9f30")
|
||||||
(gnuzilla-source
|
(gnuzilla-source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -640,7 +640,7 @@ in the case of Firefox, it is browser/locales/all-locales."
|
|||||||
(string-take gnuzilla-commit 8)))
|
(string-take gnuzilla-commit 8)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"076s3zpq0cj24a2pjarb57k1xv9z45xazps8rgypzw8yc4pxi9rj"))))
|
"1hgx286gp0j46pklzzh5kvsnari1j3s0bff384m505m942k6l4hf"))))
|
||||||
|
|
||||||
;; 'search-patch' returns either a valid file name or #f, so wrap it
|
;; 'search-patch' returns either a valid file name or #f, so wrap it
|
||||||
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
|
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
|
||||||
@@ -1249,13 +1249,173 @@ testing.")
|
|||||||
(cpe-name . "firefox_esr")
|
(cpe-name . "firefox_esr")
|
||||||
(cpe-version . ,(first (string-split version #\-)))))))
|
(cpe-version . ,(first (string-split version #\-)))))))
|
||||||
|
|
||||||
(define %icedove-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
|
;;; TEMPORARY old version of icecat-source for use by icedove until it is updated.
|
||||||
|
(define %icecat-140.9.1-base-version "140.9.1")
|
||||||
|
(define %icecat-140.9.1-version (string-append %icecat-140.9.1-base-version "-gnu1"))
|
||||||
|
(define icecat-140.9.1-source
|
||||||
|
(let* ((major-version (first (string-split %icecat-140.9.1-base-version #\.)))
|
||||||
|
(minor-version (second (string-split %icecat-140.9.1-base-version #\.)))
|
||||||
|
(sub-version (third (string-split %icecat-140.9.1-base-version #\.)))
|
||||||
|
|
||||||
|
(upstream-firefox-version (string-append %icecat-140.9.1-base-version "esr"))
|
||||||
|
(upstream-firefox-source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"https://ftp.mozilla.org/pub/firefox/releases/"
|
||||||
|
upstream-firefox-version "/source/"
|
||||||
|
"firefox-" upstream-firefox-version ".source.tar.xz"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1hld2kbzvrmr7pqq0r5hw639xl8kw29lm2hsbn0m4kxang1fdlj5"))))
|
||||||
|
|
||||||
|
(gnuzilla-commit "f3595923458a5255f61a3853bd83bb5f004dc3bc")
|
||||||
|
(gnuzilla-source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "git://git.savannah.gnu.org/gnuzilla.git")
|
||||||
|
(commit gnuzilla-commit)))
|
||||||
|
(file-name (git-file-name "gnuzilla"
|
||||||
|
(string-take gnuzilla-commit 8)))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"03kc08cvmdv3sxihf5hfhw2k91mg1y6f46b3x47p7q98phgk03cv"))))
|
||||||
|
|
||||||
|
;; 'search-patch' returns either a valid file name or #f, so wrap it
|
||||||
|
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
|
||||||
|
(makeicecat-patch
|
||||||
|
(local-file (assume-valid-file-name
|
||||||
|
(search-patch "icecat-makeicecat.patch")))))
|
||||||
|
|
||||||
|
(origin
|
||||||
|
(method computed-origin-method)
|
||||||
|
(file-name (string-append "icecat-" %icecat-140.9.1-version ".tar.zst"))
|
||||||
|
(sha256 #f)
|
||||||
|
(uri
|
||||||
|
(delay
|
||||||
|
(with-imported-modules '((guix build utils))
|
||||||
|
#~(begin
|
||||||
|
(use-modules (guix build utils))
|
||||||
|
(let ((firefox-dir
|
||||||
|
(string-append "firefox-" #$%icecat-140.9.1-base-version))
|
||||||
|
(icecat-dir
|
||||||
|
(string-append "icecat-" #$%icecat-140.9.1-version)))
|
||||||
|
|
||||||
|
(set-path-environment-variable
|
||||||
|
"PATH" '("bin")
|
||||||
|
(list #+python
|
||||||
|
#+(canonical-package bash)
|
||||||
|
#+(canonical-package coreutils)
|
||||||
|
#+(canonical-package findutils)
|
||||||
|
#+(canonical-package patch)
|
||||||
|
#+(canonical-package xz)
|
||||||
|
#+(canonical-package zstd)
|
||||||
|
#+(canonical-package sed)
|
||||||
|
#+(canonical-package grep)
|
||||||
|
#+(canonical-package bzip2)
|
||||||
|
#+(canonical-package gzip)
|
||||||
|
#+(canonical-package tar)))
|
||||||
|
|
||||||
|
(set-path-environment-variable
|
||||||
|
"PYTHONPATH"
|
||||||
|
(list #+(format #f "lib/python~a/site-packages"
|
||||||
|
(version-major+minor
|
||||||
|
(package-version python))))
|
||||||
|
'#+(cons python-jsonschema
|
||||||
|
(map second
|
||||||
|
(package-transitive-propagated-inputs
|
||||||
|
python-jsonschema))))
|
||||||
|
|
||||||
|
;; We copy the gnuzilla source directory because it is
|
||||||
|
;; read-only in 'gnuzilla-source', and the makeicecat script
|
||||||
|
;; uses "cp -a" to copy parts of it and assumes that the
|
||||||
|
;; copies will be writable.
|
||||||
|
(copy-recursively #+gnuzilla-source "/tmp/gnuzilla"
|
||||||
|
#:log (%make-void-port "w"))
|
||||||
|
|
||||||
|
(with-directory-excursion "/tmp/gnuzilla"
|
||||||
|
(make-file-writable "makeicecat")
|
||||||
|
(invoke "patch" "--force" "--no-backup-if-mismatch"
|
||||||
|
"-p1" "--input" #+makeicecat-patch)
|
||||||
|
(patch-shebang "makeicecat")
|
||||||
|
(substitute* "makeicecat"
|
||||||
|
(("^readonly FFMAJOR=(.*)" all ffmajor)
|
||||||
|
(unless (string=? #$major-version
|
||||||
|
(string-trim-both ffmajor))
|
||||||
|
;; The makeicecat script cannot be expected to work
|
||||||
|
;; properly on a different version of Firefox, even if
|
||||||
|
;; no errors occur during execution.
|
||||||
|
(error "makeicecat major version mismatch"))
|
||||||
|
(string-append "readonly FFMAJOR=" #$major-version "\n"))
|
||||||
|
(("^readonly FFMINOR=.*")
|
||||||
|
(string-append "readonly FFMINOR=" #$minor-version "\n"))
|
||||||
|
(("^readonly FFSUB=.*")
|
||||||
|
(string-append "readonly FFSUB=" #$sub-version "\n"))
|
||||||
|
(("^readonly DATADIR=.*")
|
||||||
|
"readonly DATADIR=/tmp/gnuzilla/data\n")
|
||||||
|
(("^readonly SOURCEDIR=.*")
|
||||||
|
(string-append "readonly SOURCEDIR=" icecat-dir "\n"))
|
||||||
|
(("/bin/sed")
|
||||||
|
#+(file-append (canonical-package sed) "/bin/sed"))))
|
||||||
|
|
||||||
|
(format #t "Unpacking upstream firefox tarball...~%")
|
||||||
|
(force-output)
|
||||||
|
(invoke "tar" "xf" #+upstream-firefox-source)
|
||||||
|
(rename-file firefox-dir icecat-dir)
|
||||||
|
|
||||||
|
(with-directory-excursion icecat-dir
|
||||||
|
(format #t "Populating l10n directory...~%")
|
||||||
|
(force-output)
|
||||||
|
(mkdir "l10n")
|
||||||
|
(with-directory-excursion "l10n"
|
||||||
|
(for-each
|
||||||
|
(lambda (locale)
|
||||||
|
(let ((locale-dir (string-append #+mozilla-l10n "/"
|
||||||
|
locale)))
|
||||||
|
(format #t " ~a~%" locale)
|
||||||
|
(force-output)
|
||||||
|
(copy-recursively locale-dir locale
|
||||||
|
#:log (%make-void-port "w"))
|
||||||
|
(for-each make-file-writable (find-files locale))
|
||||||
|
(with-directory-excursion locale
|
||||||
|
(mkdir-p "browser/chrome/browser/preferences")
|
||||||
|
(call-with-output-file "browser/chrome/browser/\
|
||||||
|
preferences/advanced-scripts.dtd"
|
||||||
|
(lambda (port) #f)))))
|
||||||
|
'#+%icecat-locales)
|
||||||
|
(copy-recursively #+mozilla-compare-locales
|
||||||
|
"compare-locales"
|
||||||
|
#:log (%make-void-port "w"))
|
||||||
|
(delete-file "compare-locales/.gitignore")))
|
||||||
|
|
||||||
|
(format #t "Running makeicecat script...~%")
|
||||||
|
(force-output)
|
||||||
|
(invoke "bash" "/tmp/gnuzilla/makeicecat")
|
||||||
|
|
||||||
|
(format #t "Packing IceCat source tarball...~%")
|
||||||
|
(force-output)
|
||||||
|
(setenv "ZSTD_NBTHREADS" (number->string (parallel-job-count)))
|
||||||
|
(invoke "tar" "cfa" #$output
|
||||||
|
;; Avoid non-determinism in the archive. We set the
|
||||||
|
;; mtime of files in the archive to early 1980 because
|
||||||
|
;; the build process fails if the mtime of source
|
||||||
|
;; files is pre-1980, due to the creation of zip
|
||||||
|
;; archives.
|
||||||
|
"--mtime=@315619200" ; 1980-01-02 UTC
|
||||||
|
"--owner=root:0"
|
||||||
|
"--group=root:0"
|
||||||
|
"--sort=name"
|
||||||
|
icecat-dir)))))))))
|
||||||
|
|
||||||
|
|
||||||
|
(define %icedove-build-id "20260403000000") ;must be of the form YYYYMMDDhhmmss
|
||||||
;;; See <https://product-details.mozilla.org/1.0/thunderbird_versions.json>
|
;;; See <https://product-details.mozilla.org/1.0/thunderbird_versions.json>
|
||||||
;;; for the source of truth regarding Thunderbird releases.
|
;;; for the source of truth regarding Thunderbird releases.
|
||||||
;;; Please keep these version numbers in sync with icecat.
|
;;; Please keep these version numbers in sync with icecat.
|
||||||
;;; Please also update thunderbird-comm-source and thunderbird-comm-l10n to
|
;;; Please also update thunderbird-comm-source and thunderbird-comm-l10n to
|
||||||
;;; the icedove version.
|
;;; the icedove version.
|
||||||
(define %icedove-version "140.9.0")
|
(define %icedove-version "140.9.1")
|
||||||
|
|
||||||
;; Provides the "comm" folder which is inserted into the icecat source.
|
;; Provides the "comm" folder which is inserted into the icecat source.
|
||||||
;; Avoids the duplication of Icecat's source tarball. Pick the changeset that
|
;; Avoids the duplication of Icecat's source tarball. Pick the changeset that
|
||||||
@@ -1267,11 +1427,11 @@ testing.")
|
|||||||
(method hg-fetch)
|
(method hg-fetch)
|
||||||
(uri (hg-reference
|
(uri (hg-reference
|
||||||
(url "https://hg.mozilla.org/releases/comm-esr140")
|
(url "https://hg.mozilla.org/releases/comm-esr140")
|
||||||
(changeset "8be9f2d3072c225a1e5f153745a18984c2babf8f")))
|
(changeset "427d792f23672fc4adbe9436ce7dddbb2bfb287a")))
|
||||||
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
|
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"04j35957x03m5x7mhh8zxa86mwjy0is2vb614sr4inkvvz4rs2hg"))
|
"09fj375a0zb5kgvw94f13997zhcj67a4g5ylpdbjzfql0chh572p"))
|
||||||
(patches (search-patches "icedove-observer-fix.patch"))))
|
(patches (search-patches "icedove-observer-fix.patch"))))
|
||||||
|
|
||||||
;;; To regenerate, see the `format-locales' helper defined above.
|
;;; To regenerate, see the `format-locales' helper defined above.
|
||||||
@@ -1383,7 +1543,7 @@ testing.")
|
|||||||
;; Extract the base Icecat tarball, renaming its top-level
|
;; Extract the base Icecat tarball, renaming its top-level
|
||||||
;; directory.
|
;; directory.
|
||||||
(invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",")
|
(invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",")
|
||||||
"-xf" #$icecat-source)
|
"-xf" #$icecat-140.9.1-source)
|
||||||
(chdir #$name)
|
(chdir #$name)
|
||||||
|
|
||||||
;; Merge the Thunderdbird localization data.
|
;; Merge the Thunderdbird localization data.
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
;;; Copyright © 2025 Arthur Rodrigues <arthurhdrodrigues@proton.me>
|
;;; Copyright © 2025 Arthur Rodrigues <arthurhdrodrigues@proton.me>
|
||||||
;;; Copyright © 2025 Patrick Norton <patrick.147.norton@gmail.com>
|
;;; Copyright © 2025 Patrick Norton <patrick.147.norton@gmail.com>
|
||||||
;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
||||||
|
;;; Copyright © 2026 Evgeny Pisemsky <mail@pisemsky.site>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -2873,7 +2874,7 @@ package.")
|
|||||||
(define-public go-github-com-refraction-networking-utls
|
(define-public go-github-com-refraction-networking-utls
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-refraction-networking-utls")
|
(name "go-github-com-refraction-networking-utls")
|
||||||
(version "1.6.0")
|
(version "1.8.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -2882,7 +2883,7 @@ package.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1iywar5vqsml4b177k2nkcxmjm8mw92g3p112yjsrpmikiwpwpyw"))))
|
(base32 "03kgwxdm2lg28fn2w5q7ql2szsiwj2xjdf477h1g3a4a9y9j6zk0"))))
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:import-path "github.com/refraction-networking/utls"
|
`(#:import-path "github.com/refraction-networking/utls"
|
||||||
@@ -3640,6 +3641,39 @@ algorithm described in @url{https://rfc-editor.org/rfc/rfc2898.html,RFC 2898}
|
|||||||
and @url{https://rfc-editor.org/rfc/rfc8018.html,RFC 8018}.")
|
and @url{https://rfc-editor.org/rfc/rfc8018.html,RFC 8018}.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-xtls-reality
|
||||||
|
(package
|
||||||
|
(name "go-github-com-xtls-reality")
|
||||||
|
(version "0.0.0-20260322125925-9234c772ba8f")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/xtls/reality")
|
||||||
|
(commit (go-version->git-ref version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1wncy5aph6nmq4814xjhj6b5p1wm2fyrqn83dw0xlyxvq2z6iqfs"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:import-path "github.com/xtls/reality"))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-cloudflare-circl
|
||||||
|
go-github-com-juju-ratelimit
|
||||||
|
go-github-com-pires-go-proxyproto
|
||||||
|
go-github-com-refraction-networking-utls
|
||||||
|
go-golang-org-x-crypto
|
||||||
|
go-golang-org-x-sys))
|
||||||
|
(home-page "https://github.com/xtls/reality")
|
||||||
|
(synopsis "Implementation of REALITY protocol")
|
||||||
|
(description
|
||||||
|
"This package provides an implementation of REALITY protocol, which is
|
||||||
|
intented to eliminate the detectable TLS fingerprint on the server side, while
|
||||||
|
still maintain the secrecy. It achieves full real TLS that is
|
||||||
|
undistingwishable with the specified SNI to the middleman.")
|
||||||
|
(license (list license:bsd-3 license:mpl2.0))))
|
||||||
|
|
||||||
(define-public go-github-com-youmark-pkcs8
|
(define-public go-github-com-youmark-pkcs8
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-youmark-pkcs8")
|
(name "go-github-com-youmark-pkcs8")
|
||||||
|
|||||||
@@ -49,6 +49,8 @@
|
|||||||
;;; Copyright © 2025 Jared Klingenberger <jkling@noreply.codeberg.org>
|
;;; Copyright © 2025 Jared Klingenberger <jkling@noreply.codeberg.org>
|
||||||
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
||||||
;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
|
;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net>
|
||||||
|
;;; Copyright © 2026 Evgeny Pisemsky <mail@pisemsky.site>
|
||||||
|
;;; Copyright © 2026 Vinicius Monego <monego@posteo.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -386,6 +388,7 @@ devices.")
|
|||||||
;; - cloud.google.com/go/kms
|
;; - cloud.google.com/go/kms
|
||||||
;; - cloud.google.com/go/longrunning
|
;; - cloud.google.com/go/longrunning
|
||||||
;; - cloud.google.com/go/monitoring
|
;; - cloud.google.com/go/monitoring
|
||||||
|
;; - cloud.google.com/go/security
|
||||||
;; - cloud.google.com/go/storage
|
;; - cloud.google.com/go/storage
|
||||||
(for-each delete-file-recursively
|
(for-each delete-file-recursively
|
||||||
(list "auth"
|
(list "auth"
|
||||||
@@ -394,6 +397,7 @@ devices.")
|
|||||||
"kms"
|
"kms"
|
||||||
"longrunning"
|
"longrunning"
|
||||||
"monitoring"
|
"monitoring"
|
||||||
|
"security"
|
||||||
"storage"))))))
|
"storage"))))))
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
@@ -783,6 +787,51 @@ its service definition.")
|
|||||||
"This package provides a Go Client Library for Cloud Monitoring API.")
|
"This package provides a Go Client Library for Cloud Monitoring API.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-cloud-google-com-go-security
|
||||||
|
(package
|
||||||
|
(name "go-cloud-google-com-go-security")
|
||||||
|
(version "1.21.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/googleapis/google-cloud-go")
|
||||||
|
(commit (go-version->git-ref version #:subdir "security"))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1pn77lf1d22sqpkia9zccdhdihlqc48lls6y9npc2wrp4lman2kv"))
|
||||||
|
(modules '((guix build utils)
|
||||||
|
(ice-9 ftw)
|
||||||
|
(srfi srfi-26)))
|
||||||
|
(snippet #~(begin
|
||||||
|
(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 "." "security")))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:skip-build? #t
|
||||||
|
#:import-path "cloud.google.com/go/security"
|
||||||
|
#:unpack-path "cloud.google.com/go"))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-cloud-google-com-go-iam
|
||||||
|
go-cloud-google-com-go-longrunning
|
||||||
|
go-github-com-googleapis-gax-go-v2
|
||||||
|
go-google-golang-org-api
|
||||||
|
go-google-golang-org-genproto
|
||||||
|
go-google-golang-org-genproto-googleapis-api
|
||||||
|
go-google-golang-org-grpc
|
||||||
|
go-google-golang-org-protobuf))
|
||||||
|
(home-page "https://cloud.google.com/go")
|
||||||
|
(synopsis "Google Cloud Certificate Authority API")
|
||||||
|
(description
|
||||||
|
"This package provides a Go Client Library for Certificate Authority API.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public go-cloud-google-com-go-storage
|
(define-public go-cloud-google-com-go-storage
|
||||||
(package
|
(package
|
||||||
(name "go-cloud-google-com-go-storage")
|
(name "go-cloud-google-com-go-storage")
|
||||||
@@ -10214,6 +10263,54 @@ Call}.")
|
|||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list go-golang-org-x-net))))
|
(list go-golang-org-x-net))))
|
||||||
|
|
||||||
|
(define-public go-github-com-jellydator-ttlcache-v3
|
||||||
|
(package
|
||||||
|
(name "go-github-com-jellydator-ttlcache-v3")
|
||||||
|
(version "3.4.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/jellydator/ttlcache")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0c7k99d0km5vplfikb58j2wbriy3mzzrrfrc0d85x50km0y4g4ln"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:import-path "github.com/jellydator/ttlcache/v3"
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'remove-examples-and-benchmarks
|
||||||
|
(lambda* (#:key tests? import-path #:allow-other-keys)
|
||||||
|
(with-directory-excursion (string-append "src/" import-path)
|
||||||
|
(delete-file-recursively "bench")
|
||||||
|
(delete-file-recursively "examples")))))))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-stretchr-testify
|
||||||
|
go-go-uber-org-goleak))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-golang-org-x-sync))
|
||||||
|
(home-page "https://github.com/jellydator/ttlcache")
|
||||||
|
(synopsis "In-memory cache with item expiration and generics")
|
||||||
|
(description
|
||||||
|
"TTLCache is an in-memory cache with item expiration and generics which
|
||||||
|
provides the following features:
|
||||||
|
|
||||||
|
@itemize
|
||||||
|
@item simple API
|
||||||
|
@item type parameters
|
||||||
|
@item item expiration and automatic deletion
|
||||||
|
@item automatic expiration time extension on each Get call
|
||||||
|
@item loader interface that may be used to load/lazily initialize missing
|
||||||
|
citem items
|
||||||
|
@item thread safety
|
||||||
|
@item event handlers (insertion, update, and eviction)
|
||||||
|
@item metrics
|
||||||
|
@end itemize")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public go-github-com-jeremija-gosubmit
|
(define-public go-github-com-jeremija-gosubmit
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-jeremija-gosubmit")
|
(name "go-github-com-jeremija-gosubmit")
|
||||||
@@ -10515,6 +10612,33 @@ jsoniter and variable type declarations (if any). jsoniter interfaces gives
|
|||||||
https://github.com/flynn/noise crypto protocols.")
|
https://github.com/flynn/noise crypto protocols.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public go-github-com-juju-ratelimit
|
||||||
|
(package
|
||||||
|
(name "go-github-com-juju-ratelimit")
|
||||||
|
(version "1.0.2")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/juju/ratelimit")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1qbjcm4y53awkqmpxb1nm9c1xdylc44vph4mn30qjb5wrcqy7c1r"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:import-path "github.com/juju/ratelimit"))
|
||||||
|
(native-inputs
|
||||||
|
(list go-gopkg-in-check-v1))
|
||||||
|
(home-page "https://github.com/juju/ratelimit")
|
||||||
|
(synopsis "Efficient token bucket implementation")
|
||||||
|
(description
|
||||||
|
"The ratelimit package provides an efficient
|
||||||
|
@url{http://en.wikipedia.org/wiki/Token_bucket, token bucket} implementation
|
||||||
|
that can be used to limit the rate of arbitrary things.")
|
||||||
|
(license license:lgpl3)))
|
||||||
|
|
||||||
(define-public go-github-com-julienschmidt-httprouter
|
(define-public go-github-com-julienschmidt-httprouter
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-julienschmidt-httprouter")
|
(name "go-github-com-julienschmidt-httprouter")
|
||||||
@@ -15975,6 +16099,512 @@ support.")
|
|||||||
kinds of referrer URLs (search, social, ...).")
|
kinds of referrer URLs (search, social, ...).")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public go-github-com-sigstore-rekor
|
||||||
|
(package
|
||||||
|
(name "go-github-com-sigstore-rekor")
|
||||||
|
(version "1.4.3")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/sigstore/rekor")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1g2xma0fzy7a4nv7bj04pj9vqg4hbbz3j3jxkir0sxql5ragj36d"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:skip-build? #t
|
||||||
|
#:import-path "github.com/sigstore/rekor"
|
||||||
|
;; XXX: Remove when all inputs are packaged.
|
||||||
|
#:test-subdirs
|
||||||
|
#~(list "pkg/events/newentry"
|
||||||
|
"pkg/indexstorage/mysql"
|
||||||
|
"pkg/pki/minisign"
|
||||||
|
"pkg/pki/pgp"
|
||||||
|
"pkg/pki/ssh"
|
||||||
|
"pkg/pki/tuf"
|
||||||
|
"pkg/pki/x509"
|
||||||
|
"pkg/pubsub/gcp"
|
||||||
|
"pkg/util")))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-asaskevich-govalidator
|
||||||
|
go-github-com-data-dog-go-sqlmock
|
||||||
|
go-github-com-golang-mock
|
||||||
|
go-github-com-google-go-cmp
|
||||||
|
go-github-com-spf13-cobra
|
||||||
|
go-github-com-spf13-pflag
|
||||||
|
go-github-com-spf13-viper
|
||||||
|
go-github-com-stretchr-testify
|
||||||
|
go-go-uber-org-goleak
|
||||||
|
go-sigs-k8s-io-release-utils))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-cloud-google-com-go-iam
|
||||||
|
go-github-com-asaskevich-govalidator
|
||||||
|
go-github-com-blang-semver
|
||||||
|
go-github-com-cyberphone-json-canonicalization
|
||||||
|
go-github-com-go-chi-chi-v5
|
||||||
|
go-github-com-go-openapi-errors
|
||||||
|
go-github-com-go-openapi-loads
|
||||||
|
go-github-com-go-openapi-runtime
|
||||||
|
go-github-com-go-openapi-spec
|
||||||
|
go-github-com-go-openapi-strfmt
|
||||||
|
go-github-com-go-openapi-swag
|
||||||
|
go-github-com-go-openapi-swag-conv
|
||||||
|
go-github-com-go-openapi-validate
|
||||||
|
go-github-com-go-sql-driver-mysql
|
||||||
|
go-github-com-go-viper-mapstructure-v2
|
||||||
|
go-github-com-google-trillian
|
||||||
|
go-github-com-grpc-ecosystem-go-grpc-middleware
|
||||||
|
go-github-com-hashicorp-go-cleanhttp
|
||||||
|
go-github-com-hashicorp-go-retryablehttp
|
||||||
|
go-github-com-in-toto-in-toto-golang
|
||||||
|
go-github-com-jedisct1-go-minisign
|
||||||
|
go-github-com-jmoiron-sqlx
|
||||||
|
go-github-com-prometheus-client-golang
|
||||||
|
go-github-com-redis-go-redis-v9
|
||||||
|
go-github-com-rs-cors
|
||||||
|
go-github-com-secure-systems-lab-go-securesystemslib
|
||||||
|
go-github-com-sigstore-protobuf-specs
|
||||||
|
go-github-com-sigstore-sigstore
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-aws
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-azure
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-gcp
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault
|
||||||
|
go-github-com-theupdateframework-go-tuf
|
||||||
|
go-github-com-tink-crypto-tink-go-awskms-v2
|
||||||
|
go-github-com-tink-crypto-tink-go-gcpkms-v2
|
||||||
|
go-github-com-tink-crypto-tink-go-v2
|
||||||
|
go-github-com-transparency-dev-merkle
|
||||||
|
go-github-com-veraison-go-cose
|
||||||
|
go-go-uber-org-zap
|
||||||
|
go-golang-org-x-crypto
|
||||||
|
go-golang-org-x-mod
|
||||||
|
go-golang-org-x-net
|
||||||
|
go-golang-org-x-sync
|
||||||
|
go-google-golang-org-api
|
||||||
|
go-google-golang-org-genproto-googleapis-rpc
|
||||||
|
go-google-golang-org-grpc
|
||||||
|
go-google-golang-org-protobuf
|
||||||
|
go-gopkg-in-ini-v1
|
||||||
|
go-gopkg-in-yaml-v2
|
||||||
|
go-sigs-k8s-io-yaml
|
||||||
|
|
||||||
|
;; TODO: Complete packaging.
|
||||||
|
;; go-cloud-google-com-go-profiler
|
||||||
|
;; go-cloud-google-com-go-pubsub
|
||||||
|
;; go-cloud-google-com-go-pubsub-v2
|
||||||
|
;; go-github-com-adamkorcz-go-fuzz-headers-1
|
||||||
|
;; go-github-com-cavaliercoder-go-rpm
|
||||||
|
;; go-github-com-go-redis-redismock-v9
|
||||||
|
;; go-github-com-google-rpmpack
|
||||||
|
;; go-github-com-sassoftware-relic
|
||||||
|
;; go-github-com-sassoftware-relic-v7
|
||||||
|
;; go-go-step-sm-crypto
|
||||||
|
#;go-gocloud-dev))
|
||||||
|
(home-page "https://github.com/sigstore/rekor")
|
||||||
|
(synopsis "Sigstore transparency log")
|
||||||
|
(description
|
||||||
|
"Rekor provides an immutable tamper-resistant ledger of metadata generated
|
||||||
|
within a software project's supply chain. It enables software maintainers
|
||||||
|
and consumers to transparently record signed metadata to a ledger.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-sigstore-rekor-tiles-v2
|
||||||
|
(package
|
||||||
|
(name "go-github-com-sigstore-rekor-tiles-v2")
|
||||||
|
(version "2.0.1")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/sigstore/rekor-tiles")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0z9is3mf31abzwappwp05z1pzci6f25z1ax27qgghmdisxmd3c6k"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:skip-build? #t
|
||||||
|
#:import-path "github.com/sigstore/rekor-tiles/v2"
|
||||||
|
;; XXX: Remove when all inputs are packaged.
|
||||||
|
#:test-subdirs
|
||||||
|
#~(list "internal/algorithmregistry"
|
||||||
|
"internal/safeint"
|
||||||
|
"pkg/client/write"
|
||||||
|
"pkg/types/dsse"
|
||||||
|
"pkg/types/hashedrekord"
|
||||||
|
"pkg/types/verifier"
|
||||||
|
"pkg/verifier/certificate"
|
||||||
|
"pkg/verifier/publickey"
|
||||||
|
"pkg/verify")))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-go-test-deep
|
||||||
|
go-github-com-spf13-cobra
|
||||||
|
go-github-com-spf13-viper
|
||||||
|
go-github-com-stretchr-testify
|
||||||
|
go-sigs-k8s-io-release-utils))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-cloud-google-com-go-storage
|
||||||
|
go-github-com-aws-aws-sdk-go-v2
|
||||||
|
go-github-com-aws-aws-sdk-go-v2-config
|
||||||
|
go-github-com-aws-aws-sdk-go-v2-credentials
|
||||||
|
go-github-com-aws-aws-sdk-go-v2-service-s3
|
||||||
|
go-github-com-aws-smithy-go
|
||||||
|
go-github-com-cyberphone-json-canonicalization
|
||||||
|
go-github-com-grpc-ecosystem-go-grpc-middleware
|
||||||
|
go-github-com-grpc-ecosystem-go-grpc-middleware-providers-prometheus
|
||||||
|
go-github-com-grpc-ecosystem-go-grpc-middleware-v2
|
||||||
|
go-github-com-grpc-ecosystem-grpc-gateway-v2
|
||||||
|
go-github-com-prometheus-client-golang
|
||||||
|
go-github-com-secure-systems-lab-go-securesystemslib
|
||||||
|
go-github-com-sigstore-protobuf-specs
|
||||||
|
go-github-com-sigstore-sigstore
|
||||||
|
;; go-github-com-sigstore-sigstore-go ;cycles
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-aws
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-gcp
|
||||||
|
go-github-com-tink-crypto-tink-go-awskms-v2
|
||||||
|
go-github-com-tink-crypto-tink-go-gcpkms-v2
|
||||||
|
go-github-com-tink-crypto-tink-go-v2
|
||||||
|
go-github-com-transparency-dev-formats
|
||||||
|
go-github-com-transparency-dev-merkle
|
||||||
|
go-go-opentelemetry-io-otel
|
||||||
|
go-go-opentelemetry-io-otel-exporters-prometheus
|
||||||
|
go-go-opentelemetry-io-otel-sdk-metric
|
||||||
|
go-golang-org-x-exp
|
||||||
|
go-golang-org-x-mod
|
||||||
|
go-golang-org-x-sync
|
||||||
|
go-google-golang-org-api
|
||||||
|
go-google-golang-org-genproto-googleapis-api
|
||||||
|
go-google-golang-org-grpc
|
||||||
|
go-google-golang-org-protobuf
|
||||||
|
go-k8s-io-klog-v2
|
||||||
|
|
||||||
|
;; TODO: Complete packaging.
|
||||||
|
;; go-cloud-google-com-go-spanner
|
||||||
|
;; go-github-com-chainguard-dev-clog
|
||||||
|
;; go-github-com-transparency-dev-tessera
|
||||||
|
#;go-go-step-sm-crypto))
|
||||||
|
(home-page "https://github.com/sigstore/rekor-tiles")
|
||||||
|
(synopsis "Tile-based transparency log for Sigstore")
|
||||||
|
(description
|
||||||
|
"This package provides a tile-based implementation of a transparency log
|
||||||
|
for the Sigstore ecosystem, supporting efficient verification of log entries.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-sigstore-sigstore-go
|
||||||
|
(package
|
||||||
|
(name "go-github-com-sigstore-sigstore-go")
|
||||||
|
(version "1.1.4")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/sigstore/sigstore-go")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0jr8jj4wibzxawn3dzv1j4cxmbh2b5g356mh2bqq9d0p78idf7k3"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:skip-build? #t
|
||||||
|
#:import-path "github.com/sigstore/sigstore-go"
|
||||||
|
#:embed-files #~(list ".*\\.json")
|
||||||
|
#:test-subdirs
|
||||||
|
#~(list "pkg/bundle"
|
||||||
|
"pkg/fulcio/certificate"
|
||||||
|
"pkg/tlog"
|
||||||
|
"pkg/tuf")))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-stretchr-testify))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-cyberphone-json-canonicalization
|
||||||
|
go-github-com-digitorus-timestamp
|
||||||
|
go-github-com-go-openapi-runtime
|
||||||
|
go-github-com-go-openapi-strfmt
|
||||||
|
go-github-com-go-openapi-swag-conv
|
||||||
|
go-github-com-google-certificate-transparency-go
|
||||||
|
go-github-com-in-toto-attestation
|
||||||
|
go-github-com-in-toto-in-toto-golang
|
||||||
|
go-github-com-secure-systems-lab-go-securesystemslib
|
||||||
|
go-github-com-sigstore-protobuf-specs
|
||||||
|
go-github-com-sigstore-rekor
|
||||||
|
go-github-com-sigstore-rekor-tiles-v2
|
||||||
|
go-github-com-sigstore-sigstore
|
||||||
|
go-github-com-sigstore-timestamp-authority-v2
|
||||||
|
go-github-com-theupdateframework-go-tuf-v2
|
||||||
|
go-golang-org-x-crypto
|
||||||
|
go-golang-org-x-mod
|
||||||
|
go-google-golang-org-protobuf))
|
||||||
|
(home-page "https://github.com/sigstore/sigstore-go")
|
||||||
|
(synopsis "Go client library for Sigstore")
|
||||||
|
(description
|
||||||
|
"This package provides a Go client library for Sigstore, enabling
|
||||||
|
verification of signatures and attestations produced by Sigstore tools.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-sigstore-sigstore-pkg-signature-kms-aws
|
||||||
|
(package
|
||||||
|
(name "go-github-com-sigstore-sigstore-pkg-signature-kms-aws")
|
||||||
|
(version "1.10.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/sigstore/sigstore")
|
||||||
|
(commit (go-version->git-ref version
|
||||||
|
#:subdir
|
||||||
|
"pkg/signature/kms/aws"))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0shnvcgz4g7v65biwraahjrbsmr13qmb903al50giak2694qhyyk"))
|
||||||
|
(modules '((guix build utils)
|
||||||
|
(ice-9 ftw)
|
||||||
|
(srfi srfi-26)))
|
||||||
|
(snippet
|
||||||
|
#~(begin
|
||||||
|
(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 "." "pkg")
|
||||||
|
(delete-all-but "pkg" "signature")
|
||||||
|
(delete-all-but "pkg/signature" "kms")
|
||||||
|
(delete-all-but "pkg/signature/kms" "aws")))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:import-path "github.com/sigstore/sigstore/pkg/signature/kms/aws"
|
||||||
|
#:unpack-path "github.com/sigstore/sigstore"))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-stretchr-testify))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-aws-aws-sdk-go-v2
|
||||||
|
go-github-com-aws-aws-sdk-go-v2-config
|
||||||
|
go-github-com-aws-aws-sdk-go-v2-service-kms
|
||||||
|
go-github-com-jellydator-ttlcache-v3
|
||||||
|
go-github-com-sigstore-sigstore))
|
||||||
|
(home-page "https://github.com/sigstore/sigstore")
|
||||||
|
(synopsis "Utilities related to AWS KMS")
|
||||||
|
(description
|
||||||
|
"Package aws implement the interface with Amazon AWS KMS service.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-sigstore-sigstore-pkg-signature-kms-azure
|
||||||
|
(package
|
||||||
|
(name "go-github-com-sigstore-sigstore-pkg-signature-kms-azure")
|
||||||
|
(version "1.10.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/sigstore/sigstore")
|
||||||
|
(commit (go-version->git-ref version
|
||||||
|
#:subdir
|
||||||
|
"pkg/signature/kms/azure"))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0shnvcgz4g7v65biwraahjrbsmr13qmb903al50giak2694qhyyk"))
|
||||||
|
(modules '((guix build utils)
|
||||||
|
(ice-9 ftw)
|
||||||
|
(srfi srfi-26)))
|
||||||
|
(snippet
|
||||||
|
#~(begin
|
||||||
|
(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 "." "pkg")
|
||||||
|
(delete-all-but "pkg" "signature")
|
||||||
|
(delete-all-but "pkg/signature" "kms")
|
||||||
|
(delete-all-but "pkg/signature/kms" "azure")))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:import-path "github.com/sigstore/sigstore/pkg/signature/kms/azure"
|
||||||
|
#:unpack-path "github.com/sigstore/sigstore"))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-azure-azure-sdk-for-go-sdk-azcore
|
||||||
|
go-github-com-azure-azure-sdk-for-go-sdk-azidentity
|
||||||
|
go-github-com-azure-azure-sdk-for-go-sdk-security-keyvault-azkeys
|
||||||
|
go-github-com-go-jose-go-jose-v4
|
||||||
|
go-github-com-google-go-cmp
|
||||||
|
go-github-com-jellydator-ttlcache-v3
|
||||||
|
go-github-com-sigstore-sigstore
|
||||||
|
go-golang-org-x-crypto))
|
||||||
|
(home-page "https://github.com/sigstore/sigstore")
|
||||||
|
(synopsis "Utilities related to Microsoft Azure KMS")
|
||||||
|
(description
|
||||||
|
"Package azure implement the interface with Microsoft Azure KMS
|
||||||
|
service.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-sigstore-sigstore-pkg-signature-kms-gcp
|
||||||
|
(package
|
||||||
|
(name "go-github-com-sigstore-sigstore-pkg-signature-kms-gcp")
|
||||||
|
(version "1.10.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/sigstore/sigstore")
|
||||||
|
(commit (go-version->git-ref version
|
||||||
|
#:subdir
|
||||||
|
"pkg/signature/kms/gcp"))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0shnvcgz4g7v65biwraahjrbsmr13qmb903al50giak2694qhyyk"))
|
||||||
|
(modules '((guix build utils)
|
||||||
|
(ice-9 ftw)
|
||||||
|
(srfi srfi-26)))
|
||||||
|
(snippet
|
||||||
|
#~(begin
|
||||||
|
(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 "." "pkg")
|
||||||
|
(delete-all-but "pkg" "signature")
|
||||||
|
(delete-all-but "pkg/signature" "kms")
|
||||||
|
(delete-all-but "pkg/signature/kms" "gcp")))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:import-path "github.com/sigstore/sigstore/pkg/signature/kms/gcp"
|
||||||
|
#:unpack-path "github.com/sigstore/sigstore"))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-cloud-google-com-go-kms
|
||||||
|
go-github-com-jellydator-ttlcache-v3
|
||||||
|
go-github-com-sigstore-sigstore
|
||||||
|
go-golang-org-x-oauth2
|
||||||
|
go-google-golang-org-api
|
||||||
|
go-google-golang-org-protobuf))
|
||||||
|
(home-page "https://github.com/sigstore/sigstore")
|
||||||
|
(synopsis "Utilities related to Google Cloud Platform KMS")
|
||||||
|
(description
|
||||||
|
"Package gcp implement the interface with Google Cloud KMS service.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault
|
||||||
|
(package
|
||||||
|
(name "go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault")
|
||||||
|
(version "1.10.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/sigstore/sigstore")
|
||||||
|
(commit (go-version->git-ref version
|
||||||
|
#:subdir
|
||||||
|
"pkg/signature/kms/hashivault"))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0shnvcgz4g7v65biwraahjrbsmr13qmb903al50giak2694qhyyk"))
|
||||||
|
(modules '((guix build utils)
|
||||||
|
(ice-9 ftw)
|
||||||
|
(srfi srfi-26)))
|
||||||
|
(snippet
|
||||||
|
#~(begin
|
||||||
|
(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 "." "pkg")
|
||||||
|
(delete-all-but "pkg" "signature")
|
||||||
|
(delete-all-but "pkg/signature" "kms")
|
||||||
|
(delete-all-but "pkg/signature/kms" "hashivault")))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:import-path "github.com/sigstore/sigstore/pkg/signature/kms/hashivault"
|
||||||
|
#:unpack-path "github.com/sigstore/sigstore"))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-stretchr-testify))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-hashicorp-vault-api
|
||||||
|
go-github-com-jellydator-ttlcache-v3
|
||||||
|
go-github-com-mitchellh-go-homedir
|
||||||
|
go-github-com-sigstore-sigstore))
|
||||||
|
(home-page "https://github.com/sigstore/sigstore")
|
||||||
|
(synopsis "Utilities related to Hashivault KMS")
|
||||||
|
(description
|
||||||
|
"Package hashivault implement the interface with
|
||||||
|
@url{https://www.hashicorp.com/en/products/vault HashiCorp Vault} KMS
|
||||||
|
service.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-sigstore-timestamp-authority-v2
|
||||||
|
(package
|
||||||
|
(name "go-github-com-sigstore-timestamp-authority-v2")
|
||||||
|
(version "2.0.4")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/sigstore/timestamp-authority")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1pgdxwkyrl10ayhw02n72r02q362gxg7110l9h9isiyqwbrmw2lp"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:skip-build? #t
|
||||||
|
#:import-path "github.com/sigstore/timestamp-authority/v2"
|
||||||
|
#:embed-files #~(list ".*\\.json")
|
||||||
|
#:test-subdirs #~(list "pkg/client" "pkg/x509")))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-go-playground-validator-v10
|
||||||
|
go-github-com-google-go-cmp
|
||||||
|
go-github-com-prometheus-client-golang
|
||||||
|
go-github-com-sigstore-sigstore
|
||||||
|
go-github-com-spf13-cobra
|
||||||
|
go-github-com-spf13-pflag
|
||||||
|
go-github-com-spf13-viper
|
||||||
|
go-github-com-tink-crypto-tink-go-v2
|
||||||
|
go-sigs-k8s-io-release-utils))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-cloud-google-com-go-security
|
||||||
|
go-github-com-beevik-ntp
|
||||||
|
go-github-com-digitorus-pkcs7
|
||||||
|
go-github-com-digitorus-timestamp
|
||||||
|
go-github-com-go-chi-chi
|
||||||
|
go-github-com-go-openapi-errors
|
||||||
|
go-github-com-go-openapi-loads
|
||||||
|
go-github-com-go-openapi-runtime
|
||||||
|
go-github-com-go-openapi-spec
|
||||||
|
go-github-com-go-openapi-strfmt
|
||||||
|
go-github-com-go-openapi-swag
|
||||||
|
go-github-com-pkg-errors
|
||||||
|
go-github-com-rs-cors
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-aws
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-azure
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-gcp
|
||||||
|
go-github-com-sigstore-sigstore-pkg-signature-kms-hashivault
|
||||||
|
go-github-com-tink-crypto-tink-go-awskms-v2
|
||||||
|
go-github-com-tink-crypto-tink-go-gcpkms-v2
|
||||||
|
go-github-com-tink-crypto-tink-go-hcvault-v2
|
||||||
|
go-github-com-urfave-negroni
|
||||||
|
;; go-go-step-sm-crypto ;not packaged yet in Guix
|
||||||
|
go-sigs-k8s-io-yaml))
|
||||||
|
(home-page "https://github.com/sigstore/timestamp-authority")
|
||||||
|
(synopsis "RFC 3161 timestamp verification for Sigstore")
|
||||||
|
(description
|
||||||
|
"This package provides timestamp verification functionality for the
|
||||||
|
Sigstore ecosystem, implementing RFC 3161 timestamp response validation.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public go-github-com-shurcool-githubv4
|
(define-public go-github-com-shurcool-githubv4
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-shurcool-githubv4")
|
(name "go-github-com-shurcool-githubv4")
|
||||||
@@ -17007,6 +17637,90 @@ Features:
|
|||||||
@end itemize")
|
@end itemize")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public go-github-com-tink-crypto-tink-go-awskms-v2
|
||||||
|
(package
|
||||||
|
(name "go-github-com-tink-crypto-tink-go-awskms-v2")
|
||||||
|
(version "2.1.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/tink-crypto/tink-go-awskms")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0crsky461yyvl04g0gbsz9gh2zmlmgd5li5qk4k7zvmj103gmwlr"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:skip-build? #t
|
||||||
|
#:import-path "github.com/tink-crypto/tink-go-awskms/v2"))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-aws-aws-sdk-go
|
||||||
|
go-github-com-tink-crypto-tink-go-v2))
|
||||||
|
(home-page "https://github.com/tink-crypto/tink-go-awskms")
|
||||||
|
(synopsis "Tink Go AWS KMS extension")
|
||||||
|
(description
|
||||||
|
"This is an extension to the @url{https://github.com/tink-crypto/tink-go,
|
||||||
|
Tink Go} library that provides support for AWS KMS.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-tink-crypto-tink-go-gcpkms-v2
|
||||||
|
(package
|
||||||
|
(name "go-github-com-tink-crypto-tink-go-gcpkms-v2")
|
||||||
|
(version "2.2.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/tink-crypto/tink-go-gcpkms")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0hf31f26lmpg81k64flsvcx83ngkhazkkf792i5qkq14q4ndsdhw"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:skip-build? #t
|
||||||
|
#:import-path "github.com/tink-crypto/tink-go-gcpkms/v2"))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-tink-crypto-tink-go-v2
|
||||||
|
go-google-golang-org-api))
|
||||||
|
(home-page "https://github.com/tink-crypto/tink-go-gcpkms")
|
||||||
|
(synopsis "Tink Go Google Cloud KMS extension")
|
||||||
|
(description
|
||||||
|
"This is an extension to the @url{https://github.com/tink-crypto/tink-go,
|
||||||
|
Tink Go} library that provides support for Google Cloud KMS.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-github-com-tink-crypto-tink-go-hcvault-v2
|
||||||
|
(package
|
||||||
|
(name "go-github-com-tink-crypto-tink-go-hcvault-v2")
|
||||||
|
(version "2.4.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/tink-crypto/tink-go-hcvault")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1ifwxrsyynkss652wnn2ivhfj8n84m8rz7fjpi8gcx2cppmx9zrv"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:skip-build? #t
|
||||||
|
#:import-path "github.com/tink-crypto/tink-go-hcvault/v2"))
|
||||||
|
(propagated-inputs
|
||||||
|
(list go-github-com-hashicorp-vault-api
|
||||||
|
go-github-com-tink-crypto-tink-go-v2))
|
||||||
|
(home-page "https://github.com/tink-crypto/tink-go-hcvault")
|
||||||
|
(synopsis "Tink Go HashiCorp Vault extension")
|
||||||
|
(description
|
||||||
|
"This is an extension to the @url{https://github.com/tink-crypto/tink-go,
|
||||||
|
Tink Go} library that provides support for HashiCorp Vault.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public go-github-com-tj-go-elastic
|
(define-public go-github-com-tj-go-elastic
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-tj-go-elastic")
|
(name "go-github-com-tj-go-elastic")
|
||||||
@@ -19292,6 +20006,36 @@ at
|
|||||||
Tracer implementation from the @code{OpenTracing} project.")
|
Tracer implementation from the @code{OpenTracing} project.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public go-go-opentelemetry-io-contrib-zpages
|
||||||
|
(package
|
||||||
|
(name "go-go-opentelemetry-io-contrib-zpages")
|
||||||
|
(version "0.68.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/open-telemetry/opentelemetry-go-contrib")
|
||||||
|
(commit (go-version->git-ref version
|
||||||
|
#:subdir "zpages"))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0nh7g1zxr3drqcbhsnnkqaz2hn1rnawg8jalixng23c9hwfgqaly"))))
|
||||||
|
(build-system go-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:go go-1.25
|
||||||
|
#:import-path "go.opentelemetry.io/contrib/zpages"
|
||||||
|
#:unpack-path "go.opentelemetry.io/contrib"))
|
||||||
|
(native-inputs (list go-github-com-stretchr-testify))
|
||||||
|
(propagated-inputs (list go-go-opentelemetry-io-otel
|
||||||
|
go-go-opentelemetry-io-otel-sdk
|
||||||
|
go-go-opentelemetry-io-otel-trace))
|
||||||
|
(home-page "https://opentelemetry.io/")
|
||||||
|
(synopsis "Display telemetry stats")
|
||||||
|
(description "Package zPages implements a collection of HTML pages that
|
||||||
|
display telemetry stats.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public go-go-opentelemetry-io-otel
|
(define-public go-go-opentelemetry-io-otel
|
||||||
(package
|
(package
|
||||||
(name "go-go-opentelemetry-io-otel")
|
(name "go-go-opentelemetry-io-otel")
|
||||||
@@ -21769,6 +22513,7 @@ feature set and features are added on as the need arises.")
|
|||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
#:go go-1.25
|
||||||
#:build-flags #~(list (string-append "-ldflags="
|
#:build-flags #~(list (string-append "-ldflags="
|
||||||
"-X main.lyrebirdVersion="
|
"-X main.lyrebirdVersion="
|
||||||
#$version " -s -w"))
|
#$version " -s -w"))
|
||||||
|
|||||||
@@ -74,6 +74,8 @@
|
|||||||
;;; Copyright © 2025 Aleksandr Lebedev <alex.lebedev2003@icloud.com>
|
;;; Copyright © 2025 Aleksandr Lebedev <alex.lebedev2003@icloud.com>
|
||||||
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
||||||
;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
;;; Copyright © 2026 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
||||||
|
;;; Copyright © 2026 Evgeny Pisemsky <mail@pisemsky.site>
|
||||||
|
;;; Copyright © 2026 Vinicius Monego <monego@posteo.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -8035,7 +8037,7 @@ supports concurrent serializable transactions.")
|
|||||||
(package
|
(package
|
||||||
(inherit go-github-com-dgraph-io-badger)
|
(inherit go-github-com-dgraph-io-badger)
|
||||||
(name "go-github-com-dgraph-io-badger-v4")
|
(name "go-github-com-dgraph-io-badger-v4")
|
||||||
(version "4.5.2")
|
(version "4.9.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -8044,7 +8046,7 @@ supports concurrent serializable transactions.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0v4c69whypm3k40hrx8bw9rjrcb0swz43v056s0fadqr04j0ncwj"))))
|
(base32 "0a9lk7fw06yb89wy9rp4q50ircw5imm1cqzhyhs92d0cia5qbhh6"))))
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:tests? #f ; TODO: tests hang, find out why.
|
#:tests? #f ; TODO: tests hang, find out why.
|
||||||
@@ -8057,7 +8059,8 @@ supports concurrent serializable transactions.")
|
|||||||
go-github-com-klauspost-compress
|
go-github-com-klauspost-compress
|
||||||
go-github-com-pkg-errors
|
go-github-com-pkg-errors
|
||||||
go-github-com-spf13-cobra
|
go-github-com-spf13-cobra
|
||||||
go-go-opencensus-io
|
go-go-opentelemetry-io-contrib-zpages
|
||||||
|
go-go-opentelemetry-io-otel
|
||||||
go-golang-org-x-net
|
go-golang-org-x-net
|
||||||
go-golang-org-x-sys
|
go-golang-org-x-sys
|
||||||
go-google-golang-org-protobuf))))
|
go-google-golang-org-protobuf))))
|
||||||
@@ -17603,7 +17606,7 @@ implementing features like:
|
|||||||
(define-public go-github-com-maruel-natural
|
(define-public go-github-com-maruel-natural
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-maruel-natural")
|
(name "go-github-com-maruel-natural")
|
||||||
(version "1.1.1")
|
(version "1.3.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -17612,7 +17615,7 @@ implementing features like:
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "040aikizdd7c4zm8xindb2ps16s60i0fkf8gkll2rir7lwv6q7ks"))))
|
(base32 "1nr1ai3b7yvz4wz4k0jqvjq3978hpk9yxarn7g7i3d2sxbdc0g4q"))))
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -22785,16 +22788,16 @@ it is capable of logging at some or all levels.")
|
|||||||
(define-public go-github-com-rivo-tview
|
(define-public go-github-com-rivo-tview
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-rivo-tview")
|
(name "go-github-com-rivo-tview")
|
||||||
(version "0.0.0-20241227133733-17b7edb88c57")
|
(version "0.42.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/rivo/tview")
|
(url "https://github.com/rivo/tview")
|
||||||
(commit (go-version->git-ref version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1w59vyvs8k5mzl7k39zpwcwwdgam2pbz0rnrfnnjgvkld1rh81dc"))))
|
(base32 "0jw47h92l0vp1lg6s5kng4hjv81hi8qxx9h5yilc7rzrr8l9ksd2"))))
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:import-path "github.com/rivo/tview"))
|
(list #:import-path "github.com/rivo/tview"))
|
||||||
|
|||||||
@@ -1022,56 +1022,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||||||
(map (lambda (suffix) (string-append "armv9" suffix "-a"))
|
(map (lambda (suffix) (string-append "armv9" suffix "-a"))
|
||||||
'("" ".1" ".2" ".3" ".4" ".5"))))
|
'("" ".1" ".2" ".3" ".4" ".5"))))
|
||||||
|
|
||||||
(define-public go-1.23
|
|
||||||
(package
|
|
||||||
(inherit go-1.22)
|
|
||||||
(name "go")
|
|
||||||
(version "1.23.12")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/golang/go")
|
|
||||||
(commit (string-append "go" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "0nxcp8wikn93zxipm829dyyagwys13yhf452ai357wzbdzqihm7x"))))
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments (package-arguments go-1.22)
|
|
||||||
((#:phases phases)
|
|
||||||
#~(modify-phases #$phases
|
|
||||||
(replace 'disable-more-tests
|
|
||||||
(lambda _
|
|
||||||
#$@(cond
|
|
||||||
((target-aarch64?)
|
|
||||||
;; https://go-review.googlesource.com/c/go/+/151303
|
|
||||||
;; This test is known buggy on aarch64 and is enabled and
|
|
||||||
;; disabled upstream with some regularity.
|
|
||||||
#~((substitute* "src/plugin/plugin_test.go"
|
|
||||||
(("package plugin_test")
|
|
||||||
(string-append "// +build !linux linux,!arm64\n\n"
|
|
||||||
"package plugin_test")))))
|
|
||||||
((target-arm32?)
|
|
||||||
;; This test fails when run on aarch64-linux.
|
|
||||||
#~((substitute* "src/cmd/link/internal/ld/elf_test.go"
|
|
||||||
(("TestElfBindNow.*" all)
|
|
||||||
(string-append
|
|
||||||
all
|
|
||||||
" if runtime.GOARCH == \"arm\" {\n"
|
|
||||||
" t.Skipf(\"skipping; flaky on armhf\")\n"
|
|
||||||
" }\n")))))
|
|
||||||
(else (list #t)))))))))
|
|
||||||
(properties
|
|
||||||
`((compiler-cpu-architectures
|
|
||||||
("aarch64" ,@%go-1.23-arm64-micro-architectures)
|
|
||||||
("armhf" ,@%go-1.17-arm-micro-architectures)
|
|
||||||
("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)
|
|
||||||
("x86_64" ,@%go-1.18-x86_64-micro-architectures))))
|
|
||||||
(native-inputs
|
|
||||||
;; setarch was added to the tsan test suite in 1.23.12
|
|
||||||
`(("go" ,util-linux)
|
|
||||||
,@(package-native-inputs go-1.22)))))
|
|
||||||
|
|
||||||
(define-public go-1.24
|
(define-public go-1.24
|
||||||
(package
|
(package
|
||||||
(inherit go-1.22)
|
(inherit go-1.22)
|
||||||
@@ -1239,7 +1189,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
|||||||
(define-public go-std-1.20 (make-go-std go-1.20))
|
(define-public go-std-1.20 (make-go-std go-1.20))
|
||||||
(define-public go-std-1.21 (make-go-std go-1.21))
|
(define-public go-std-1.21 (make-go-std go-1.21))
|
||||||
(define-public go-std-1.22 (make-go-std go-1.22))
|
(define-public go-std-1.22 (make-go-std go-1.22))
|
||||||
(define-public go-std-1.23 (make-go-std go-1.23))
|
|
||||||
(define-public go-std-1.24 (make-go-std go-1.24))
|
(define-public go-std-1.24 (make-go-std go-1.24))
|
||||||
(define-public go-std-1.25 (make-go-std go-1.25))
|
(define-public go-std-1.25 (make-go-std go-1.25))
|
||||||
(define-public go-std-1.26 (make-go-std go-1.26))
|
(define-public go-std-1.26 (make-go-std go-1.26))
|
||||||
|
|||||||
@@ -129,7 +129,7 @@
|
|||||||
libxv
|
libxv
|
||||||
mesa
|
mesa
|
||||||
sdl
|
sdl
|
||||||
v4l-utils-minimal))
|
v4l-utils))
|
||||||
(synopsis "1394-Based Digital Camera Control Library")
|
(synopsis "1394-Based Digital Camera Control Library")
|
||||||
(description "LibDC1394 is a library that provides functionality to control
|
(description "LibDC1394 is a library that provides functionality to control
|
||||||
any camera that conforms to the 1394-Based Digital Camera Specification written
|
any camera that conforms to the 1394-Based Digital Camera Specification written
|
||||||
@@ -721,7 +721,7 @@ for the GStreamer multimedia library.")
|
|||||||
speex
|
speex
|
||||||
taglib
|
taglib
|
||||||
twolame
|
twolame
|
||||||
v4l-utils-minimal
|
v4l-utils
|
||||||
wavpack
|
wavpack
|
||||||
zlib))
|
zlib))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
@@ -942,7 +942,7 @@ model to base your own plug-in on, here it is.")
|
|||||||
tinyalsa
|
tinyalsa
|
||||||
transcode
|
transcode
|
||||||
usrsctp
|
usrsctp
|
||||||
v4l-utils-minimal
|
v4l-utils
|
||||||
vo-aacenc
|
vo-aacenc
|
||||||
vo-amrwbenc
|
vo-amrwbenc
|
||||||
vulkan-headers
|
vulkan-headers
|
||||||
|
|||||||
+18
-25
@@ -517,22 +517,19 @@ functions which were removed.")
|
|||||||
"0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
|
"0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
|
||||||
(build-system waf-build-system)
|
(build-system waf-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
(list
|
||||||
(modify-phases %standard-phases
|
#:tests? #f ; no check target
|
||||||
(add-before 'configure 'set-flags
|
#:phases
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
#~(modify-phases %standard-phases
|
||||||
;; Allow 'bin/ganv_bench' to find libganv-1.so.
|
(add-before 'configure 'set-flags
|
||||||
(setenv "LDFLAGS"
|
(lambda _
|
||||||
(string-append "-Wl,-rpath="
|
;; Allow 'bin/ganv_bench' to find libganv-1.so.
|
||||||
(assoc-ref outputs "out") "/lib"))
|
(setenv "LDFLAGS"
|
||||||
#t)))
|
(string-append "-Wl,-rpath=" #$output "/lib")))))))
|
||||||
#:tests? #f)) ; no check target
|
|
||||||
(inputs
|
|
||||||
`(("gtk" ,gtk+-2)
|
|
||||||
("gtkmm" ,gtkmm-2)))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list `(,glib "bin") ; for glib-genmarshal, etc.
|
(list `(,glib "bin") ; for glib-genmarshal, etc.
|
||||||
pkg-config))
|
pkg-config))
|
||||||
|
(inputs (list gtk+-2 gtkmm-2))
|
||||||
(home-page "https://drobilla.net/software/ganv/")
|
(home-page "https://drobilla.net/software/ganv/")
|
||||||
(synopsis "GTK+ widget for interactive graph-like environments")
|
(synopsis "GTK+ widget for interactive graph-like environments")
|
||||||
(description
|
(description
|
||||||
@@ -1460,10 +1457,9 @@ exceptions, macros, and a dynamic programming environment.")
|
|||||||
(inherit guile-cairo)
|
(inherit guile-cairo)
|
||||||
(name "guile2.2-cairo")
|
(name "guile2.2-cairo")
|
||||||
(inputs
|
(inputs
|
||||||
`(("guile" ,guile-2.2)
|
(modify-inputs inputs
|
||||||
("guile-lib" ,guile2.2-lib)
|
(delete "guile" "guile-lib")
|
||||||
,@(fold alist-delete (package-inputs guile-cairo)
|
(append guile-2.2 guile2.2-lib)))))
|
||||||
'("guile" "guile-lib"))))))
|
|
||||||
|
|
||||||
(define-public guile-cairo-next
|
(define-public guile-cairo-next
|
||||||
;; A commit with cairo-pointer->context, missing from guile-cairo@1.11.2
|
;; A commit with cairo-pointer->context, missing from guile-cairo@1.11.2
|
||||||
@@ -1579,11 +1575,10 @@ images onto Cairo surfaces.")
|
|||||||
(inherit guile-rsvg)
|
(inherit guile-rsvg)
|
||||||
(name "guile2.2-rsvg")
|
(name "guile2.2-rsvg")
|
||||||
(inputs
|
(inputs
|
||||||
`(("guile" ,guile-2.2)
|
(modify-inputs inputs
|
||||||
("guile-lib" ,guile2.2-lib)
|
(delete "guile" "guile-lib")
|
||||||
,@(fold alist-delete (package-inputs guile-rsvg)
|
(append guile-2.2 guile2.2-lib)))
|
||||||
'("guile" "guile-lib"))))
|
(propagated-inputs (list guile2.2-cairo))))
|
||||||
(propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))
|
|
||||||
|
|
||||||
(define-public guile-present
|
(define-public guile-present
|
||||||
(package
|
(package
|
||||||
@@ -1649,9 +1644,7 @@ documents.")
|
|||||||
(name "guile2.2-present")
|
(name "guile2.2-present")
|
||||||
(inputs (list guile-2.2))
|
(inputs (list guile-2.2))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("guile-lib" ,guile2.2-lib)
|
(list guile2.2-lib guile2.2-cairo guile2.2-rsvg))))
|
||||||
("guile-cairo" ,guile2.2-cairo)
|
|
||||||
("guile-rsvg" ,guile2.2-rsvg)))))
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
;;; C++ bindings.
|
;;; C++ bindings.
|
||||||
|
|||||||
+197
-85
@@ -60,6 +60,7 @@
|
|||||||
;;; Copyright © 2025 Andy Tai <atai@atai.org>
|
;;; Copyright © 2025 Andy Tai <atai@atai.org>
|
||||||
;;; Copyright © 2025 Ekaitz Zarraga <ekaitz@elenq.tech>
|
;;; Copyright © 2025 Ekaitz Zarraga <ekaitz@elenq.tech>
|
||||||
;;; Copyright © 2026 Matt Wette <matt.wette@gmail.com>
|
;;; Copyright © 2026 Matt Wette <matt.wette@gmail.com>
|
||||||
|
;;; Copyright © 2026 Dzianis Jackievič <mail@miesta.by>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -1167,7 +1168,7 @@ is not available for Guile 2.0.")
|
|||||||
(package
|
(package
|
||||||
(inherit guile-fibers-1.3)
|
(inherit guile-fibers-1.3)
|
||||||
(name "guile-fibers")
|
(name "guile-fibers")
|
||||||
(version "1.4.2")
|
(version "1.4.3")
|
||||||
(source
|
(source
|
||||||
(origin (inherit (package-source guile-fibers-1.3))
|
(origin (inherit (package-source guile-fibers-1.3))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
@@ -1176,7 +1177,7 @@ is not available for Guile 2.0.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0qh0czz5qvk5mmrc8x2gmvl5psdfd22q2rhzj4jrpan6k3d55bl8"))
|
"1q0a9y0cc8rld1z7mcj61fkldhd0kn9n4yq25izxslbgg4g5h9j6"))
|
||||||
(patches '())))
|
(patches '())))
|
||||||
(arguments
|
(arguments
|
||||||
(if (target-aarch64?)
|
(if (target-aarch64?)
|
||||||
@@ -1256,30 +1257,8 @@ is not available for Guile 2.0.")
|
|||||||
(modify-inputs native-inputs
|
(modify-inputs native-inputs
|
||||||
(replace "guile" guile-2.2)))))
|
(replace "guile" guile-2.2)))))
|
||||||
|
|
||||||
(define-public guile-fibers-next
|
;; Deprecated on 2026-04-23
|
||||||
(let ((commit "297359f0ad655378bcc3ff0d4e96101965ef39b4")
|
(define-deprecated-package guile-fibers-next guile-fibers)
|
||||||
(revision "0"))
|
|
||||||
(package
|
|
||||||
(inherit guile-fibers)
|
|
||||||
(name "guile-fibers-next")
|
|
||||||
(version (git-version "1.4.2"
|
|
||||||
revision
|
|
||||||
commit))
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://codeberg.org/guile/fibers.git")
|
|
||||||
(commit commit)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0qh0czz5qvk5mmrc8x2gmvl5psdfd22q2rhzj4jrpan6k3d55bl8"))))
|
|
||||||
(inputs
|
|
||||||
(modify-inputs inputs
|
|
||||||
(replace "guile" guile-next)))
|
|
||||||
(native-inputs
|
|
||||||
(modify-inputs native-inputs
|
|
||||||
(replace "guile" guile-next))))))
|
|
||||||
|
|
||||||
(define-public guile-kracht
|
(define-public guile-kracht
|
||||||
(package
|
(package
|
||||||
@@ -1537,7 +1516,7 @@ order to provide IDE functionality for Guile Scheme.")
|
|||||||
(define-public guile-ares-rs
|
(define-public guile-ares-rs
|
||||||
(package
|
(package
|
||||||
(name "guile-ares-rs")
|
(name "guile-ares-rs")
|
||||||
(version "0.9.6")
|
(version "0.9.7")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -1547,35 +1526,42 @@ order to provide IDE functionality for Guile Scheme.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1vkww3vc0lsh5f8yh6fnh402rx3rsm0ss69rdkmplhzp4c7c4z1d"))))
|
"1xbznh5zjswfydgqg53g50ya7zm0hidin74g2glk849l9j45szw3"))))
|
||||||
(build-system guile-build-system)
|
(build-system guile-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:source-directory "src/guile"
|
#:source-directory "src/guile"
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'build 'install-script
|
(add-after 'build 'install-scripts
|
||||||
(lambda _
|
(lambda _
|
||||||
(let* ((bin (string-append #$output "/bin"))
|
(define bin (string-append #$output "/bin"))
|
||||||
(oldpath (string-append
|
(define site (string-append #$output "/share/guile/site/3.0"))
|
||||||
#$output
|
(define ccache
|
||||||
;; This file will be named ares-nrepl.scm for
|
(string-append #$output "/lib/guile/3.0/site-ccache"))
|
||||||
;; the next version.
|
|
||||||
"/share/guile/site/3.0/ares/scripts/ares.scm"))
|
(define (install-script name)
|
||||||
(newpath (string-append bin "/ares-nrepl")))
|
(let ((oldpath
|
||||||
(mkdir bin)
|
(string-append site "/ares/scripts/" name ".scm"))
|
||||||
(symlink oldpath newpath)
|
(newpath
|
||||||
(wrap-program newpath
|
(string-append bin "/" name)))
|
||||||
`("GUILE_LOAD_PATH" ":" =
|
(symlink oldpath newpath)
|
||||||
,(list (string-append #$output "/share/guile/site/3.0")
|
(wrap-program newpath
|
||||||
(getenv "GUILE_LOAD_PATH")))
|
`("GUILE_LOAD_PATH" ":" =
|
||||||
`("GUILE_LOAD_COMPILED_PATH" ":" =
|
,(list "$GUILE_LOAD_PATH"
|
||||||
,(list (string-append #$output "/lib/guile/3.0/site-ccache")
|
site
|
||||||
(getenv "GUILE_LOAD_COMPILED_PATH"))))
|
(getenv "GUILE_LOAD_PATH")))
|
||||||
;; Not needed since the wrapper followed the symlink.
|
`("GUILE_LOAD_COMPILED_PATH" ":" =
|
||||||
(delete-file (string-append bin "/.ares-nrepl-real"))))))))
|
,(list "$GUILE_LOAD_COMPILED_PATH"
|
||||||
(inputs (list bash-minimal guile-3.0))
|
ccache
|
||||||
(propagated-inputs (list guile-fibers guile-custom-ports))
|
(getenv "GUILE_LOAD_COMPILED_PATH"))))
|
||||||
|
;; Not needed since the wrapper followed the symlink.
|
||||||
|
(delete-file (string-append bin "/." name "-real"))))
|
||||||
|
|
||||||
|
(mkdir bin)
|
||||||
|
(for-each install-script '("ares-nrepl" "ares-suitbl")))))))
|
||||||
|
(inputs (list bash-minimal guile-3.0-latest))
|
||||||
|
(propagated-inputs (list guile-fibers))
|
||||||
(home-page "https://git.sr.ht/~abcdw/guile-ares-rs")
|
(home-page "https://git.sr.ht/~abcdw/guile-ares-rs")
|
||||||
(synopsis "Asynchronous Reliable Extensible Sleek RPC Server for Guile")
|
(synopsis "Asynchronous Reliable Extensible Sleek RPC Server for Guile")
|
||||||
(description "Asynchronous Reliable Extensible Sleek RPC Server for
|
(description "Asynchronous Reliable Extensible Sleek RPC Server for
|
||||||
@@ -5707,27 +5693,32 @@ perform geometrical transforms on JPEG images.")
|
|||||||
(license license:gpl3+))))
|
(license license:gpl3+))))
|
||||||
|
|
||||||
(define-public guile-jtd
|
(define-public guile-jtd
|
||||||
(package
|
;; There are a few unreleased commits that include niceties such as warning
|
||||||
(name "guile-jtd")
|
;; that the debug VM must be used; use the latest commit until the next
|
||||||
(version "220323a")
|
;; release comes.
|
||||||
(source (origin
|
(let ((commit "425f86ae954d6445aaedacfd4ecd50aa0022e59d")
|
||||||
(method git-fetch)
|
(revision "0"))
|
||||||
(uri (git-reference
|
(package
|
||||||
(url "https://github.com/mwette/guile-jtd")
|
(name "guile-jtd")
|
||||||
(commit (string-append "v" version))))
|
(version (git-version "220323a" revision commit))
|
||||||
(file-name (git-file-name name version))
|
(source (origin
|
||||||
(sha256
|
(method git-fetch)
|
||||||
(base32
|
(uri (git-reference
|
||||||
"1l8fyqhvksarvpbr903i3ss3432jzvyvhgcqa15j922ngqh4ds6f"))))
|
(url "https://github.com/mwette/guile-jtd")
|
||||||
(build-system guile-build-system)
|
(commit commit)))
|
||||||
(native-inputs (list guile-3.0))
|
(file-name (git-file-name name version))
|
||||||
(home-page "https://github.com/mwette/guile-jtd")
|
(sha256
|
||||||
(synopsis "Python's @code{pdb.set_trace()} but for Guile")
|
(base32
|
||||||
(description
|
"1l8fyqhvksarvpbr903i3ss3432jzvyvhgcqa15j922ngqh4ds6f"))))
|
||||||
"The @code{(jtd)} module for Guile provides a procedure
|
(build-system guile-build-system)
|
||||||
|
(native-inputs (list guile-3.0))
|
||||||
|
(home-page "https://github.com/mwette/guile-jtd")
|
||||||
|
(synopsis "Python's @code{pdb.set_trace()} but for Guile")
|
||||||
|
(description
|
||||||
|
"The @code{(jtd)} module for Guile provides a procedure
|
||||||
@code{jump-to-debugger} for escaping to the Guile REPL for the purpose of
|
@code{jump-to-debugger} for escaping to the Guile REPL for the purpose of
|
||||||
debugging code.")
|
debugging code.")
|
||||||
(license license:lgpl2.1+)))
|
(license license:lgpl2.1+))))
|
||||||
|
|
||||||
(define-public guile-png
|
(define-public guile-png
|
||||||
(package
|
(package
|
||||||
@@ -5787,6 +5778,43 @@ reading and writing PNG data, as well as some graphic primitives and basic image
|
|||||||
processing filters.")
|
processing filters.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public guile-pnm
|
||||||
|
(package
|
||||||
|
(name "guile-pnm")
|
||||||
|
(version "0.2.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/artyom-poptsov/guile-pnm")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "06kgp1gh8hdj1j6w7i981prx93wfjpayrnjlydlzs7l5j04l4m3a"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:make-flags
|
||||||
|
#~(list "GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
|
||||||
|
(native-inputs (list autoconf
|
||||||
|
automake
|
||||||
|
pkg-config
|
||||||
|
texinfo
|
||||||
|
;; needed when cross-compiling.
|
||||||
|
guile-3.0
|
||||||
|
guile-lib
|
||||||
|
guile-smc))
|
||||||
|
(inputs (list guile-3.0 guile-lib))
|
||||||
|
(propagated-inputs (list guile-smc))
|
||||||
|
(home-page "https://github.com/artyom-poptsov/guile-pnm")
|
||||||
|
(synopsis "NetBPM (PNM) library for GNU Guile")
|
||||||
|
(description
|
||||||
|
"@code{guile-pnm} is a GNU Guile library for working with the
|
||||||
|
@url{https://en.wikipedia.org/wiki/Netpbm, NetPBM} format (also known as PNM),
|
||||||
|
including portable bitmap (PBM), portable graymap (PGM) and portable
|
||||||
|
pixel (PPM) variants.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public guile-cv
|
(define-public guile-cv
|
||||||
(package
|
(package
|
||||||
(name "guile-cv")
|
(name "guile-cv")
|
||||||
@@ -6362,6 +6390,88 @@ as signed sessions, multipart message support, etc.")
|
|||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list guile2.2-irregex guile2.2-gcrypt))))
|
(list guile2.2-irregex guile2.2-gcrypt))))
|
||||||
|
|
||||||
|
(define-public guile-compose
|
||||||
|
(package
|
||||||
|
(name "guile-compose")
|
||||||
|
(version "0.1.2")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://codeberg.org/jadzi/guile-compose.git")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1g68gczs96nrb0vf1hv4n07zsp2516gpiwq1wwlhcq4rzynhf12h"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:make-flags
|
||||||
|
#~'("GUILE_AUTO_COMPILE=0")))
|
||||||
|
(inputs (list guile-3.0))
|
||||||
|
(native-inputs (list autoconf-2.72 automake pkg-config guile-3.0 texinfo))
|
||||||
|
(synopsis "Procedure composition utilities for Guile Scheme")
|
||||||
|
(description
|
||||||
|
"This tiny package provides some procedures and macros to extend
|
||||||
|
Guile Scheme procedure composition facilities. For example, there is
|
||||||
|
a @code{compose-top}, a reverse-order analog to native @code{compose}
|
||||||
|
procedure. The @code{compose-cont} is a macro, utilizing some power of
|
||||||
|
continuations to build really flexible flows.
|
||||||
|
|
||||||
|
This library is intended to stay basic and small, so it has no any
|
||||||
|
external dependencies and can be a good base for other packages, like e.g.
|
||||||
|
@code{guile-web-middleware}.")
|
||||||
|
(license (list license:lgpl3+))
|
||||||
|
(home-page "https://jadzi.codeberg.page/guile-compose")))
|
||||||
|
|
||||||
|
(define-public guile-web-middleware
|
||||||
|
(package
|
||||||
|
(name "guile-web-middleware")
|
||||||
|
(version "0.11.1")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://codeberg.org/jadzi/guile-web-middleware.git")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "01wb8v0lszphdv08ly4aqv59qm5h8yw2fgm025vkn61djspsq4j9"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:make-flags
|
||||||
|
#~'("GUILE_AUTO_COMPILE=0")))
|
||||||
|
(inputs (list guile-3.0))
|
||||||
|
(propagated-inputs (list guile-compose))
|
||||||
|
(native-inputs (list autoconf-2.72 automake pkg-config guile-3.0 texinfo))
|
||||||
|
(synopsis "Web application middleware composition for Guile Scheme")
|
||||||
|
(description
|
||||||
|
"This package provides means to compose a web application by
|
||||||
|
chaining procedures, a.k.a. middlewares. By those means, composed
|
||||||
|
procedures form a standard request handler for any Guile's web server
|
||||||
|
implementation.
|
||||||
|
|
||||||
|
Each middleware has its own limited responsibility in request
|
||||||
|
processing. Also, middlewares are simple Scheme procedures, so they
|
||||||
|
can be easily tested and shared among web applications.
|
||||||
|
|
||||||
|
Out of the box, this package provides several procedures for commonly
|
||||||
|
required tasks. Among them:
|
||||||
|
|
||||||
|
@itemize
|
||||||
|
@item Error handling with customizable page contents.
|
||||||
|
@item Request filtering.
|
||||||
|
@item Request logging.
|
||||||
|
@item Serving static files, file URL generation.
|
||||||
|
@item Request routing, handling parameters, route URL generation.
|
||||||
|
@item Middleware nesting, composing whole apps.
|
||||||
|
@end itemize
|
||||||
|
|
||||||
|
This package relies on @code{guile-compose} package as its only dependency.")
|
||||||
|
(license (list license:lgpl3+))
|
||||||
|
(home-page "https://jadzi.codeberg.page/guile-web-middleware")))
|
||||||
|
|
||||||
(define-public guile-web-driver-ng
|
(define-public guile-web-driver-ng
|
||||||
(package
|
(package
|
||||||
(name "guile-web-driver-ng")
|
(name "guile-web-driver-ng")
|
||||||
@@ -7654,11 +7764,11 @@ is an attempt to combine both into something useful.")
|
|||||||
(license license:asl2.0))))
|
(license license:asl2.0))))
|
||||||
|
|
||||||
(define-public guile-knots
|
(define-public guile-knots
|
||||||
(let ((commit "d79284b4715efc347b22d510c3e3134a0c584b17")
|
(let ((commit "f767eca066495e6582e89ba1b91907c0c5657878")
|
||||||
(revision "32"))
|
(revision "34"))
|
||||||
(package
|
(package
|
||||||
(name "guile-knots")
|
(name "guile-knots")
|
||||||
(version (git-version "0" revision commit))
|
(version (git-version "0.1" revision commit))
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -7666,7 +7776,7 @@ is an attempt to combine both into something useful.")
|
|||||||
(commit commit)))
|
(commit commit)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0i87jc3dznw6pdib0yy49d8066c1jvwp2m01xi92amx45dkl8ixc"))
|
"18fqmpyrrxy8phxxm5b7d1qhhvc3rsrs243xiinkj2hn2ca1cqi8"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
@@ -7679,13 +7789,13 @@ is an attempt to combine both into something useful.")
|
|||||||
(list pkg-config
|
(list pkg-config
|
||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
guile-next
|
guile-3.0-latest
|
||||||
guile-lib
|
guile-lib
|
||||||
guile-fibers-next))
|
guile-fibers))
|
||||||
(inputs
|
(inputs
|
||||||
(list guile-next))
|
(list guile-3.0-latest))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list guile-fibers-next))
|
(list guile-fibers))
|
||||||
(home-page "https://cbaines.codeberg.page/guile-knots/")
|
(home-page "https://cbaines.codeberg.page/guile-knots/")
|
||||||
(synopsis "Patterns and functionality to use with Guile Fibers")
|
(synopsis "Patterns and functionality to use with Guile Fibers")
|
||||||
(description
|
(description
|
||||||
@@ -7901,14 +8011,16 @@ This module implements this interface by use of Guile's dynamic FFI.")
|
|||||||
(define-public guile-bstructs
|
(define-public guile-bstructs
|
||||||
(package
|
(package
|
||||||
(name "guile-bstructs")
|
(name "guile-bstructs")
|
||||||
(version "0.1.0")
|
(version "0.2.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (string-append "https://files.dthompson.us/releases"
|
(uri (git-reference
|
||||||
"/guile-bstructs/guile-bstructs-" version ".tar.gz"))
|
(url "https://git.dthompson.us/guile-bstructs.git")
|
||||||
(sha256
|
(commit (string-append "v" version))))
|
||||||
(base32 "0f847aiyzhrlvd2jmckyqrkrvi7i9mg8rmyhbh7fs1vzykcf67wb"))))
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "18dwhcsbcjix61hy32ckjyvgmg1r9smq2krp2m1yc6sinlszh0f2"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs (list autoconf automake guile-3.0 pkg-config texinfo))
|
(native-inputs (list autoconf automake guile-3.0 pkg-config texinfo))
|
||||||
(inputs (list guile-3.0))
|
(inputs (list guile-3.0))
|
||||||
@@ -7979,14 +8091,14 @@ application to open a given file or URL based on given configurations.")
|
|||||||
(define-public guile-goblins
|
(define-public guile-goblins
|
||||||
(package
|
(package
|
||||||
(name "guile-goblins")
|
(name "guile-goblins")
|
||||||
(version "0.17.0")
|
(version "0.18.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://files.spritely.institute/releases"
|
(uri (string-append "https://files.spritely.institute/releases"
|
||||||
"/guile-goblins/guile-goblins-" version ".tar.gz"))
|
"/guile-goblins/guile-goblins-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "16jkmfspsnza2fdk5jr05a5pfh7x856gpg031i21s1yvy43l8mi0"))))
|
(base32 "0gj5018wmq97ln1z7x03a13z3p35xc8762id9bl9fgkxwm01df1a"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
+10
-20
@@ -653,7 +653,10 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its
|
|||||||
(define (guile-variant-package-name prefix)
|
(define (guile-variant-package-name prefix)
|
||||||
(lambda (name)
|
(lambda (name)
|
||||||
"Return NAME with PREFIX instead of \"guile-\", when applicable."
|
"Return NAME with PREFIX instead of \"guile-\", when applicable."
|
||||||
(if (string-prefix? "guile-" name)
|
(if (and (string-prefix? "guile-" name)
|
||||||
|
|
||||||
|
;; Don't rename guile-bootstrap@2.0.
|
||||||
|
(not (string=? "guile-bootstrap" name)))
|
||||||
(string-append prefix "-"
|
(string-append prefix "-"
|
||||||
(string-drop name
|
(string-drop name
|
||||||
(string-length "guile-")))
|
(string-length "guile-")))
|
||||||
@@ -900,8 +903,8 @@ type system, elevating types to first-class status.")
|
|||||||
(define-public guile-git
|
(define-public guile-git
|
||||||
(package
|
(package
|
||||||
(name "guile-git")
|
(name "guile-git")
|
||||||
(version "0.11.0")
|
(version "0.11.1")
|
||||||
(home-page "https://gitlab.com/guile-git/guile-git.git")
|
(home-page "https://codeberg.org/guile-git/guile-git.git")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -910,11 +913,11 @@ type system, elevating types to first-class status.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1yjyil6z4k80pjdps8v6h6lxikwxmjxvrslf2jrmq2rrfnajschz"))))
|
"0xpzchnglddphi3chv53xqaz2x6rpq3l4s023w7r4mmndb6lgz0b"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
|
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
|
||||||
;; https://gitlab.com/guile-git/guile-git/-/issues/20
|
;; https://codeberg.org/guile-git/guile-git/issues/20
|
||||||
,@(if (target-ppc32?)
|
,@(if (target-ppc32?)
|
||||||
`(#:phases
|
`(#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
@@ -922,20 +925,7 @@ type system, elevating types to first-class status.")
|
|||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "Makefile.am"
|
(substitute* "Makefile.am"
|
||||||
((".*tests/blob\\.scm.*") ""))))))
|
((".*tests/blob\\.scm.*") ""))))))
|
||||||
'())
|
'())))
|
||||||
,@(if (system-hurd?)
|
|
||||||
(list
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'skip-tests/hurd
|
|
||||||
(lambda _
|
|
||||||
(substitute* "tests/proxy.scm"
|
|
||||||
(("\\(test-begin.*" all)
|
|
||||||
(string-append
|
|
||||||
all
|
|
||||||
"(when (string-ci= \"GNU\" (vector-ref (uname) 0))\n"
|
|
||||||
" (test-skip 1))\n")))))))
|
|
||||||
'())))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures))
|
(list pkg-config autoconf automake texinfo guile-3.0 guile-bytestructures))
|
||||||
(inputs
|
(inputs
|
||||||
@@ -1004,7 +994,7 @@ Guile's foreign function interface.")
|
|||||||
(file-name (string-append "guile-lzlib-" version ".tar.gz"))
|
(file-name (string-append "guile-lzlib-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7"))
|
"1v1pfqp6hwl0rivs7swhqnfgznxlfnws9ldmn6avnhd10filfa3a"))
|
||||||
(patches (search-patches "guile-lzlib-gcc-14.patch"
|
(patches (search-patches "guile-lzlib-gcc-14.patch"
|
||||||
"guile-lzlib-hurd64.patch"))))
|
"guile-lzlib-hurd64.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|||||||
@@ -914,7 +914,7 @@ regular) Diffie Hellman key exchanges, and many extensions.")
|
|||||||
(list #:extra-directories (list "openssl")
|
(list #:extra-directories (list "openssl")
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
#~(list "--ghc-options=-optc=-Wno-incompatible-pointer-types")))
|
#~(list "--ghc-options=-optc=-Wno-incompatible-pointer-types")))
|
||||||
(inputs (list ghc-network openssl))
|
(inputs (list ghc-network openssl-3.0))
|
||||||
(home-page "https://github.com/haskell-cryptography/HsOpenSSL")
|
(home-page "https://github.com/haskell-cryptography/HsOpenSSL")
|
||||||
(synopsis "Partial OpenSSL binding for Haskell")
|
(synopsis "Partial OpenSSL binding for Haskell")
|
||||||
(description
|
(description
|
||||||
|
|||||||
@@ -489,11 +489,22 @@ lost.
|
|||||||
"0b9d2i22ghyjarwi1c596q5mf7gj1k04k784hnmrd2d4x9hgv9ax"))))
|
"0b9d2i22ghyjarwi1c596q5mf7gj1k04k784hnmrd2d4x9hgv9ax"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:configure-flags #~(list "--with-corosync" "--disable-static"
|
(list #:configure-flags #~(list "--with-corosync"
|
||||||
|
"--disable-static"
|
||||||
|
"--localstatedir=/var"
|
||||||
(string-append "--with-initdir="
|
(string-append "--with-initdir="
|
||||||
#$output "/etc/init.d")
|
#$output "/etc/init.d")
|
||||||
(string-append "--with-ocfdir="
|
(string-append "--with-ocfdir="
|
||||||
#$output "/lib"))))
|
#$output "/lib"))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-before 'configure 'pre-configure
|
||||||
|
(lambda _
|
||||||
|
;; Do not attempt to install /var.
|
||||||
|
(substitute* '("Makefile.am"
|
||||||
|
"daemons/schedulerd/Makefile.am")
|
||||||
|
(("install-exec-local:")
|
||||||
|
"install-exec-local-disabled:")))))))
|
||||||
(native-inputs (list autoconf
|
(native-inputs (list autoconf
|
||||||
automake
|
automake
|
||||||
cmocka
|
cmocka
|
||||||
|
|||||||
@@ -669,7 +669,7 @@ and WebP.")
|
|||||||
(define-public mcomix
|
(define-public mcomix
|
||||||
(package
|
(package
|
||||||
(name "mcomix")
|
(name "mcomix")
|
||||||
(version "3.1.0")
|
(version "3.1.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
@@ -677,7 +677,7 @@ and WebP.")
|
|||||||
"mcomix-" version ".tar.gz"))
|
"mcomix-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"09y4nhlcqvvhz0wscx4zpqxmyhiwh8wrjnhk52awxhzvgyx6wa7r"))))
|
"1y6fps1fbzjc4sdm381432zvrq97iadbz4yyxxsfnzf0ggnsl2m1"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -720,8 +720,14 @@ and WebP.")
|
|||||||
(wrap-program prog
|
(wrap-program prog
|
||||||
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
|
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
|
||||||
(native-inputs (list python-setuptools))
|
(native-inputs (list python-setuptools))
|
||||||
(inputs
|
(inputs (list bash-minimal
|
||||||
(list bash-minimal p7zip python python-pillow python-pygobject python-pycairo gtk+))
|
gobject-introspection
|
||||||
|
gtk+
|
||||||
|
p7zip
|
||||||
|
python
|
||||||
|
python-pillow
|
||||||
|
python-pycairo
|
||||||
|
python-pygobject))
|
||||||
(home-page "https://sourceforge.net/p/mcomix/wiki/Home/")
|
(home-page "https://sourceforge.net/p/mcomix/wiki/Home/")
|
||||||
(synopsis "Image viewer for comics")
|
(synopsis "Image viewer for comics")
|
||||||
(description "MComix is a customizable image viewer that specializes as
|
(description "MComix is a customizable image viewer that specializes as
|
||||||
|
|||||||
@@ -339,30 +339,6 @@ coverage.")
|
|||||||
;; that list in further version.
|
;; that list in further version.
|
||||||
(supported-systems (list "x86_64-linux"))))
|
(supported-systems (list "x86_64-linux"))))
|
||||||
|
|
||||||
(define-public lttng-modules
|
|
||||||
(package
|
|
||||||
(name "lttng-modules")
|
|
||||||
(version "2.13.14")
|
|
||||||
(source (origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append "https://lttng.org/files/lttng-modules/"
|
|
||||||
"lttng-modules-" version ".tar.bz2"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"19jx1yz1hsbr4vwfp2nr6z52a5g50iimaak962k49diay5zryi66"))))
|
|
||||||
(build-system linux-module-build-system)
|
|
||||||
(arguments
|
|
||||||
`(#:tests? #f ; no tests
|
|
||||||
#:make-flags (list "CONFIG_LTTNG=m"
|
|
||||||
"CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m")))
|
|
||||||
(home-page "https://lttng.org/")
|
|
||||||
(synopsis "LTTng kernel modules for the LTTng tracer toolset")
|
|
||||||
(description
|
|
||||||
"LTTng kernel modules are Linux kernel modules which make
|
|
||||||
LTTng kernel tracing possible. They include essential control modules and
|
|
||||||
many probes which instrument numerous interesting parts of Linux.")
|
|
||||||
(license (list license:lgpl2.1 license:gpl2 license:expat))))
|
|
||||||
|
|
||||||
(define-public lttng-ust
|
(define-public lttng-ust
|
||||||
(package
|
(package
|
||||||
(name "lttng-ust")
|
(name "lttng-ust")
|
||||||
|
|||||||
@@ -55,13 +55,12 @@
|
|||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'make-git-checkout-writable
|
(add-after 'unpack 'make-git-checkout-writable
|
||||||
(lambda _
|
(lambda _
|
||||||
(for-each make-file-writable (find-files "."))
|
(for-each make-file-writable (find-files "."))))
|
||||||
#t))
|
|
||||||
(add-before 'build 'remove-binaries
|
(add-before 'build 'remove-binaries
|
||||||
(lambda _
|
(lambda _
|
||||||
(delete-file "lib/org/xerial/snappy/OSInfo.class")
|
(delete-file "lib/org/xerial/snappy/OSInfo.class")
|
||||||
(delete-file-recursively "src/main/resources/org/xerial/snappy/native")
|
(delete-file-recursively
|
||||||
#t))
|
"src/main/resources/org/xerial/snappy/native")))
|
||||||
(add-before 'build 'build-jni
|
(add-before 'build 'build-jni
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Rebuild one of the binaries we removed earlier
|
;; Rebuild one of the binaries we removed earlier
|
||||||
@@ -98,36 +97,33 @@
|
|||||||
(add-after 'build-jni 'copy-jni
|
(add-after 'build-jni 'copy-jni
|
||||||
(lambda _
|
(lambda _
|
||||||
(copy-recursively "src/main/resources/org/xerial/snappy/native"
|
(copy-recursively "src/main/resources/org/xerial/snappy/native"
|
||||||
"build/classes/org/xerial/snappy/native")
|
"build/classes/org/xerial/snappy/native")))
|
||||||
#t))
|
|
||||||
(add-before 'build 'set-test-memory-size
|
(add-before 'build 'set-test-memory-size
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "build.xml"
|
(substitute* "build.xml"
|
||||||
(("<junit printsummary=") "<junit maxmemory=\"2G\" printsummary="))
|
(("<junit printsummary=")
|
||||||
#t))
|
"<junit maxmemory=\"2G\" printsummary="))))
|
||||||
(add-before 'check 'fix-failing
|
(add-before 'check 'fix-failing
|
||||||
(lambda _
|
(lambda _
|
||||||
(with-directory-excursion "src/test/java/org/xerial/snappy"
|
(with-directory-excursion "src/test/java/org/xerial/snappy"
|
||||||
;; This package assumes maven build, which puts results in "target".
|
;; This package assumes maven build, which puts results in
|
||||||
;; We put them in "build" instead, so fix that.
|
;; "target". We put them in "build" instead, so fix that.
|
||||||
(substitute* "SnappyLoaderTest.java"
|
(substitute* "SnappyLoaderTest.java"
|
||||||
(("target/classes") "build/classes"))
|
(("target/classes") "build/classes"))
|
||||||
;; This requires Hadoop, which is not in Guix yet.
|
;; This requires Hadoop, which is not in Guix yet.
|
||||||
(delete-file "SnappyHadoopCompatibleOutputStreamTest.java"))
|
(delete-file "SnappyHadoopCompatibleOutputStreamTest.java")))))))
|
||||||
#t)))))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("osgi-framework" ,java-osgi-framework)))
|
(list java-osgi-framework))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("bitshuffle" ,bitshuffle-for-snappy)
|
(list bitshuffle-for-snappy snappy))
|
||||||
("snappy" ,snappy)))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("junit" ,java-junit)
|
(list java-junit
|
||||||
("hamcrest" ,java-hamcrest-core)
|
java-hamcrest-core
|
||||||
("xerial-core" ,java-xerial-core)
|
java-xerial-core
|
||||||
("classworlds" ,java-plexus-classworlds)
|
java-plexus-classworlds
|
||||||
("commons-lang" ,java-commons-lang)
|
java-commons-lang
|
||||||
("commons-io" ,java-commons-io)
|
java-commons-io
|
||||||
("perl" ,perl)))
|
perl))
|
||||||
(home-page "https://github.com/xerial/snappy-java")
|
(home-page "https://github.com/xerial/snappy-java")
|
||||||
(synopsis "Compression/decompression algorithm in Java")
|
(synopsis "Compression/decompression algorithm in Java")
|
||||||
(description "Snappy-java is a Java port of snappy, a fast C++
|
(description "Snappy-java is a Java port of snappy, a fast C++
|
||||||
@@ -156,13 +152,13 @@ compressor/decompressor.")
|
|||||||
(add-before 'build 'remove-binaries
|
(add-before 'build 'remove-binaries
|
||||||
(lambda _
|
(lambda _
|
||||||
(delete-file "lib/org/xerial/snappy/OSInfo.class")
|
(delete-file "lib/org/xerial/snappy/OSInfo.class")
|
||||||
(delete-file-recursively "src/main/resources/org/xerial/snappy/native")
|
(delete-file-recursively
|
||||||
#t))
|
"src/main/resources/org/xerial/snappy/native")))
|
||||||
(add-before 'build 'build-jni
|
(add-before 'build 'build-jni
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Rebuild one of the binaries we removed earlier
|
;; Rebuild one of the binaries we removed earlier
|
||||||
(invoke "javac" "src/main/java/org/xerial/snappy/OSInfo.java"
|
(invoke "javac" "src/main/java/org/xerial/snappy/OSInfo.java"
|
||||||
"-d" "lib")
|
"-d" "lib")
|
||||||
;; Link to the dynamic snappy, not the static ones
|
;; Link to the dynamic snappy, not the static ones
|
||||||
(substitute* "Makefile.common"
|
(substitute* "Makefile.common"
|
||||||
(("-shared") "-shared -lsnappy"))
|
(("-shared") "-shared -lsnappy"))
|
||||||
@@ -184,16 +180,14 @@ compressor/decompressor.")
|
|||||||
(add-after 'build-jni 'copy-jni
|
(add-after 'build-jni 'copy-jni
|
||||||
(lambda _
|
(lambda _
|
||||||
(copy-recursively "src/main/resources/org/xerial/snappy/native"
|
(copy-recursively "src/main/resources/org/xerial/snappy/native"
|
||||||
"build/classes/org/xerial/snappy/native")
|
"build/classes/org/xerial/snappy/native")))
|
||||||
#t))
|
|
||||||
(add-before 'check 'fix-tests
|
(add-before 'check 'fix-tests
|
||||||
(lambda _
|
(lambda _
|
||||||
(mkdir-p "src/test/resources/org/xerial/snappy/")
|
(mkdir-p "src/test/resources/org/xerial/snappy/")
|
||||||
(copy-recursively "src/test/java/org/xerial/snappy/testdata"
|
(copy-recursively "src/test/java/org/xerial/snappy/testdata"
|
||||||
"src/test/resources/org/xerial/snappy/testdata")
|
"src/test/resources/org/xerial/snappy/testdata")
|
||||||
(install-file "src/test/java/org/xerial/snappy/alice29.txt"
|
(install-file "src/test/java/org/xerial/snappy/alice29.txt"
|
||||||
"src/test/resources/org/xerial/snappy/")
|
"src/test/resources/org/xerial/snappy/"))))))))
|
||||||
#t)))))))
|
|
||||||
|
|
||||||
(define-public java-iq80-snappy
|
(define-public java-iq80-snappy
|
||||||
(package
|
(package
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
;;; Copyright © 2024, 2025 Nicolas Graves <ngraves@ngraves.fr>
|
;;; Copyright © 2024, 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||||
;;; Copyright © 2024-2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
;;; Copyright © 2024-2025 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||||
;;; Copyright © 2025 Ghislain Vaillant <ghislain.vaillant@inria.fr>
|
;;; Copyright © 2025 Ghislain Vaillant <ghislain.vaillant@inria.fr>
|
||||||
|
;;; Copyright © 2026 Vinicius Monego <monego@posteo.net>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -52,7 +53,9 @@
|
|||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages cpp)
|
#:use-module (gnu packages cpp)
|
||||||
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages docker)
|
#:use-module (gnu packages docker)
|
||||||
|
#:use-module (gnu packages freedesktop)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages monitoring)
|
#:use-module (gnu packages monitoring)
|
||||||
#:use-module (gnu packages networking)
|
#:use-module (gnu packages networking)
|
||||||
@@ -1710,13 +1713,13 @@ analyzing Jupyter Notebooks.")
|
|||||||
(define-public python-qtconsole
|
(define-public python-qtconsole
|
||||||
(package
|
(package
|
||||||
(name "python-qtconsole")
|
(name "python-qtconsole")
|
||||||
(version "5.7.0")
|
(version "5.7.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (pypi-uri "qtconsole" version))
|
(uri (pypi-uri "qtconsole" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0w9i0s70dm39cxgn3vh4wcaxdywzp9j0ac7f49q4qmggx4f3fcqd"))))
|
(base32 "088m56fav6xlcw55srxz96yf7rj2ndmycy4f3m69498r2swqbd17"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -1764,6 +1767,67 @@ analyzing Jupyter Notebooks.")
|
|||||||
rich media output.")
|
rich media output.")
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
|
(define-public python-spyder-kernels
|
||||||
|
(package
|
||||||
|
(name "python-spyder-kernels")
|
||||||
|
(version "3.1.4")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/spyder-ide/spyder-kernels")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0yhrifh148g93qkwx9ggsh2kr9789apzlw91ais4dyas5yf1xj8w"))))
|
||||||
|
(build-system pyproject-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:test-flags
|
||||||
|
#~(list "-k" (string-append
|
||||||
|
;; Avoid pulling Django for a single test.
|
||||||
|
"not test_django_settings"
|
||||||
|
;; AssertionError.
|
||||||
|
" and not test_umr_reload_modules"))
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-before 'check 'redirect-HOME
|
||||||
|
(lambda _
|
||||||
|
(setenv "HOME" "/tmp"))))))
|
||||||
|
(propagated-inputs (list python-cloudpickle
|
||||||
|
python-ipykernel
|
||||||
|
python-ipython
|
||||||
|
python-jupyter-client
|
||||||
|
python-packaging
|
||||||
|
python-pyxdg
|
||||||
|
python-pyzmq
|
||||||
|
python-traitlets
|
||||||
|
python-wurlitzer))
|
||||||
|
(native-inputs (list python-anyio
|
||||||
|
python-cython
|
||||||
|
python-dask
|
||||||
|
python-h5py
|
||||||
|
python-matplotlib
|
||||||
|
python-numpy
|
||||||
|
python-pandas
|
||||||
|
python-pillow
|
||||||
|
python-polars
|
||||||
|
python-pyarrow
|
||||||
|
python-pydicom
|
||||||
|
python-pytest
|
||||||
|
python-scipy
|
||||||
|
python-setuptools
|
||||||
|
python-xarray))
|
||||||
|
(home-page "https://github.com/spyder-ide/spyder-kernels")
|
||||||
|
(synopsis "Jupyter kernels for Spyder's console")
|
||||||
|
(description "This package provides Jupyter kernels for use with the
|
||||||
|
consoles of Spyder, the Scientific Python Development Environment.
|
||||||
|
|
||||||
|
These kernels can be launched either through Spyder itself or in an
|
||||||
|
independent Python session, and allow for interactive or file-based execution
|
||||||
|
of Python code inside Spyder.")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public python-voila
|
(define-public python-voila
|
||||||
(package
|
(package
|
||||||
(name "python-voila")
|
(name "python-voila")
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages boost)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages crypto)
|
#:use-module (gnu packages crypto)
|
||||||
@@ -189,16 +190,17 @@ framework. It builds XMPP clients complying with the XMPP Compliance Suites
|
|||||||
(package
|
(package
|
||||||
(name "kaidan")
|
(name "kaidan")
|
||||||
(version "0.15.0")
|
(version "0.15.0")
|
||||||
(source (origin
|
(source
|
||||||
(method url-fetch)
|
(origin
|
||||||
(uri (string-append "mirror://kde/unstable/kaidan/" version
|
(method url-fetch)
|
||||||
"/kaidan-" version ".tar.xz"))
|
(uri (string-append "mirror://kde/unstable/kaidan/" version
|
||||||
(modules '((guix build utils)))
|
"/kaidan-" version ".tar.xz"))
|
||||||
(snippet
|
(modules '((guix build utils)))
|
||||||
#~(begin
|
(snippet
|
||||||
(delete-file-recursively "3rdparty")))
|
#~(begin
|
||||||
(sha256
|
(delete-file-recursively "3rdparty")))
|
||||||
(base32 "11g4lifji6gh9zmpgyx4dnmxyzzwkhhj84j2w9r4bvgqm2pxdhnd"))))
|
(sha256
|
||||||
|
(base32 "11g4lifji6gh9zmpgyx4dnmxyzzwkhhj84j2w9r4bvgqm2pxdhnd"))))
|
||||||
(build-system qt-build-system)
|
(build-system qt-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -209,10 +211,18 @@ framework. It builds XMPP clients complying with the XMPP Compliance Suites
|
|||||||
(add-before 'check 'set-home
|
(add-before 'check 'set-home
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Tests need write permission in $HOME.
|
;; Tests need write permission in $HOME.
|
||||||
(setenv "HOME" "/tmp"))))))
|
(setenv "HOME" "/tmp")))
|
||||||
|
(add-after 'install 'wrap-program
|
||||||
|
(lambda _
|
||||||
|
(let ((gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
|
||||||
|
(wrap-program (string-append #$output "/bin/kaidan")
|
||||||
|
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix
|
||||||
|
(,gst-plugin-path)))))))))
|
||||||
(native-inputs (list extra-cmake-modules
|
(native-inputs (list extra-cmake-modules
|
||||||
pkg-config))
|
pkg-config))
|
||||||
(inputs (list gstreamer
|
(inputs (list bash-minimal
|
||||||
|
gst-plugins-good-qt
|
||||||
|
gstreamer
|
||||||
icu4c
|
icu4c
|
||||||
kcrash
|
kcrash
|
||||||
kdsingleapplication
|
kdsingleapplication
|
||||||
|
|||||||
@@ -1191,37 +1191,42 @@ CDs.")
|
|||||||
(define-public plasmatube
|
(define-public plasmatube
|
||||||
(package
|
(package
|
||||||
(name "plasmatube")
|
(name "plasmatube")
|
||||||
(version "25.12.2")
|
(version "26.04.0")
|
||||||
(source (origin
|
(source
|
||||||
(method url-fetch)
|
(origin
|
||||||
(uri (string-append "mirror://kde/stable/release-service/" version
|
(method url-fetch)
|
||||||
"/src/plasmatube-" version ".tar.xz"))
|
(uri (string-append "mirror://kde/stable/release-service/" version
|
||||||
(sha256
|
"/src/plasmatube-" version ".tar.xz"))
|
||||||
(base32
|
(sha256
|
||||||
"1jc6iqcxz0zyai26vx80nyfr818r4cj8lpw0b1pbvb1vya12v8zy"))))
|
(base32 "0dby9wypbrhg6g03kvl8fc40zpnri03hf3kk3vi1z16pwc7sn093"))))
|
||||||
(build-system qt-build-system)
|
(build-system qt-build-system)
|
||||||
(native-inputs (list extra-cmake-modules pkg-config python-minimal))
|
(native-inputs (list extra-cmake-modules pkg-config python-minimal))
|
||||||
(inputs
|
(inputs
|
||||||
(list kconfig
|
(list kconfig
|
||||||
kcoreaddons
|
kcoreaddons
|
||||||
kdbusaddons
|
kdbusaddons
|
||||||
|
kdeclarative ; for org.kde.kquickcontrolsaddons
|
||||||
|
ki18n
|
||||||
kirigami
|
kirigami
|
||||||
kirigami-addons
|
kirigami-addons
|
||||||
ki18n
|
kitemmodels
|
||||||
kwindowsystem
|
kwindowsystem
|
||||||
mpvqt
|
mpvqt
|
||||||
purpose
|
purpose
|
||||||
|
qqc2-desktop-style ; for org.kde.desktop
|
||||||
qtdeclarative
|
qtdeclarative
|
||||||
|
qtkeychain-qt6
|
||||||
qtmultimedia
|
qtmultimedia
|
||||||
qtsvg
|
qtsvg
|
||||||
qtkeychain-qt6
|
|
||||||
qtwayland
|
qtwayland
|
||||||
|
sonnet
|
||||||
yt-dlp))
|
yt-dlp))
|
||||||
(arguments (list #:qtbase qtbase))
|
(arguments (list #:qtbase qtbase))
|
||||||
(home-page "https://apps.kde.org/plasmatube/")
|
(home-page "https://apps.kde.org/plasmatube/")
|
||||||
(synopsis "Kirigami YouTube video player")
|
(synopsis "YouTube and PeerTube video player")
|
||||||
(description "This package provides YouTube video player based
|
(description
|
||||||
on QtMultimedia and @command{yt-dlp}.")
|
"Plasmatube is a YouTube video player that uses Invidious and Piped
|
||||||
|
APIs. It can also play videos from PeerTube sources.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public rattlesnake
|
(define-public rattlesnake
|
||||||
|
|||||||
@@ -1853,6 +1853,9 @@ for xdg-desktop-portal that is using Qt/KF5.")
|
|||||||
breeze-icons ;default mouse icon
|
breeze-icons ;default mouse icon
|
||||||
colord
|
colord
|
||||||
discover
|
discover
|
||||||
|
ffmpegthumbs
|
||||||
|
flatpak ;for discover
|
||||||
|
flatpak-kcm ;to manage flatpak app permissions
|
||||||
kactivitymanagerd
|
kactivitymanagerd
|
||||||
kdeclarative ;required by sddm breeze theme
|
kdeclarative ;required by sddm breeze theme
|
||||||
kde-cli-tools
|
kde-cli-tools
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
#:use-module (gnu packages libusb)
|
#:use-module (gnu packages libusb)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
|
#:use-module (gnu packages python-build)
|
||||||
#:use-module (gnu packages swig)
|
#:use-module (gnu packages swig)
|
||||||
#:use-module (gnu packages textutils))
|
#:use-module (gnu packages textutils))
|
||||||
|
|
||||||
@@ -95,7 +96,7 @@
|
|||||||
"/html"))))))
|
"/html"))))))
|
||||||
#:tests? #f)) ; tests fail without access to USB
|
#:tests? #f)) ; tests fail without access to USB
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list doxygen graphviz pkg-config python swig-4.0))
|
(list doxygen graphviz pkg-config python python-setuptools swig))
|
||||||
(inputs
|
(inputs
|
||||||
(list boost libconfuse))
|
(list boost libconfuse))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
|
|||||||
+14
-13
@@ -125,14 +125,14 @@
|
|||||||
;; ex:
|
;; ex:
|
||||||
;; tar xf /gnu/store/...-firefox-123.4.source.tar.xz -O \
|
;; tar xf /gnu/store/...-firefox-123.4.source.tar.xz -O \
|
||||||
;; firefox-123.4/browser/locales/l10n-changesets.json | grep revision
|
;; firefox-123.4/browser/locales/l10n-changesets.json | grep revision
|
||||||
(let ((commit "d1394212aed0ce0063c0f818aa236e7d4f955ac9"))
|
(let ((commit "fefe280d909d0eee8d60edd2a6db7d969df56c5b"))
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/mozilla-l10n/firefox-l10n.git")
|
(url "https://github.com/mozilla-l10n/firefox-l10n.git")
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name "firefox-l10n" commit))
|
(file-name (git-file-name "firefox-l10n" commit))
|
||||||
(sha256 (base32 "16s515xf0i7a7acv0m1bbgflbdx9a87b1dcg7q3yswym8x1bhvaj")))))
|
(sha256 (base32 "0z1ksvspbn4bbzxdl2w4x7bg36j4rwhaby8g37apg4393frh558i")))))
|
||||||
|
|
||||||
(define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n)
|
(define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n)
|
||||||
(let* ((ff-src (firefox-source-origin
|
(let* ((ff-src (firefox-source-origin
|
||||||
@@ -205,7 +205,8 @@
|
|||||||
(search-patches
|
(search-patches
|
||||||
"librewolf-compare-paths.patch"
|
"librewolf-compare-paths.patch"
|
||||||
"librewolf-use-system-wide-dir.patch"
|
"librewolf-use-system-wide-dir.patch"
|
||||||
"librewolf-add-store-to-rdd-allowlist.patch"))
|
"librewolf-add-store-to-rdd-allowlist.patch"
|
||||||
|
"librewolf-150.0-encoding_rs-rust-fix.patch"))
|
||||||
;; Slim down the tarball by removing unbundled libraries and 75 Mo (800+
|
;; Slim down the tarball by removing unbundled libraries and 75 Mo (800+
|
||||||
;; Mo uncompressed) of unused tests.
|
;; Mo uncompressed) of unused tests.
|
||||||
;; TODO: Unbundle security/nss and media/libpng.
|
;; TODO: Unbundle security/nss and media/libpng.
|
||||||
@@ -244,17 +245,17 @@
|
|||||||
;; It's used for cache validation and therefore can lead to strange bugs.
|
;; It's used for cache validation and therefore can lead to strange bugs.
|
||||||
;; ex: date '+%Y%m%d%H%M%S'
|
;; ex: date '+%Y%m%d%H%M%S'
|
||||||
;; or: (format-time-string "%Y%m%d%H%M%S")
|
;; or: (format-time-string "%Y%m%d%H%M%S")
|
||||||
(define %librewolf-build-id "20260326135749")
|
(define %librewolf-build-id "20260421153818")
|
||||||
|
|
||||||
(define-public librewolf
|
(define-public librewolf
|
||||||
(package
|
(package
|
||||||
(name "librewolf")
|
(name "librewolf")
|
||||||
(version "149.0-1")
|
(version "150.0-1")
|
||||||
(source
|
(source
|
||||||
(make-librewolf-source
|
(make-librewolf-source
|
||||||
#:version version
|
#:version version
|
||||||
#:firefox-hash "12jb930qhqhpzjpn5smms7g4n6y40zvxcrg8w42696wxk7pgsqdq"
|
#:firefox-hash "151rxzl80dm8jsxl6fwzgbirwq4zpms5adwwnbjcwdd1r3s3vr7v"
|
||||||
#:librewolf-hash "0igv0fr0vl2nf5rlgnidfz2a3gh55bsqwcray0jg7x2kl6qnkzwm"
|
#:librewolf-hash "0iw9v3zc1fxc93yyhldqarxaypgmbndh2ylsy330kcbpb6p1gnmr"
|
||||||
#:l10n firefox-l10n))
|
#:l10n firefox-l10n))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
@@ -352,18 +353,18 @@
|
|||||||
(cdr pref)))
|
(cdr pref)))
|
||||||
`(("extensions.getAddons.search.browseURL"
|
`(("extensions.getAddons.search.browseURL"
|
||||||
,(string-append
|
,(string-append
|
||||||
"https://gnuzilla.gnu.org/mozzarella/"
|
"https://gnuzilla.gnu.org/"
|
||||||
"search.php?q=%TERMS%"))
|
"search.php?q=%TERMS%"))
|
||||||
("extensions.getAddons.get.url" .
|
("extensions.getAddons.get.url" .
|
||||||
"https://gnuzilla.gnu.org/mozzarella")
|
"https://gnuzilla.gnu.org")
|
||||||
("extensions.getAddons.link.url" .
|
("extensions.getAddons.link.url" .
|
||||||
"https://gnuzilla.gnu.org/mozzarella")
|
"https://gnuzilla.gnu.org")
|
||||||
("extensions.getAddons.discovery.api_url" .
|
("extensions.getAddons.discovery.api_url" .
|
||||||
"https://gnuzilla.gnu.org/mozzarella")
|
"https://gnuzilla.gnu.org")
|
||||||
("extensions.getAddons.langpacks.url" .
|
("extensions.getAddons.langpacks.url" .
|
||||||
"https://gnuzilla.gnu.org/mozzarella")
|
"https://gnuzilla.gnu.org")
|
||||||
("lightweightThemes.getMoreURL" .
|
("lightweightThemes.getMoreURL" .
|
||||||
"https://gnuzilla.gnu.org/mozzarella")))))))
|
"https://gnuzilla.gnu.org")))))))
|
||||||
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
||||||
(lambda _
|
(lambda _
|
||||||
(use-modules (guix build cargo-utils))
|
(use-modules (guix build cargo-utils))
|
||||||
|
|||||||
+76
-277
@@ -104,9 +104,7 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages linux)
|
(define-module (gnu packages linux)
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (gnu packages acl)
|
#:use-module (gnu packages acl)
|
||||||
#:use-module (gnu packages adns)
|
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
#:use-module (gnu packages algebra)
|
#:use-module (gnu packages algebra)
|
||||||
#:use-module (gnu packages apparmor)
|
#:use-module (gnu packages apparmor)
|
||||||
@@ -120,19 +118,20 @@
|
|||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages boost)
|
||||||
#:use-module (gnu packages calendar)
|
#:use-module (gnu packages calendar)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages cpio)
|
#:use-module (gnu packages cpio)
|
||||||
#:use-module (gnu packages cpp)
|
#:use-module (gnu packages cpp)
|
||||||
#:use-module (gnu packages crypto)
|
#:use-module (gnu packages crypto)
|
||||||
#:use-module (gnu packages cryptsetup)
|
#:use-module (gnu packages cryptsetup)
|
||||||
#:use-module (gnu packages compression)
|
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages curl)
|
||||||
#:use-module (gnu packages databases)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages datastructures)
|
#:use-module (gnu packages datastructures)
|
||||||
#:use-module (gnu packages dbm)
|
#:use-module (gnu packages dbm)
|
||||||
#:use-module (gnu packages disk)
|
#:use-module (gnu packages disk)
|
||||||
|
#:use-module (gnu packages dlang)
|
||||||
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages docbook)
|
#:use-module (gnu packages docbook)
|
||||||
#:use-module (gnu packages documentation)
|
#:use-module (gnu packages documentation)
|
||||||
#:use-module (gnu packages dlang)
|
|
||||||
#:use-module (gnu packages elf)
|
#:use-module (gnu packages elf)
|
||||||
#:use-module (gnu packages file)
|
#:use-module (gnu packages file)
|
||||||
#:use-module (gnu packages flex)
|
#:use-module (gnu packages flex)
|
||||||
@@ -147,6 +146,7 @@
|
|||||||
#:use-module (gnu packages golang)
|
#:use-module (gnu packages golang)
|
||||||
#:use-module (gnu packages gperf)
|
#:use-module (gnu packages gperf)
|
||||||
#:use-module (gnu packages graphviz)
|
#:use-module (gnu packages graphviz)
|
||||||
|
#:use-module (gnu packages groff)
|
||||||
#:use-module (gnu packages gstreamer)
|
#:use-module (gnu packages gstreamer)
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages guile)
|
#:use-module (gnu packages guile)
|
||||||
@@ -154,8 +154,8 @@
|
|||||||
#:use-module (gnu packages haskell-xyz)
|
#:use-module (gnu packages haskell-xyz)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages kde-frameworks)
|
#:use-module (gnu packages kde-frameworks)
|
||||||
#:use-module (gnu packages libedit)
|
|
||||||
#:use-module (gnu packages kde-graphics)
|
#:use-module (gnu packages kde-graphics)
|
||||||
|
#:use-module (gnu packages libedit)
|
||||||
#:use-module (gnu packages libevent)
|
#:use-module (gnu packages libevent)
|
||||||
#:use-module (gnu packages libunwind)
|
#:use-module (gnu packages libunwind)
|
||||||
#:use-module (gnu packages libusb)
|
#:use-module (gnu packages libusb)
|
||||||
@@ -172,8 +172,8 @@
|
|||||||
#:use-module (gnu packages nss)
|
#:use-module (gnu packages nss)
|
||||||
#:use-module (gnu packages onc-rpc)
|
#:use-module (gnu packages onc-rpc)
|
||||||
#:use-module (gnu packages oneapi)
|
#:use-module (gnu packages oneapi)
|
||||||
#:use-module (gnu packages perl)
|
|
||||||
#:use-module (gnu packages pciutils)
|
#:use-module (gnu packages pciutils)
|
||||||
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages polkit)
|
#:use-module (gnu packages polkit)
|
||||||
#:use-module (gnu packages popt)
|
#:use-module (gnu packages popt)
|
||||||
@@ -192,9 +192,12 @@
|
|||||||
#:use-module (gnu packages rust-sources)
|
#:use-module (gnu packages rust-sources)
|
||||||
#:use-module (gnu packages samba)
|
#:use-module (gnu packages samba)
|
||||||
#:use-module (gnu packages sdl)
|
#:use-module (gnu packages sdl)
|
||||||
|
#:use-module (gnu packages selinux)
|
||||||
#:use-module (gnu packages serialization)
|
#:use-module (gnu packages serialization)
|
||||||
#:use-module (gnu packages slang)
|
#:use-module (gnu packages slang)
|
||||||
|
#:use-module (gnu packages sphinx)
|
||||||
#:use-module (gnu packages sqlite)
|
#:use-module (gnu packages sqlite)
|
||||||
|
#:use-module (gnu packages swig)
|
||||||
#:use-module (gnu packages texinfo)
|
#:use-module (gnu packages texinfo)
|
||||||
#:use-module (gnu packages textutils)
|
#:use-module (gnu packages textutils)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
@@ -203,39 +206,36 @@
|
|||||||
#:use-module (gnu packages vim)
|
#:use-module (gnu packages vim)
|
||||||
#:use-module (gnu packages vulkan)
|
#:use-module (gnu packages vulkan)
|
||||||
#:use-module (gnu packages web)
|
#:use-module (gnu packages web)
|
||||||
|
#:use-module (gnu packages xdisorg)
|
||||||
#:use-module (gnu packages xiph)
|
#:use-module (gnu packages xiph)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xdisorg)
|
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module (gnu packages groff)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages selinux)
|
|
||||||
#:use-module (gnu packages sphinx)
|
|
||||||
#:use-module (gnu packages swig)
|
|
||||||
#:use-module (guix platform)
|
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix build-system copy)
|
#:use-module (guix build-system copy)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system go)
|
#:use-module (guix build-system go)
|
||||||
|
#:use-module (guix build-system linux-module)
|
||||||
#:use-module (guix build-system meson)
|
#:use-module (guix build-system meson)
|
||||||
#:use-module (guix build-system pyproject)
|
#:use-module (guix build-system pyproject)
|
||||||
#:use-module (guix build-system python)
|
#:use-module (guix build-system python)
|
||||||
#:use-module (guix build-system qt)
|
#:use-module (guix build-system qt)
|
||||||
#:use-module (guix build-system trivial)
|
#:use-module (guix build-system trivial)
|
||||||
#:use-module (guix build-system linux-module)
|
#:use-module (guix deprecation) ;for libcap/next
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix gexp)
|
|
||||||
#:use-module (guix store)
|
|
||||||
#:use-module (guix monads)
|
#:use-module (guix monads)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix platform)
|
||||||
|
#:use-module (guix store)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (guix deprecation) ;for libcap/next
|
#:use-module (ice-9 match)
|
||||||
|
#:use-module (ice-9 regex)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (srfi srfi-2)
|
#:use-module (srfi srfi-2)
|
||||||
#:use-module (srfi srfi-26)
|
#:use-module (srfi srfi-26)
|
||||||
#:use-module (ice-9 match)
|
|
||||||
#:use-module (ice-9 regex)
|
|
||||||
#:export (customize-linux
|
#:export (customize-linux
|
||||||
make-defconfig))
|
make-defconfig))
|
||||||
|
|
||||||
@@ -531,7 +531,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||||||
;; The current "stable" kernels. That is, the most recently released major
|
;; The current "stable" kernels. That is, the most recently released major
|
||||||
;; versions that are still supported upstream.
|
;; versions that are still supported upstream.
|
||||||
|
|
||||||
(define-public linux-libre-6.19-version "6.19.11")
|
(define-public linux-libre-6.19-version "6.19.12")
|
||||||
(define-public linux-libre-6.19-gnu-revision "gnu")
|
(define-public linux-libre-6.19-gnu-revision "gnu")
|
||||||
(define deblob-scripts-6.19
|
(define deblob-scripts-6.19
|
||||||
(linux-libre-deblob-scripts
|
(linux-libre-deblob-scripts
|
||||||
@@ -541,12 +541,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||||||
(base32 "05jpciyypvmy6byaxjl49b1fvzxcnlhknf0xabrdj5152iznrzkh")))
|
(base32 "05jpciyypvmy6byaxjl49b1fvzxcnlhknf0xabrdj5152iznrzkh")))
|
||||||
(define-public linux-libre-6.19-pristine-source
|
(define-public linux-libre-6.19-pristine-source
|
||||||
(let ((version linux-libre-6.19-version)
|
(let ((version linux-libre-6.19-version)
|
||||||
(hash (base32 "16ymkc5r3hw05z7l7ih3qw406qlszz1l7b4g5yz0hv15ddxrs0r0")))
|
(hash (base32 "1md8b270pdyk9d8cq0qyr8qmymcijmj3gc39nn394wpr0l94yp6f")))
|
||||||
(make-linux-libre-source version
|
(make-linux-libre-source version
|
||||||
(%upstream-linux-source version hash)
|
(%upstream-linux-source version hash)
|
||||||
deblob-scripts-6.19)))
|
deblob-scripts-6.19)))
|
||||||
|
|
||||||
(define-public linux-libre-6.18-version "6.18.21")
|
(define-public linux-libre-6.18-version "6.18.22")
|
||||||
(define-public linux-libre-6.18-gnu-revision "gnu")
|
(define-public linux-libre-6.18-gnu-revision "gnu")
|
||||||
(define deblob-scripts-6.18
|
(define deblob-scripts-6.18
|
||||||
(linux-libre-deblob-scripts
|
(linux-libre-deblob-scripts
|
||||||
@@ -556,7 +556,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||||||
(base32 "0qlih8w8wg4v5cwbmd34rbhb6mjgbx69i9rx3s2vxw7h42q9l0ai")))
|
(base32 "0qlih8w8wg4v5cwbmd34rbhb6mjgbx69i9rx3s2vxw7h42q9l0ai")))
|
||||||
(define-public linux-libre-6.18-pristine-source
|
(define-public linux-libre-6.18-pristine-source
|
||||||
(let ((version linux-libre-6.18-version)
|
(let ((version linux-libre-6.18-version)
|
||||||
(hash (base32 "0ks735y6jq4yy3jaicjsj4dn4n3kk2skf9dqh9dyifipn57j2f0w")))
|
(hash (base32 "0nazlm6j5blyd4qgl0z6xc3qk00vz3cfvx5mqv18awv5ygx94g52")))
|
||||||
(make-linux-libre-source version
|
(make-linux-libre-source version
|
||||||
(%upstream-linux-source version hash)
|
(%upstream-linux-source version hash)
|
||||||
deblob-scripts-6.18)))
|
deblob-scripts-6.18)))
|
||||||
@@ -565,7 +565,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||||||
;; Here are the support timelines:
|
;; Here are the support timelines:
|
||||||
;; <https://www.kernel.org/category/releases.html>
|
;; <https://www.kernel.org/category/releases.html>
|
||||||
|
|
||||||
(define-public linux-libre-6.12-version "6.12.80")
|
(define-public linux-libre-6.12-version "6.12.81")
|
||||||
(define-public linux-libre-6.12-gnu-revision "gnu")
|
(define-public linux-libre-6.12-gnu-revision "gnu")
|
||||||
(define deblob-scripts-6.12
|
(define deblob-scripts-6.12
|
||||||
(linux-libre-deblob-scripts
|
(linux-libre-deblob-scripts
|
||||||
@@ -575,12 +575,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||||||
(base32 "1x48hpmvajz7v5wn1vdd7l5r14mq4ngzh5npz3pj81z4f1g61i0a")))
|
(base32 "1x48hpmvajz7v5wn1vdd7l5r14mq4ngzh5npz3pj81z4f1g61i0a")))
|
||||||
(define-public linux-libre-6.12-pristine-source
|
(define-public linux-libre-6.12-pristine-source
|
||||||
(let ((version linux-libre-6.12-version)
|
(let ((version linux-libre-6.12-version)
|
||||||
(hash (base32 "0lrylj87bb8ky29pbplpncrfhmgqqbq3d49iqgdwv7p7jvc929f9")))
|
(hash (base32 "0iw84bqdbh9dlaqd1bqgldg50riw2b5is7ipqnbp0sll8cv9rc62")))
|
||||||
(make-linux-libre-source version
|
(make-linux-libre-source version
|
||||||
(%upstream-linux-source version hash)
|
(%upstream-linux-source version hash)
|
||||||
deblob-scripts-6.12)))
|
deblob-scripts-6.12)))
|
||||||
|
|
||||||
(define-public linux-libre-6.6-version "6.6.130")
|
(define-public linux-libre-6.6-version "6.6.134")
|
||||||
(define-public linux-libre-6.6-gnu-revision "gnu")
|
(define-public linux-libre-6.6-gnu-revision "gnu")
|
||||||
(define deblob-scripts-6.6
|
(define deblob-scripts-6.6
|
||||||
(linux-libre-deblob-scripts
|
(linux-libre-deblob-scripts
|
||||||
@@ -590,12 +590,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||||||
(base32 "0xp9b2vkrb0g0rn4i33b59rhp4sgh1dbwzk28vwz7kwac6l5rcpi")))
|
(base32 "0xp9b2vkrb0g0rn4i33b59rhp4sgh1dbwzk28vwz7kwac6l5rcpi")))
|
||||||
(define-public linux-libre-6.6-pristine-source
|
(define-public linux-libre-6.6-pristine-source
|
||||||
(let ((version linux-libre-6.6-version)
|
(let ((version linux-libre-6.6-version)
|
||||||
(hash (base32 "139480lyi3if8pd2j3yld5a01lk7113kbcn2kxpzyk29p5kslq14")))
|
(hash (base32 "1grp1wqgzjsk6xyl0nvd2hxlxjj0wgz04x544zkz8srp6rxnjy33")))
|
||||||
(make-linux-libre-source version
|
(make-linux-libre-source version
|
||||||
(%upstream-linux-source version hash)
|
(%upstream-linux-source version hash)
|
||||||
deblob-scripts-6.6)))
|
deblob-scripts-6.6)))
|
||||||
|
|
||||||
(define-public linux-libre-6.1-version "6.1.167")
|
(define-public linux-libre-6.1-version "6.1.168")
|
||||||
(define-public linux-libre-6.1-gnu-revision "gnu")
|
(define-public linux-libre-6.1-gnu-revision "gnu")
|
||||||
(define deblob-scripts-6.1
|
(define deblob-scripts-6.1
|
||||||
(linux-libre-deblob-scripts
|
(linux-libre-deblob-scripts
|
||||||
@@ -605,7 +605,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
|
|||||||
(base32 "1w5pfws6l39dpc3lzazs1n6r4m96f6rdf6vb2scy5fhmrd933ldc")))
|
(base32 "1w5pfws6l39dpc3lzazs1n6r4m96f6rdf6vb2scy5fhmrd933ldc")))
|
||||||
(define-public linux-libre-6.1-pristine-source
|
(define-public linux-libre-6.1-pristine-source
|
||||||
(let ((version linux-libre-6.1-version)
|
(let ((version linux-libre-6.1-version)
|
||||||
(hash (base32 "1jwqwp2fg3wdsh9w663rbnbv1rvsvksv1pj4bzns8swp0wy0a618")))
|
(hash (base32 "0vkp75sfnjvfqxjh6gqcx24h2m6qj6xkwlw6b118cja43vjnz1g0")))
|
||||||
(make-linux-libre-source version
|
(make-linux-libre-source version
|
||||||
(%upstream-linux-source version hash)
|
(%upstream-linux-source version hash)
|
||||||
deblob-scripts-6.1)))
|
deblob-scripts-6.1)))
|
||||||
@@ -945,7 +945,11 @@ ARCH and optionally VARIANT, or #f if there is no such configuration."
|
|||||||
;; Disable the EFI pstore storage backend to avoid causing
|
;; Disable the EFI pstore storage backend to avoid causing
|
||||||
;; unrecoverable failures on some EFI systems:
|
;; unrecoverable failures on some EFI systems:
|
||||||
;; https://lists.gnu.org/archive/html/help-guix/2025-01/msg00173.html
|
;; https://lists.gnu.org/archive/html/help-guix/2025-01/msg00173.html
|
||||||
("CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE" . #t)))
|
("CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE" . #t)
|
||||||
|
;; Provide modules for wireguard and netfilter support
|
||||||
|
("CONFIG_WIREGUARD" . m)
|
||||||
|
("CONFIG_IP_NF_FILTER" . m)
|
||||||
|
("CONFIG_NETFILTER_XT_MATCH_ADDRTYPE" . m)))
|
||||||
|
|
||||||
(define (config->string options)
|
(define (config->string options)
|
||||||
(string-join (map (match-lambda
|
(string-join (map (match-lambda
|
||||||
@@ -1290,8 +1294,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||||||
#:extra-version "arm-generic"
|
#:extra-version "arm-generic"
|
||||||
#:extra-options
|
#:extra-options
|
||||||
(append
|
(append
|
||||||
`(;; needed to fix the RTC on rockchip platforms
|
|
||||||
("CONFIG_RTC_DRV_RK808" . #t))
|
|
||||||
(default-extra-linux-options linux-libre-5.10-version))))
|
(default-extra-linux-options linux-libre-5.10-version))))
|
||||||
|
|
||||||
(define-public linux-libre-arm-omap2plus
|
(define-public linux-libre-arm-omap2plus
|
||||||
@@ -1302,6 +1304,31 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||||||
#:defconfig "omap2plus_defconfig"
|
#:defconfig "omap2plus_defconfig"
|
||||||
#:extra-version "arm-omap2plus"))
|
#:extra-version "arm-omap2plus"))
|
||||||
|
|
||||||
|
(define pinebook-extra-modules
|
||||||
|
`(;; Pinebook display, battery, charger and usb
|
||||||
|
("CONFIG_DRM_ANALOGIX_ANX6345" . m)
|
||||||
|
("CONFIG_CHARGER_AXP20X" . m)
|
||||||
|
("CONFIG_INPUT_AXP20X_PEK" . m)
|
||||||
|
("CONFIG_CHARGER_AXP20X" . m)
|
||||||
|
("CONFIG_BATTERY_AXP20X" . m)
|
||||||
|
("CONFIG_PINCTRL_AXP209" . m)
|
||||||
|
("CONFIG_AXP20X_POWER" . m)
|
||||||
|
("CONFIG_AXP20X_ADC" . m)
|
||||||
|
;; Pinebook PRO battery and sound support
|
||||||
|
("CONFIG_BATTERY_CW2015" . m)
|
||||||
|
("CONFIG_CHARGER_GPIO" . m)
|
||||||
|
("CONFIG_SND_SOC_ES8316" . m)))
|
||||||
|
|
||||||
|
(define arm64-generic-extra-modules
|
||||||
|
(append
|
||||||
|
pinebook-extra-modules
|
||||||
|
`(;; Provide support for ath9k wireless
|
||||||
|
("CONFIG_ATH9K_HTC" . m)
|
||||||
|
;; Support Orange Pi R1 Plus LTS ethernet PHY.
|
||||||
|
("CONFIG_MOTORCOMM_PHY" . m)
|
||||||
|
;; needed to fix the RTC on rockchip platforms
|
||||||
|
("CONFIG_RTC_DRV_RK808" . #t))))
|
||||||
|
|
||||||
(define-public linux-libre-arm64-generic
|
(define-public linux-libre-arm64-generic
|
||||||
(make-linux-libre* linux-libre-version
|
(make-linux-libre* linux-libre-version
|
||||||
linux-libre-gnu-revision
|
linux-libre-gnu-revision
|
||||||
@@ -1311,25 +1338,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||||||
#:extra-version "arm64-generic"
|
#:extra-version "arm64-generic"
|
||||||
#:extra-options
|
#:extra-options
|
||||||
(append
|
(append
|
||||||
`(;; Provide support for ath9k wireless
|
arm64-generic-extra-modules
|
||||||
("CONFIG_ATH9K_HTC" . m)
|
|
||||||
;; Support Orange Pi R1 Plus LTS ethernet PHY.
|
|
||||||
("CONFIG_MOTORCOMM_PHY" . m)
|
|
||||||
;; needed to fix the RTC on rockchip platforms
|
|
||||||
("CONFIG_RTC_DRV_RK808" . #t)
|
|
||||||
;; Pinebook display, battery, charger and usb
|
|
||||||
("CONFIG_DRM_ANALOGIX_ANX6345" . m)
|
|
||||||
("CONFIG_CHARGER_AXP20X" . m)
|
|
||||||
("CONFIG_INPUT_AXP20X_PEK" . m)
|
|
||||||
("CONFIG_CHARGER_AXP20X" . m)
|
|
||||||
("CONFIG_BATTERY_AXP20X" . m)
|
|
||||||
("CONFIG_PINCTRL_AXP209" . m)
|
|
||||||
("CONFIG_AXP20X_POWER" . m)
|
|
||||||
("CONFIG_AXP20X_ADC" . m)
|
|
||||||
;; Pinebook PRO battery and sound support
|
|
||||||
("CONFIG_BATTERY_CW2015" . m)
|
|
||||||
("CONFIG_CHARGER_GPIO" . m)
|
|
||||||
("CONFIG_SND_SOC_ES8316" . m))
|
|
||||||
(default-extra-linux-options linux-libre-version))))
|
(default-extra-linux-options linux-libre-version))))
|
||||||
|
|
||||||
(define-public linux-libre-lts-arm64-generic
|
(define-public linux-libre-lts-arm64-generic
|
||||||
@@ -1347,25 +1356,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||||||
#:extra-version "arm64-generic"
|
#:extra-version "arm64-generic"
|
||||||
#:extra-options
|
#:extra-options
|
||||||
(append
|
(append
|
||||||
`( ;; Provide support for ath9k wireless
|
arm64-generic-extra-modules
|
||||||
("CONFIG_ATH9K_HTC" . m)
|
|
||||||
;; Support Orange Pi R1 Plus LTS ethernet PHY.
|
|
||||||
("CONFIG_MOTORCOMM_PHY" . m)
|
|
||||||
;; needed to fix the RTC on rockchip platforms
|
|
||||||
("CONFIG_RTC_DRV_RK808" . #t)
|
|
||||||
;; Pinebook display, battery, charger and usb
|
|
||||||
("CONFIG_DRM_ANALOGIX_ANX6345" . m)
|
|
||||||
("CONFIG_CHARGER_AXP20X" . m)
|
|
||||||
("CONFIG_INPUT_AXP20X_PEK" . m)
|
|
||||||
("CONFIG_CHARGER_AXP20X" . m)
|
|
||||||
("CONFIG_BATTERY_AXP20X" . m)
|
|
||||||
("CONFIG_PINCTRL_AXP209" . m)
|
|
||||||
("CONFIG_AXP20X_POWER" . m)
|
|
||||||
("CONFIG_AXP20X_ADC" . m)
|
|
||||||
;; Pinebook PRO battery and sound support
|
|
||||||
("CONFIG_BATTERY_CW2015" . m)
|
|
||||||
("CONFIG_CHARGER_GPIO" . m)
|
|
||||||
("CONFIG_SND_SOC_ES8316" . m))
|
|
||||||
(default-extra-linux-options linux-libre-lts-version)))))
|
(default-extra-linux-options linux-libre-lts-version)))))
|
||||||
|
|
||||||
(define-public linux-libre-arm64-generic-5.10
|
(define-public linux-libre-arm64-generic-5.10
|
||||||
@@ -1377,21 +1368,7 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||||||
#:extra-version "arm64-generic"
|
#:extra-version "arm64-generic"
|
||||||
#:extra-options
|
#:extra-options
|
||||||
(append
|
(append
|
||||||
`(;; needed to fix the RTC on rockchip platforms
|
arm64-generic-extra-modules
|
||||||
("CONFIG_RTC_DRV_RK808" . #t)
|
|
||||||
;; Pinebook display, battery, charger and usb
|
|
||||||
("CONFIG_DRM_ANALOGIX_ANX6345" . m)
|
|
||||||
("CONFIG_CHARGER_AXP20X" . m)
|
|
||||||
("CONFIG_INPUT_AXP20X_PEK" . m)
|
|
||||||
("CONFIG_CHARGER_AXP20X" . m)
|
|
||||||
("CONFIG_BATTERY_AXP20X" . m)
|
|
||||||
("CONFIG_PINCTRL_AXP209" . m)
|
|
||||||
("CONFIG_AXP20X_POWER" . m)
|
|
||||||
("CONFIG_AXP20X_ADC" . m)
|
|
||||||
;; Pinebook PRO battery and sound support
|
|
||||||
("CONFIG_BATTERY_CW2015" . m)
|
|
||||||
("CONFIG_CHARGER_GPIO" . m)
|
|
||||||
("CONFIG_SND_SOC_ES8316" . m))
|
|
||||||
(default-extra-linux-options linux-libre-5.10-version))))
|
(default-extra-linux-options linux-libre-5.10-version))))
|
||||||
|
|
||||||
(define-public linux-libre-arm64-honeycomb
|
(define-public linux-libre-arm64-honeycomb
|
||||||
@@ -1453,9 +1430,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||||||
;; Fixes https://codeberg.org/guix/guix/issues/101
|
;; Fixes https://codeberg.org/guix/guix/issues/101
|
||||||
("CONFIG_KEY_DH_OPERATIONS" . #true)
|
("CONFIG_KEY_DH_OPERATIONS" . #true)
|
||||||
|
|
||||||
;; For connecting to ci.guix.gnu.org over VPN.
|
|
||||||
("CONFIG_WIREGUARD" . m)
|
|
||||||
|
|
||||||
;; restool support
|
;; restool support
|
||||||
("CONFIG_FSL_MC_UAPI_SUPPORT" . #t)
|
("CONFIG_FSL_MC_UAPI_SUPPORT" . #t)
|
||||||
("CONFIG_FSL_MC_BUS" . #t)
|
("CONFIG_FSL_MC_BUS" . #t)
|
||||||
@@ -1774,8 +1748,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
|
|||||||
("CONFIG_USB_ETH_RNDIS" . m)
|
("CONFIG_USB_ETH_RNDIS" . m)
|
||||||
("CONFIG_USB_ETH_EEM" . m)
|
("CONFIG_USB_ETH_EEM" . m)
|
||||||
("CONFIG_USB_G_NCM" . m)
|
("CONFIG_USB_G_NCM" . m)
|
||||||
;; Provide support for wireguard
|
|
||||||
("CONFIG_WIREGUARD" . m)
|
|
||||||
;; Provide support for ath9k wireless
|
;; Provide support for ath9k wireless
|
||||||
("CONFIG_ATH9K" . m)
|
("CONFIG_ATH9K" . m)
|
||||||
("CONFIG_ATH9K_HTC" . m))
|
("CONFIG_ATH9K_HTC" . m))
|
||||||
@@ -2088,8 +2060,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
|
|||||||
("CONFIG_USB_ETH_RNDIS" . m)
|
("CONFIG_USB_ETH_RNDIS" . m)
|
||||||
("CONFIG_USB_ETH_EEM" . m)
|
("CONFIG_USB_ETH_EEM" . m)
|
||||||
("CONFIG_USB_G_NCM" . m)
|
("CONFIG_USB_G_NCM" . m)
|
||||||
;; Provide support for wireguard
|
|
||||||
("CONFIG_WIREGUARD" . m)
|
|
||||||
;; Provide support for ath9k wireless
|
;; Provide support for ath9k wireless
|
||||||
("CONFIG_ATH9K" . m)
|
("CONFIG_ATH9K" . m)
|
||||||
("CONFIG_ATH9K_HTC" . m))
|
("CONFIG_ATH9K_HTC" . m))
|
||||||
@@ -2423,8 +2393,6 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb")))))))))))
|
|||||||
("CONFIG_USB_ETH_RNDIS" . m)
|
("CONFIG_USB_ETH_RNDIS" . m)
|
||||||
("CONFIG_USB_ETH_EEM" . m)
|
("CONFIG_USB_ETH_EEM" . m)
|
||||||
("CONFIG_USB_G_NCM" . m)
|
("CONFIG_USB_G_NCM" . m)
|
||||||
;; Provide support for wireguard
|
|
||||||
("CONFIG_WIREGUARD" . m)
|
|
||||||
;; Provide support for ath9k wireless
|
;; Provide support for ath9k wireless
|
||||||
("CONFIG_ATH9K" . m)
|
("CONFIG_ATH9K" . m)
|
||||||
("CONFIG_ATH9K_HTC" . m))
|
("CONFIG_ATH9K_HTC" . m))
|
||||||
@@ -2799,32 +2767,6 @@ This package provides the @command{corefreqd} data collection daemon, the
|
|||||||
(supported-systems (list "x86_64-linux"))
|
(supported-systems (list "x86_64-linux"))
|
||||||
(license license:gpl2)))
|
(license license:gpl2)))
|
||||||
|
|
||||||
(define-public librem-ec-acpi-linux-module
|
|
||||||
(package
|
|
||||||
(name "librem-ec-acpi-linux-module")
|
|
||||||
(version "0.9.2")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://source.puri.sm/nicole.faerber/librem-ec-acpi-dkms")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "0m8hamf0550083jnk5q4hv20l8lfiardnkxbib4hhvqghpzzbxl0"))))
|
|
||||||
(build-system linux-module-build-system)
|
|
||||||
(arguments
|
|
||||||
(list #:tests? #f)) ; no test suite
|
|
||||||
(home-page "https://source.puri.sm/nicole.faerber/librem-ec-acpi-dkms")
|
|
||||||
(synopsis "Linux kernel module to control the Librem Embedded Controller")
|
|
||||||
(description
|
|
||||||
"This is the Linux kernel @acronym{ACPI, Advanced Configuration and Power
|
|
||||||
Interface} platform driver for the @acronym{EC, Embedded Controller} firmware
|
|
||||||
on Purism Librem laptop computers. It allows user-space control over the
|
|
||||||
battery charging thresholds, keyboard backlight, fans and thermal monitors,
|
|
||||||
and the notification, WiFi, and Bluetooth LED.")
|
|
||||||
(license license:gpl2)))
|
|
||||||
|
|
||||||
(define-public tuxedo-keyboard
|
(define-public tuxedo-keyboard
|
||||||
(package
|
(package
|
||||||
(name "tuxedo-keyboard")
|
(name "tuxedo-keyboard")
|
||||||
@@ -2855,70 +2797,6 @@ kernel modules to control the keyboard on most Tuxedo computers. The @code{tuxed
|
|||||||
module is also needed for the @code{tuxedo-control-center} (short tcc) package.")
|
module is also needed for the @code{tuxedo-control-center} (short tcc) package.")
|
||||||
(license license:gpl2+)))
|
(license license:gpl2+)))
|
||||||
|
|
||||||
(define-public evdi
|
|
||||||
(package
|
|
||||||
(name "evdi")
|
|
||||||
(version "1.14.8") ;inherited by libevdi
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/DisplayLink/evdi")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "18n8kk4gbbj252a2dqb7mbpscfb437x42flh1fsl4g5c8brczc77"))))
|
|
||||||
(build-system linux-module-build-system)
|
|
||||||
(arguments
|
|
||||||
(list #:tests? #f ;no test suite
|
|
||||||
#:phases #~(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'chdir
|
|
||||||
(lambda _
|
|
||||||
(chdir "module"))))))
|
|
||||||
(home-page "https://github.com/DisplayLink/evdi")
|
|
||||||
(synopsis
|
|
||||||
"@acronym{EVDI, Extensible Virtual Display Interface} Linux kernel module")
|
|
||||||
(description
|
|
||||||
"The @acronym{EVDI, Extensible Virtual Display Interface} is a Linux kernel
|
|
||||||
module that enables management of multiple screens, allowing user-space programs
|
|
||||||
to take control over what happens with the image. It is essentially a virtual
|
|
||||||
display for which applications using the @code{libevdi} library can add, remove,
|
|
||||||
and receive screen updates.
|
|
||||||
|
|
||||||
The EVDI driver uses the standard Linux @acronym{DRM, Direct Rendering Manager}.
|
|
||||||
Its displays can be controlled by standard tools such as @command{xrandr} and
|
|
||||||
display settings applets in graphical environments")
|
|
||||||
(license license:gpl2)))
|
|
||||||
|
|
||||||
(define-public libevdi
|
|
||||||
(package
|
|
||||||
(inherit evdi)
|
|
||||||
(name "libevdi")
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
(list #:tests? #f ;no test suite
|
|
||||||
#:make-flags
|
|
||||||
#~(list (string-append "CC=" #$(cc-for-target)))
|
|
||||||
#:phases #~(modify-phases %standard-phases
|
|
||||||
(delete 'configure)
|
|
||||||
(add-after 'unpack 'chdir
|
|
||||||
(lambda _
|
|
||||||
(chdir "library")))
|
|
||||||
(replace 'install
|
|
||||||
(lambda* _
|
|
||||||
(let* ((lib (string-append #$output "/lib")))
|
|
||||||
(mkdir-p lib)
|
|
||||||
(install-file "libevdi.so" lib)))))))
|
|
||||||
(inputs (list libdrm))
|
|
||||||
(native-inputs (list pkg-config))
|
|
||||||
(synopsis
|
|
||||||
"@acronym{EVDI, Extensible Virtual Display Interface} user-space library")
|
|
||||||
(description
|
|
||||||
"Libevdi is a library that gives applications easy access to
|
|
||||||
@acronym{EVDI, Extensible Virtual Display Interface} devices provided by the
|
|
||||||
@code{evdi} driver package.")
|
|
||||||
(license license:lgpl2.1)))
|
|
||||||
|
|
||||||
(define-public ec
|
(define-public ec
|
||||||
(package
|
(package
|
||||||
(name "ec")
|
(name "ec")
|
||||||
@@ -2944,62 +2822,6 @@ registers of the @acronym{EC, Embedded Controller} supported by the
|
|||||||
@code{ec_sys} Linux driver.")
|
@code{ec_sys} Linux driver.")
|
||||||
(license license:gpl2)))
|
(license license:gpl2)))
|
||||||
|
|
||||||
(define-public lkrg
|
|
||||||
(package
|
|
||||||
(name "lkrg")
|
|
||||||
(version "0.9.7")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/lkrg-org/lkrg")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0k0z9caj48nqjwk3bapgfcdzi1lkizxcjj4r1dvkvwsk38mbk1c4"))))
|
|
||||||
(build-system linux-module-build-system)
|
|
||||||
(arguments
|
|
||||||
(list #:linux linux-libre
|
|
||||||
#:tests? #f
|
|
||||||
#:make-flags #~(list (string-append "CC="
|
|
||||||
#$(cc-for-target))
|
|
||||||
(string-append "SYSSRC="
|
|
||||||
(assoc-ref %build-inputs
|
|
||||||
"linux-module-builder")
|
|
||||||
"/lib/modules/build"))))
|
|
||||||
(inputs (list bash-minimal))
|
|
||||||
(home-page "https://lkrg.org/")
|
|
||||||
(synopsis "Linux Kernel Runtime Guard")
|
|
||||||
(description
|
|
||||||
"This package performs runtime integrity checking of the Linux kernel and
|
|
||||||
detection of security vulnerability exploits against the kernel.")
|
|
||||||
(license license:gpl2)))
|
|
||||||
|
|
||||||
(define-public vhba-module
|
|
||||||
(package
|
|
||||||
(name "vhba-module")
|
|
||||||
(version "20211218")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append
|
|
||||||
"http://downloads.sourceforge.net/cdemu/vhba-module/vhba-module-"
|
|
||||||
version ".tar.xz"))
|
|
||||||
(sha256
|
|
||||||
(base32 "1dkprnnya0i8121p7ip4g8cww99drk7fzbwcxx65x02jqk0siibj"))))
|
|
||||||
(build-system linux-module-build-system)
|
|
||||||
(arguments
|
|
||||||
(list #:tests? #f)) ; no test suite
|
|
||||||
(home-page "https://cdemu.sourceforge.io/")
|
|
||||||
(synopsis "Linux kernel module that emulates SCSI devices")
|
|
||||||
(description
|
|
||||||
"The @acronym{VHBA, Virtual SCSI Host Bus Adapter} module is the link
|
|
||||||
between the CDemu user-space daemon and the kernel Linux. It acts as a
|
|
||||||
low-level SCSI driver that emulates a virtual SCSI adapter which can have
|
|
||||||
multiple virtual devices attached to it. Its typical use with CDEmu is to
|
|
||||||
emulate optical devices such as DVD and CD-ROM drives.")
|
|
||||||
(license license:gpl2+)))
|
|
||||||
|
|
||||||
(define-public bbswitch-module
|
(define-public bbswitch-module
|
||||||
;; Use "develop" branch since stable release does not build on Linux >= 5.6.
|
;; Use "develop" branch since stable release does not build on Linux >= 5.6.
|
||||||
;; See https://github.com/Bumblebee-Project/bbswitch/issues/205.
|
;; See https://github.com/Bumblebee-Project/bbswitch/issues/205.
|
||||||
@@ -3196,36 +3018,6 @@ Linux kernel module, it also contains a modprobe configuration and udev rules,
|
|||||||
which need to be installed separately.")
|
which need to be installed separately.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public vendor-reset-linux-module
|
|
||||||
(let ((commit "4b466e92a2d9f76ce1082cde982c7be0be91e248")
|
|
||||||
(revision "0"))
|
|
||||||
(package
|
|
||||||
(name "vendor-reset-linux-module")
|
|
||||||
(version (git-version "0.1.0" revision commit))
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/gnif/vendor-reset")
|
|
||||||
(commit commit)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1gaf4j20grng689c9fylcqri3j9ycnhr2bsva2z6qcdqvzl6yxbi"))))
|
|
||||||
(build-system linux-module-build-system)
|
|
||||||
(arguments
|
|
||||||
(list #:tests? #f)) ;no test suite
|
|
||||||
(home-page "https://github.com/gnif/vendor-reset")
|
|
||||||
(synopsis
|
|
||||||
"Kernel module that resets GPUs that are affected by the reset bug")
|
|
||||||
(description
|
|
||||||
"This package provides a kernel module that is capable of
|
|
||||||
resetting hardware devices into a state where they can be
|
|
||||||
re-initialized or passed through into a virtual machine (VFIO).
|
|
||||||
While it would be great to have these in the kernel as PCI quirks,
|
|
||||||
some of the reset procedures are very complex and would never be
|
|
||||||
accepted as a quirk (ie AMD Vega 10).")
|
|
||||||
(license license:gpl2))))
|
|
||||||
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
;;; Pluggable authentication modules (PAM).
|
;;; Pluggable authentication modules (PAM).
|
||||||
@@ -4946,7 +4738,7 @@ transparently through a bridge.")
|
|||||||
(define-public libnl
|
(define-public libnl
|
||||||
(package
|
(package
|
||||||
(name "libnl")
|
(name "libnl")
|
||||||
(version "3.7.0")
|
(version "3.12.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
@@ -4955,7 +4747,7 @@ transparently through a bridge.")
|
|||||||
"/libnl-" version ".tar.gz"))
|
"/libnl-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0faryrbvp0x4s2zhg5d78vd5q4w34lrr736gpm9wcwpaxv5krr4z"))))
|
"066xq01y2mx0xi7bwa5y6ciw1ygla15qdlzzyvyzb8zijrqwllgw"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("bison" ,bison)
|
`(("bison" ,bison)
|
||||||
@@ -4970,7 +4762,7 @@ transparently through a bridge.")
|
|||||||
(string-join (string-split version #\.) "_")
|
(string-join (string-split version #\.) "_")
|
||||||
"/libnl-doc-" version ".tar.gz"))
|
"/libnl-doc-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1ra8xdf06q9hlsrnc1yz67xkp4kd9sd27ff02mlixixnyyjp32sp"))))))
|
(base32 "18f14pdycghy6fcd27faqgh19zpam6b45s8bgsk85kb9wwzq3yd4"))))))
|
||||||
(outputs `("out" "doc"))
|
(outputs `("out" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
@@ -5032,7 +4824,6 @@ configuration and monitoring interfaces.")
|
|||||||
(with-directory-excursion "./python" (python-inst ,python))
|
(with-directory-excursion "./python" (python-inst ,python))
|
||||||
#t))))))))
|
#t))))))))
|
||||||
|
|
||||||
(define-public libnl-python2 (libnl-python-package "python2"))
|
|
||||||
(define-public libnl-python3 (libnl-python-package "python3"))
|
(define-public libnl-python3 (libnl-python-package "python3"))
|
||||||
|
|
||||||
(define-public iw
|
(define-public iw
|
||||||
@@ -12127,7 +11918,7 @@ provides user-space tools for creating EROFS file systems.")
|
|||||||
(define-public rasdaemon
|
(define-public rasdaemon
|
||||||
(package
|
(package
|
||||||
(name "rasdaemon")
|
(name "rasdaemon")
|
||||||
(version "0.8.3")
|
(version "0.8.4")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -12136,9 +11927,17 @@ provides user-space tools for creating EROFS file systems.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0vfw4vf75fnpbxnfsmpdwdzhplnccz24j23bg6nsb3b4wa8hv4sa"))))
|
(base32 "1930g35igfdw5bzcd6diy59rm1q4yirpjgqznfqfsichnmk04kmf"))))
|
||||||
(native-inputs (list autoconf automake libtool pkg-config))
|
(native-inputs (list autoconf automake libtool pkg-config))
|
||||||
(inputs (list bash-minimal libtraceevent perl perl-dbd-sqlite sqlite dmidecode kmod))
|
(inputs
|
||||||
|
(list bash-minimal
|
||||||
|
dmidecode
|
||||||
|
kmod
|
||||||
|
libtraceevent
|
||||||
|
pciutils
|
||||||
|
perl
|
||||||
|
perl-dbd-sqlite
|
||||||
|
sqlite))
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
|
|||||||
@@ -12982,8 +12982,8 @@ score. When evaluated, the musical score is rendered to an image.")
|
|||||||
(sbcl-package->ecl-package sbcl-cmn))
|
(sbcl-package->ecl-package sbcl-cmn))
|
||||||
|
|
||||||
(define-public sbcl-coalton
|
(define-public sbcl-coalton
|
||||||
(let ((commit "939342495f55991812c2c2767322c5e51e755216")
|
(let ((commit "bf475c8c53e02a2e0cb29deab4d101d25743bfca")
|
||||||
(revision "4"))
|
(revision "5"))
|
||||||
(package
|
(package
|
||||||
(name "sbcl-coalton")
|
(name "sbcl-coalton")
|
||||||
(version (git-version "0.0.1" revision commit))
|
(version (git-version "0.0.1" revision commit))
|
||||||
@@ -12995,7 +12995,7 @@ score. When evaluated, the musical score is rendered to an image.")
|
|||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name "cl-coalton" version))
|
(file-name (git-file-name "cl-coalton" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "08qzj3v4fvn9h87whyqg650rpap8lva7jr94d1akv6m2z62l5q68"))))
|
(base32 "0zrp2s82n2mxx7knbnbsdj64zar21nnnf8iwzrqzs4g3v6xpyz9z"))))
|
||||||
(build-system asdf-build-system/sbcl)
|
(build-system asdf-build-system/sbcl)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list sbcl-fiasco))
|
(list sbcl-fiasco))
|
||||||
@@ -27700,49 +27700,6 @@ adaptations.")
|
|||||||
(define-public ecl-radiance
|
(define-public ecl-radiance
|
||||||
(sbcl-package->ecl-package sbcl-radiance))
|
(sbcl-package->ecl-package sbcl-radiance))
|
||||||
|
|
||||||
(define-public sbcl-radiance-contribs
|
|
||||||
(let ((commit "710b3e1f9971e48368d52eea0b407f2e8f510981")
|
|
||||||
(revision "1"))
|
|
||||||
(package
|
|
||||||
(name "sbcl-radiance-contribs")
|
|
||||||
(version (git-version "1.0.0" revision commit))
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://codeberg.org/shirakumo/radiance-contribs")
|
|
||||||
(commit commit)))
|
|
||||||
(file-name (git-file-name "radiance-contribs" version))
|
|
||||||
(sha256
|
|
||||||
(base32 "08ivnd7a6vfciqna680qpx6zj6vw9xcbrzq29iz3x7x9sp1pqgq3"))))
|
|
||||||
(build-system asdf-build-system/sbcl)
|
|
||||||
(arguments
|
|
||||||
;; TODO: Include more contribs.
|
|
||||||
`(#:asd-systems '("r-clip"
|
|
||||||
"i-log4cl"
|
|
||||||
"i-sqlite"
|
|
||||||
"r-data-model"
|
|
||||||
"r-simple-rate"
|
|
||||||
"r-welcome")))
|
|
||||||
(inputs
|
|
||||||
(list sbcl-radiance
|
|
||||||
sbcl-cffi
|
|
||||||
sbcl-clip
|
|
||||||
sbcl-cl-sqlite
|
|
||||||
sbcl-log4cl))
|
|
||||||
(home-page "https://shirakumo.github.io/radiance/")
|
|
||||||
(synopsis "Standard implementations and drivers for the radiance interfaces")
|
|
||||||
(description
|
|
||||||
"This is a collection of useful helper modules and standard
|
|
||||||
implementations for Radiance interfaces.")
|
|
||||||
(license license:zlib))))
|
|
||||||
|
|
||||||
(define-public cl-radiance-contribs
|
|
||||||
(sbcl-package->cl-source-package sbcl-radiance-contribs))
|
|
||||||
|
|
||||||
(define-public ecl-radiance-contribs
|
|
||||||
(sbcl-package->ecl-package sbcl-radiance-contribs))
|
|
||||||
|
|
||||||
(define-public sbcl-random-sample
|
(define-public sbcl-random-sample
|
||||||
(let ((commit "46b70374ed796b84ea003e83c1db97b0caf97e22")
|
(let ((commit "46b70374ed796b84ea003e83c1db97b0caf97e22")
|
||||||
(revision "0"))
|
(revision "0"))
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
|
;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca>
|
||||||
;;; Copyright © 2024 David Pflug <david@pflug.io>
|
;;; Copyright © 2024 David Pflug <david@pflug.io>
|
||||||
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||||
|
;;; Copyright © 2026 Igorj Gorjaĉev <igor@goryachev.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -912,7 +913,7 @@ assembler, PEG) is less than 1MB.")
|
|||||||
(define-public jpm
|
(define-public jpm
|
||||||
(package
|
(package
|
||||||
(name "jpm")
|
(name "jpm")
|
||||||
(version "1.1.0")
|
(version "1.2.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -921,7 +922,7 @@ assembler, PEG) is less than 1MB.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "05rdxigmiy7vf93s16a8n2029lq33073jccz1rjl4iisxj6piw4l"))))
|
(base32 "06ywq1ajvqx3lfpldwbakc21hxhb313r0196xnmrrbb6k1f8hsfx"))))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
@@ -89,6 +89,7 @@
|
|||||||
#:use-module (gnu packages wget)
|
#:use-module (gnu packages wget)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (ice-9 match)
|
||||||
#:use-module ((srfi srfi-1) #:hide (zip)))
|
#:use-module ((srfi srfi-1) #:hide (zip)))
|
||||||
|
|
||||||
(define (lua-search-paths version)
|
(define (lua-search-paths version)
|
||||||
@@ -170,6 +171,22 @@ for configuration, scripting, and rapid prototyping.")
|
|||||||
"lua-5.4-search-paths.patch"))))
|
"lua-5.4-search-paths.patch"))))
|
||||||
(native-search-paths (lua-search-paths "5.4"))))
|
(native-search-paths (lua-search-paths "5.4"))))
|
||||||
|
|
||||||
|
|
||||||
|
(define-public lua-5.4-for-c++
|
||||||
|
(let ((lua-pkg lua-5.4))
|
||||||
|
(hidden-package
|
||||||
|
(package/inherit lua-pkg
|
||||||
|
(name (string-append (package-name lua-pkg) "-for-c++"))
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments lua-pkg)
|
||||||
|
((#:make-flags old-flags)
|
||||||
|
(map
|
||||||
|
(match-lambda
|
||||||
|
((string-append "CC=" _)
|
||||||
|
`(string-append "CC=" ,(cxx-for-target)))
|
||||||
|
(else else))
|
||||||
|
old-flags))))))))
|
||||||
|
|
||||||
(define-public lua-5.2
|
(define-public lua-5.2
|
||||||
(package (inherit lua)
|
(package (inherit lua)
|
||||||
(version "5.2.4")
|
(version "5.2.4")
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
(define-public luanti
|
(define-public luanti
|
||||||
(package
|
(package
|
||||||
(name "luanti")
|
(name "luanti")
|
||||||
(version "5.15.1")
|
(version "5.15.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "07g41ljv117pmw6402mqznccwl1hd9jp2l8wkb4l211cbm4c6vv9"))
|
(base32 "1mcbsgf549y2jg9qds95wwgd1699mkk4byv9ls4lpg43bd829dhk"))
|
||||||
(modules '((guix build utils)
|
(modules '((guix build utils)
|
||||||
(srfi srfi-26)
|
(srfi srfi-26)
|
||||||
(ice-9 ftw)))
|
(ice-9 ftw)))
|
||||||
@@ -488,7 +488,7 @@ with different rules and mechanics.")
|
|||||||
(define-public luanti-mineclonia
|
(define-public luanti-mineclonia
|
||||||
(package
|
(package
|
||||||
(name "luanti-mineclonia")
|
(name "luanti-mineclonia")
|
||||||
(version "0.120.1")
|
(version "0.121.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -497,7 +497,7 @@ with different rules and mechanics.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"135xllkvdravry25y1f94wqn7nxb0pnrpn7xiagh2b5vjbajhdg4"))))
|
"1c3x59iq04vfc0fa09z6g8davrr2vhdywppdbgyw64n7vk4f6br9"))))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:install-plan
|
`(#:install-plan
|
||||||
|
|||||||
@@ -51,24 +51,6 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages machine-learning)
|
(define-module (gnu packages machine-learning)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix gexp)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix svn-download)
|
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (guix build-system cargo)
|
|
||||||
#:use-module (guix build-system cmake)
|
|
||||||
#:use-module (guix build-system copy)
|
|
||||||
#:use-module (guix build-system gnu)
|
|
||||||
#:use-module (guix build-system ocaml)
|
|
||||||
#:use-module (guix build-system pyproject)
|
|
||||||
#:use-module (guix build-system python)
|
|
||||||
#:use-module (guix build-system r)
|
|
||||||
#:use-module (guix build-system trivial)
|
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (gnu packages adns)
|
|
||||||
#:use-module (gnu packages algebra)
|
#:use-module (gnu packages algebra)
|
||||||
#:use-module (gnu packages assembly)
|
#:use-module (gnu packages assembly)
|
||||||
#:use-module (gnu packages audio)
|
#:use-module (gnu packages audio)
|
||||||
@@ -89,6 +71,7 @@
|
|||||||
#:use-module (gnu packages databases)
|
#:use-module (gnu packages databases)
|
||||||
#:use-module (gnu packages dejagnu)
|
#:use-module (gnu packages dejagnu)
|
||||||
#:use-module (gnu packages digest)
|
#:use-module (gnu packages digest)
|
||||||
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages documentation)
|
#:use-module (gnu packages documentation)
|
||||||
#:use-module (gnu packages freedesktop)
|
#:use-module (gnu packages freedesktop)
|
||||||
#:use-module (gnu packages gcc)
|
#:use-module (gnu packages gcc)
|
||||||
@@ -154,6 +137,23 @@
|
|||||||
#:use-module (gnu packages xdisorg)
|
#:use-module (gnu packages xdisorg)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (guix build-system cargo)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
|
#:use-module (guix build-system copy)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system ocaml)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system r)
|
||||||
|
#:use-module (guix build-system trivial)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix svn-download)
|
||||||
|
#:use-module (guix utils)
|
||||||
#:use-module (ice-9 match))
|
#:use-module (ice-9 match))
|
||||||
|
|
||||||
(define-public dlpack
|
(define-public dlpack
|
||||||
@@ -4666,7 +4666,7 @@ different backends")
|
|||||||
(define-public koboldcpp
|
(define-public koboldcpp
|
||||||
(package
|
(package
|
||||||
(name "koboldcpp")
|
(name "koboldcpp")
|
||||||
(version "1.110")
|
(version "1.111.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -4682,7 +4682,7 @@ different backends")
|
|||||||
(delete-file-recursively "lib")
|
(delete-file-recursively "lib")
|
||||||
(for-each delete-file (find-files "." "\\.(dll|exe|bat)$"))))
|
(for-each delete-file (find-files "." "\\.(dll|exe|bat)$"))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1lfdfsk227qgk44sq10qa93cl5s221djnpj82wg6b38dg7yy0b62"))))
|
(base32 "0mlq0p14p5vhc0pknkjidcw885mr0c92881lp629n44qxdf7dx8i"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
@@ -68,6 +68,7 @@
|
|||||||
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
|
||||||
;;; Copyright © 2026 Sergey Trofimov <sarg@sarg.org.ru>
|
;;; Copyright © 2026 Sergey Trofimov <sarg@sarg.org.ru>
|
||||||
;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
|
;;; Copyright © 2026 Nguyễn Gia Phong <cnx@loang.net>
|
||||||
|
;;; Copyright © 2026 Herman Rimm <herman@rimm.ee>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -4744,7 +4745,7 @@ on RFC 3501 and original @code{imaplib} module.")
|
|||||||
(define-public rspamd
|
(define-public rspamd
|
||||||
(package
|
(package
|
||||||
(name "rspamd")
|
(name "rspamd")
|
||||||
(version "3.12.1")
|
(version "3.14.3")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -4752,7 +4753,7 @@ on RFC 3501 and original @code{imaplib} module.")
|
|||||||
(url "https://github.com/rspamd/rspamd")
|
(url "https://github.com/rspamd/rspamd")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0li75dqqy0irrvv2jddmll2adf15cywif982ijj034hldg9162bc"))
|
(base32 "1yh3933ak7qzzys6yzixrs8pmmsh16ny23im958h8rqg0xrq3mcy"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
@@ -4783,11 +4784,11 @@ on RFC 3501 and original @code{imaplib} module.")
|
|||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config))
|
(list pkg-config))
|
||||||
(synopsis "Spam filtering system")
|
(synopsis "Spam filtering system")
|
||||||
(description "Rspamd is an advanced spam filtering system that
|
(description
|
||||||
allows evaluation of messages by a number of rules including regular
|
"Rspamd is a spam filter that evaluates email messages by a number
|
||||||
expressions, statistical analysis and custom services such as URL
|
of rules including: regular expressions, statistical analysis, and URL
|
||||||
black lists. Each message is analysed by Rspamd and given a spam
|
blacklists. Rspamd gives each message a spam score, e.g., for further
|
||||||
score.")
|
processing by an MTA.")
|
||||||
(home-page "https://www.rspamd.com/")
|
(home-page "https://www.rspamd.com/")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ specific format when needed.")
|
|||||||
(delete 'configure)) ; no configure script
|
(delete 'configure)) ; no configure script
|
||||||
#:test-target "test"))
|
#:test-target "test"))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("python" ,python-2)
|
`(("python" ,python-minimal-wrapper)
|
||||||
("tidy" ,tidy-html)))
|
("tidy" ,tidy-html)))
|
||||||
(synopsis "Markdown processing library")
|
(synopsis "Markdown processing library")
|
||||||
(description "Hoedown is a standards compliant, fast, secure markdown
|
(description "Hoedown is a standards compliant, fast, secure markdown
|
||||||
|
|||||||
+13
-8
@@ -487,8 +487,9 @@ programming languages.")
|
|||||||
""))))
|
""))))
|
||||||
;; The 'check phase requires test programs build using 'build-tests'.
|
;; The 'check phase requires test programs build using 'build-tests'.
|
||||||
(add-before 'check 'build-tests
|
(add-before 'check 'build-tests
|
||||||
(lambda _
|
(lambda* (#:key tests? #:allow-other-keys)
|
||||||
(invoke "cmake" "--build" "." "--target" "build-tests"))))))
|
(when tests?
|
||||||
|
(invoke "cmake" "--build" "." "--target" "build-tests")))))))
|
||||||
(inputs (list cadical-2.1
|
(inputs (list cadical-2.1
|
||||||
cln
|
cln
|
||||||
cryptominisat
|
cryptominisat
|
||||||
@@ -8805,7 +8806,7 @@ and comparisons are supported.")
|
|||||||
"1fwlgbcdxz30dzsqw3y1b6ic1rhzfadghj7cq7yxsj14npgnwzga"))))
|
"1fwlgbcdxz30dzsqw3y1b6ic1rhzfadghj7cq7yxsj14npgnwzga"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config python-2)) ;for tests; syntax incompatible with Python 3
|
(list pkg-config python-minimal-wrapper))
|
||||||
(inputs
|
(inputs
|
||||||
(list openblas suitesparse))
|
(list openblas suitesparse))
|
||||||
(arguments
|
(arguments
|
||||||
@@ -9646,7 +9647,7 @@ researchers and developers alike to get started on SAT.")
|
|||||||
(define-public kissat
|
(define-public kissat
|
||||||
(package
|
(package
|
||||||
(name "kissat")
|
(name "kissat")
|
||||||
(version "4.0.1")
|
(version "4.0.4")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -9656,7 +9657,7 @@ researchers and developers alike to get started on SAT.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0acg61cfcjg13if2i375cyl4xvwmabhfhi9z8pnw971046am6bzv"))))
|
"1snimig4cp97p570nin2i38my72zvwypldyhr125i1z6cd9pa046"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs (list xz gzip lzip bzip2 p7zip))
|
(inputs (list xz gzip lzip bzip2 p7zip))
|
||||||
(arguments
|
(arguments
|
||||||
@@ -9667,6 +9668,10 @@ researchers and developers alike to get started on SAT.")
|
|||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'patch-source
|
(add-after 'unpack 'patch-source
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(substitute* "test/testfile.c"
|
||||||
|
;; Don't check if /etc/passwd isn't writable.
|
||||||
|
;; When building in a container/chroot, this fails spuriously.
|
||||||
|
((".*/etc/passwd.*") ""))
|
||||||
(substitute* "scripts/generate-build-header.sh"
|
(substitute* "scripts/generate-build-header.sh"
|
||||||
;; by default BUILD includes the build date which
|
;; by default BUILD includes the build date which
|
||||||
;; makes the build not reproducible.
|
;; makes the build not reproducible.
|
||||||
@@ -11453,7 +11458,7 @@ expression parsing and evaluation.")
|
|||||||
(define-public highs
|
(define-public highs
|
||||||
(package
|
(package
|
||||||
(name "highs")
|
(name "highs")
|
||||||
(version "1.10.0")
|
(version "1.14.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -11462,14 +11467,14 @@ expression parsing and evaluation.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "19q99nkk6r6k91gxp8a5rjil1399qyfgfc6jqlg2gd82vpcw8c8b"))))
|
(base32 "16y664rzvxd8785195k0srz0842zvl0zdkf6qi103p503pj81afh"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(home-page "https://highs.dev")
|
(home-page "https://highs.dev")
|
||||||
(synopsis "High performance software for linear optimization")
|
(synopsis "High performance software for linear optimization")
|
||||||
(description
|
(description
|
||||||
"HiGHS provides serial and parallel solvers for large-scale sparse
|
"HiGHS provides serial and parallel solvers for large-scale sparse
|
||||||
linear programming (LP), mixed-integer programming (MIP), and quadratic
|
linear programming (LP), mixed-integer programming (MIP), and quadratic
|
||||||
programming (QP) models")
|
programming (QP) models.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public trilinos-zoltan
|
(define-public trilinos-zoltan
|
||||||
|
|||||||
@@ -1151,7 +1151,7 @@ simultaneously and therefore appear under the same nickname on IRC.")
|
|||||||
(define-public python-nbxmpp
|
(define-public python-nbxmpp
|
||||||
(package
|
(package
|
||||||
(name "python-nbxmpp")
|
(name "python-nbxmpp")
|
||||||
(version "7.1.0")
|
(version "7.2.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -1160,7 +1160,7 @@ simultaneously and therefore appear under the same nickname on IRC.")
|
|||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1n7b6yv2k89hsmhmx9pi7m8l3aq97xppaz3hm7mvqgvxnlw0c1kr"))))
|
(base32 "1dyf4jh76ffbl45x4cpk6rsn1r4wck54b3d8wfd2swxaqq4p7lis"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments (list #:test-backend #~'unittest))
|
(arguments (list #:test-backend #~'unittest))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
@@ -1184,7 +1184,7 @@ of xmpppy.")
|
|||||||
(define-public gajim
|
(define-public gajim
|
||||||
(package
|
(package
|
||||||
(name "gajim")
|
(name "gajim")
|
||||||
(version "2.4.5")
|
(version "2.4.6")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
@@ -1192,7 +1192,7 @@ of xmpppy.")
|
|||||||
(version-major+minor version)
|
(version-major+minor version)
|
||||||
"/gajim-" version ".tar.gz"))
|
"/gajim-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1rkxzf1pfd29rip5bw4730fl7b2xk12zpiwnfkyzxlkmbh4j3kp2"))
|
(base32 "0ilpgkzw45scjlnag94p8v6np629v7w0ihci5a2w5d742gpqvq6c"))
|
||||||
(patches
|
(patches
|
||||||
(search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
|
(search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
@@ -1278,7 +1278,6 @@ of xmpppy.")
|
|||||||
glib
|
glib
|
||||||
glib-networking
|
glib-networking
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
gsound
|
|
||||||
libspelling
|
libspelling
|
||||||
libadwaita
|
libadwaita
|
||||||
gstreamer
|
gstreamer
|
||||||
@@ -1293,6 +1292,7 @@ of xmpppy.")
|
|||||||
libsoup
|
libsoup
|
||||||
libxscrnsaver
|
libxscrnsaver
|
||||||
network-manager
|
network-manager
|
||||||
|
python-cryptography
|
||||||
python-css-parser
|
python-css-parser
|
||||||
python-dbus-1.2
|
python-dbus-1.2
|
||||||
python-emoji
|
python-emoji
|
||||||
@@ -2690,23 +2690,6 @@ validating international phone numbers.")
|
|||||||
(home-page "https://github.com/google/libphonenumber")
|
(home-page "https://github.com/google/libphonenumber")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public libphonenumber-8.11
|
|
||||||
(package/inherit libphonenumber
|
|
||||||
(name (package-name libphonenumber))
|
|
||||||
(version "8.11.5")
|
|
||||||
(source (origin
|
|
||||||
(inherit (package-source libphonenumber))
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/google/libphonenumber")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1y4ivhy3kwgggrr3g521zaf97334aan0yqpzzryss80k326q5rhf"))))
|
|
||||||
(inputs
|
|
||||||
(modify-inputs inputs
|
|
||||||
(delete "abseil-cpp" "icedtea")))))
|
|
||||||
|
|
||||||
(define-public chatty
|
(define-public chatty
|
||||||
(package
|
(package
|
||||||
(name "chatty")
|
(name "chatty")
|
||||||
@@ -3454,14 +3437,14 @@ notifications.")
|
|||||||
(define-public pounce
|
(define-public pounce
|
||||||
(package
|
(package
|
||||||
(name "pounce")
|
(name "pounce")
|
||||||
(version "3.1")
|
(version "3.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://git.causal.agency/pounce/snapshot/pounce-"
|
(uri (string-append "https://git.causal.agency/pounce/snapshot/pounce-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0kk0jrfiwfaybr0i5xih3b0yd4i6v3bz866a7xal1j8wddalbwlp"))
|
(base32 "1i0s76mip9kfmi85bfk10p4k1kg5wkq1gm4l9gadnq9ssxnvzvjs"))
|
||||||
(patches (search-patches "pounce-readable-checks.patch"))))
|
(patches (search-patches "pounce-readable-checks.patch"))))
|
||||||
(outputs '("out" "debug"))
|
(outputs '("out" "debug"))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||||
|
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
|
||||||
|
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2016, 2021, 2021 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2016, 2021, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2016, 2021 Stefan Reichör <stefan@xsteve.at>
|
;;; Copyright © 2016, 2021 Stefan Reichör <stefan@xsteve.at>
|
||||||
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
|
|
||||||
;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||||
|
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
|
||||||
;;; Copyright © 2018-2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018-2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
|
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
|
||||||
;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
;;; Copyright © 2018, 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||||
|
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||||
|
;;; Copyright © 2019, 2023 Vasile Dumitrascu <va511e@yahoo.com>
|
||||||
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
|
;;; Copyright © 2020 Alex ter Weele <alex.ter.weele@gmail.com>
|
||||||
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
|
;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
|
||||||
;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org>
|
;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org>
|
||||||
@@ -19,9 +24,6 @@
|
|||||||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||||
;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
||||||
;;; Copyright © 2025 Christian Birk Sørensen <chrbirks@gmail.com>
|
;;; Copyright © 2025 Christian Birk Sørensen <chrbirks@gmail.com>
|
||||||
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
|
|
||||||
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
|
||||||
;;; Copyright © 2019, 2023 Vasile Dumitrascu <va511e@yahoo.com>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -70,6 +72,7 @@
|
|||||||
#:use-module (gnu packages golang-check)
|
#:use-module (gnu packages golang-check)
|
||||||
#:use-module (gnu packages golang-web)
|
#:use-module (gnu packages golang-web)
|
||||||
#:use-module (gnu packages golang-xyz)
|
#:use-module (gnu packages golang-xyz)
|
||||||
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages lua)
|
#:use-module (gnu packages lua)
|
||||||
#:use-module (gnu packages mail)
|
#:use-module (gnu packages mail)
|
||||||
@@ -411,6 +414,37 @@ system statistics (CPU, disk, and memory usage, etc.) and more on the
|
|||||||
desktop.")
|
desktop.")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public gkrellm
|
||||||
|
(package
|
||||||
|
(name "gkrellm")
|
||||||
|
(version "2.5.1")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append "https://gkrellm.srcbox.net/releases/gkrellm-"
|
||||||
|
version ".tar.bz2"))
|
||||||
|
(sha256
|
||||||
|
(base32 "0qvy2xmwmfy5f0g09yn9lr262shnx82ba04r5il2wj4qscg3r7h8"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(inputs (list gtk+-2 libsm))
|
||||||
|
(native-inputs (list gettext-minimal pkg-config))
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ;there is no check target
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(delete 'configure)) ;no configure script
|
||||||
|
#:make-flags
|
||||||
|
#~(list (string-append "INSTALLROOT=" #$output)
|
||||||
|
(string-append "CC=" #$(cc-for-target)))))
|
||||||
|
(home-page "https://gkrellm.srcbox.net/")
|
||||||
|
(synopsis "System monitors")
|
||||||
|
(description
|
||||||
|
"GKrellM is a single process stack of system monitors which supports
|
||||||
|
applying themes to match its appearance to your window manager, Gtk, or any
|
||||||
|
other theme.")
|
||||||
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public glances
|
(define-public glances
|
||||||
(package
|
(package
|
||||||
(name "glances")
|
(name "glances")
|
||||||
|
|||||||
@@ -531,6 +531,47 @@ MPRIS 2 support.")
|
|||||||
(home-page "https://github.com/eonpatapon/mpDris2")
|
(home-page "https://github.com/eonpatapon/mpDris2")
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
|
(define-public mpdris2-rs
|
||||||
|
(package
|
||||||
|
(name "mpdris2-rs")
|
||||||
|
(version "1.1.1")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/szclsya/mpdris2-rs")
|
||||||
|
(commit (string-append "v" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "023m4g1kgr2q2vllaij7nlxd5gp3vklvbhf5drymgqz3pcmslb52"))))
|
||||||
|
(build-system cargo-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:install-source? #f
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'install 'install-systemd-unit
|
||||||
|
(lambda _
|
||||||
|
(let ((unit-dir (in-vicinity #$output "lib/systemd/user/")))
|
||||||
|
(substitute* "misc/mpdris2-rs.service"
|
||||||
|
(("/usr/local/bin/mpdris2-rs")
|
||||||
|
(in-vicinity #$output "bin/mpdris2-rs")))
|
||||||
|
(install-file "misc/mpdris2-rs.service" unit-dir)))))))
|
||||||
|
(inputs (cargo-inputs 'mpdris2-rs))
|
||||||
|
(home-page "https://github.com/szclsya/mpdris2-rs")
|
||||||
|
(synopsis "Exposing MPRIS V2.2 D-Bus interface for mpd")
|
||||||
|
(description
|
||||||
|
"A lightweight implementation of MPD to D-Bus bridge, which exposes MPD
|
||||||
|
player and playlist information onto MPRIS2 interface so other programs can use
|
||||||
|
this generic interface to retrieve MPD's playback state.
|
||||||
|
|
||||||
|
Distinctively, mpdris2-rs uses MPD protocol's native
|
||||||
|
@command{readpicture}/@command{albumart} methods to fetch album arts. This
|
||||||
|
means mpdris2-rs won't need any access to your local filesystem (apart from
|
||||||
|
your @env{XDG_RUNTIME_DIR} for temporarily storing fetched albumarts) and can
|
||||||
|
provide album arts even with remote MPD servers and Internet radios.")
|
||||||
|
(license license:gpl3)))
|
||||||
|
|
||||||
(define-public cantata
|
(define-public cantata
|
||||||
(package
|
(package
|
||||||
(name "cantata")
|
(name "cantata")
|
||||||
|
|||||||
+3
-95
@@ -76,95 +76,7 @@
|
|||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (ice-9 match))
|
#:use-module (ice-9 match))
|
||||||
|
|
||||||
(define-public hwloc-1
|
(define-public hwloc
|
||||||
(package
|
|
||||||
(name "hwloc")
|
|
||||||
(version "1.11.13")
|
|
||||||
(source (origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append "https://www.open-mpi.org/software/hwloc/v"
|
|
||||||
(version-major+minor version)
|
|
||||||
"/downloads/hwloc-" version ".tar.bz2"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1j69p8a1pjpbpwn4w7l4dfxmaxxqikchjzqw1ncw05zmcmvlnjd4"))
|
|
||||||
(patches (search-patches "hwloc-1-test-btrfs.patch"))))
|
|
||||||
|
|
||||||
(properties
|
|
||||||
;; Tell the 'generic-html' updater to monitor this URL for updates.
|
|
||||||
`((release-monitoring-url
|
|
||||||
. "https://www-lb.open-mpi.org/software/hwloc/current")))
|
|
||||||
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(outputs '("out" ;'lstopo' & co., depends on Cairo, libx11, etc.
|
|
||||||
"lib" ;small closure
|
|
||||||
"doc" ;400+ section 3 man pages
|
|
||||||
"debug"))
|
|
||||||
(inputs
|
|
||||||
(append (if (%current-target-system)
|
|
||||||
'() ;fewer dependencies when cross-compiling
|
|
||||||
(list libx11 cairo ncurses expat))
|
|
||||||
(if (target-arm32?) '() (list numactl))))
|
|
||||||
(propagated-inputs
|
|
||||||
;; hwloc.pc lists it in 'Requires.private'.
|
|
||||||
(list libpciaccess))
|
|
||||||
(native-inputs
|
|
||||||
(list pkg-config))
|
|
||||||
(arguments
|
|
||||||
(list #:configure-flags
|
|
||||||
#~(list "--localstatedir=/var")
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-before 'check 'skip-linux-libnuma-test
|
|
||||||
(lambda _
|
|
||||||
;; Arrange to skip 'tests/linux-libnuma', which fails on some
|
|
||||||
;; machines: <https://github.com/open-mpi/hwloc/issues/213>.
|
|
||||||
(substitute* "tests/linux-libnuma.c"
|
|
||||||
(("numa_available\\(\\)")
|
|
||||||
"-1"))))
|
|
||||||
(add-after 'install 'refine-libnuma
|
|
||||||
;; Give -L arguments for libraries to avoid propagation
|
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
||||||
(let ((out (assoc-ref outputs "lib"))
|
|
||||||
(numa (assoc-ref inputs "numactl")))
|
|
||||||
(substitute* (map (lambda (f) (string-append out "/" f))
|
|
||||||
'("lib/pkgconfig/hwloc.pc" "lib/libhwloc.la"))
|
|
||||||
(("-lnuma" lib)
|
|
||||||
(string-append "-L" numa "/lib " lib))))))
|
|
||||||
(add-after 'install 'avoid-circular-references
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let ((lib (assoc-ref outputs "lib")))
|
|
||||||
;; Suppress the 'prefix=' and 'exec_prefix=' lines so that the
|
|
||||||
;; "lib" output doesn't refer to "out".
|
|
||||||
(substitute* (string-append lib "/lib/pkgconfig/hwloc.pc")
|
|
||||||
(("^.*prefix=.*$")
|
|
||||||
"")))))
|
|
||||||
(add-after 'install 'move-man3-pages
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
;; Move section 3 man pages to the "doc" output.
|
|
||||||
(let ((out (assoc-ref outputs "out"))
|
|
||||||
(doc (assoc-ref outputs "doc")))
|
|
||||||
(copy-recursively (string-append out "/share/man/man3")
|
|
||||||
(string-append doc "/share/man/man3"))
|
|
||||||
(delete-file-recursively
|
|
||||||
(string-append out "/share/man/man3"))))))))
|
|
||||||
(home-page "https://www.open-mpi.org/projects/hwloc/")
|
|
||||||
(synopsis "Abstraction of hardware architectures")
|
|
||||||
(description
|
|
||||||
"hwloc provides a portable abstraction (across OS,
|
|
||||||
versions, architectures, ...) of the hierarchical topology of modern
|
|
||||||
architectures, including NUMA memory nodes, sockets, shared caches, cores and
|
|
||||||
simultaneous multithreading. It also gathers various attributes such as cache
|
|
||||||
and memory information. It primarily aims at helping high-performance
|
|
||||||
computing applications with gathering information about the hardware so as to
|
|
||||||
exploit it accordingly and efficiently.
|
|
||||||
|
|
||||||
hwloc may display the topology in multiple convenient formats. It also offers
|
|
||||||
a powerful programming interface to gather information about the hardware,
|
|
||||||
bind processes, and much more.")
|
|
||||||
(license license:bsd-3)))
|
|
||||||
|
|
||||||
(define-public hwloc-2
|
|
||||||
(package
|
(package
|
||||||
(name "hwloc")
|
(name "hwloc")
|
||||||
(version "2.13.0")
|
(version "2.13.0")
|
||||||
@@ -274,10 +186,6 @@ a powerful programming interface to gather information about the hardware,
|
|||||||
bind processes, and much more.")
|
bind processes, and much more.")
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public hwloc
|
|
||||||
;; The latest stable series of hwloc.
|
|
||||||
hwloc-2)
|
|
||||||
|
|
||||||
(define-public openmpi-4
|
(define-public openmpi-4
|
||||||
(package
|
(package
|
||||||
(name "openmpi")
|
(name "openmpi")
|
||||||
@@ -306,7 +214,7 @@ bind processes, and much more.")
|
|||||||
(package-supported-systems package)))
|
(package-supported-systems package)))
|
||||||
(list package)
|
(list package)
|
||||||
'()))))
|
'()))))
|
||||||
(append (list `(,hwloc-2 "lib")
|
(append (list `(,hwloc "lib")
|
||||||
gfortran
|
gfortran
|
||||||
libfabric-1 ;fails to build with 2.3
|
libfabric-1 ;fails to build with 2.3
|
||||||
libevent
|
libevent
|
||||||
@@ -699,7 +607,7 @@ arrays) that expose a buffer interface.")
|
|||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
`(,zlib
|
`(,zlib
|
||||||
(,hwloc-2 "lib")
|
(,hwloc "lib")
|
||||||
,slurm
|
,slurm
|
||||||
,@(if (and (not (%current-target-system))
|
,@(if (and (not (%current-target-system))
|
||||||
(member (%current-system) (package-supported-systems ucx)))
|
(member (%current-system) (package-supported-systems ucx)))
|
||||||
|
|||||||
@@ -171,6 +171,7 @@
|
|||||||
#:use-module (gnu packages lua)
|
#:use-module (gnu packages lua)
|
||||||
#:use-module (gnu packages machine-learning)
|
#:use-module (gnu packages machine-learning)
|
||||||
#:use-module (gnu packages man)
|
#:use-module (gnu packages man)
|
||||||
|
#:use-module (gnu packages messaging)
|
||||||
#:use-module (gnu packages mp3)
|
#:use-module (gnu packages mp3)
|
||||||
#:use-module (gnu packages mpd)
|
#:use-module (gnu packages mpd)
|
||||||
#:use-module (gnu packages mruby-xyz)
|
#:use-module (gnu packages mruby-xyz)
|
||||||
@@ -593,6 +594,38 @@ updates via @command{mopidy local scan} while Mopidy is running, so you can
|
|||||||
scan your media library periodically, for example from a cron job.")
|
scan your media library periodically, for example from a cron job.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public mopidy-mopiqtt
|
||||||
|
(package
|
||||||
|
(name "mopidy-mopiqtt")
|
||||||
|
(version "1.2.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://github.com/fmarzocca/mopiqtt")
|
||||||
|
(commit version)))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1gaxxbpws9xshsbknq78h0c1k3ynvc466hkq4952pv00q203zqk4"))
|
||||||
|
;; XXX: https://github.com/fmarzocca/Mopiqtt/issues/6
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
'(begin
|
||||||
|
(substitute* "tests/test_smoke.py"
|
||||||
|
(("mqtt")
|
||||||
|
"mopiqtt"))
|
||||||
|
(substitute* "tests/conftest.py"
|
||||||
|
(("mqtt")
|
||||||
|
"mopiqtt"))))))
|
||||||
|
(build-system pyproject-build-system)
|
||||||
|
(native-inputs (list python-pytest python-setuptools))
|
||||||
|
(propagated-inputs (list mopidy python-paho-mqtt python-pykka))
|
||||||
|
(home-page "https://github.com/fmarzocca/mopiqtt")
|
||||||
|
(synopsis "MQTT interface for Mopidy")
|
||||||
|
(description
|
||||||
|
"This package provides an MQTT interface extension for Mopidy music server.")
|
||||||
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public clementine
|
(define-public clementine
|
||||||
;; Clementine has one automatic release per commit at
|
;; Clementine has one automatic release per commit at
|
||||||
;; <https://github.com/clementine-player/Clementine/releases>.
|
;; <https://github.com/clementine-player/Clementine/releases>.
|
||||||
|
|||||||
+24
-24
@@ -89,33 +89,13 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages networking)
|
(define-module (gnu packages networking)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix gexp)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix build-system cmake)
|
|
||||||
#:use-module (guix build-system copy)
|
|
||||||
#:use-module (guix build-system glib-or-gtk)
|
|
||||||
#:use-module (guix build-system gnu)
|
|
||||||
#:use-module (guix build-system go)
|
|
||||||
#:use-module (guix build-system meson)
|
|
||||||
#:use-module (guix build-system perl)
|
|
||||||
#:use-module (guix build-system pyproject)
|
|
||||||
#:use-module (guix build-system python)
|
|
||||||
#:use-module (guix build-system pyproject)
|
|
||||||
#:use-module (guix build-system qt)
|
|
||||||
#:use-module (guix build-system trivial)
|
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
#:use-module (gnu packages adns)
|
|
||||||
#:use-module (gnu packages aidc)
|
#:use-module (gnu packages aidc)
|
||||||
#:use-module (gnu packages algebra)
|
#:use-module (gnu packages algebra)
|
||||||
|
#:use-module (gnu packages assembly)
|
||||||
#:use-module (gnu packages audio)
|
#:use-module (gnu packages audio)
|
||||||
#:use-module (gnu packages autogen)
|
#:use-module (gnu packages autogen)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages assembly)
|
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages bison)
|
#:use-module (gnu packages bison)
|
||||||
@@ -131,6 +111,7 @@
|
|||||||
#:use-module (gnu packages cyrus-sasl)
|
#:use-module (gnu packages cyrus-sasl)
|
||||||
#:use-module (gnu packages dejagnu)
|
#:use-module (gnu packages dejagnu)
|
||||||
#:use-module (gnu packages dns)
|
#:use-module (gnu packages dns)
|
||||||
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages docbook)
|
#:use-module (gnu packages docbook)
|
||||||
#:use-module (gnu packages documentation)
|
#:use-module (gnu packages documentation)
|
||||||
#:use-module (gnu packages elf)
|
#:use-module (gnu packages elf)
|
||||||
@@ -154,21 +135,21 @@
|
|||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages kde-frameworks)
|
#:use-module (gnu packages kde-frameworks)
|
||||||
|
#:use-module (gnu packages kerberos)
|
||||||
#:use-module (gnu packages libbsd)
|
#:use-module (gnu packages libbsd)
|
||||||
#:use-module (gnu packages libevent)
|
#:use-module (gnu packages libevent)
|
||||||
#:use-module (gnu packages libidn)
|
#:use-module (gnu packages libidn)
|
||||||
#:use-module (gnu packages libusb)
|
#:use-module (gnu packages libusb)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages logging)
|
#:use-module (gnu packages logging)
|
||||||
#:use-module (gnu packages lxqt)
|
|
||||||
#:use-module (gnu packages lua)
|
#:use-module (gnu packages lua)
|
||||||
#:use-module (gnu packages kerberos)
|
#:use-module (gnu packages lxqt)
|
||||||
#:use-module (gnu packages man)
|
#:use-module (gnu packages man)
|
||||||
#:use-module (gnu packages mpi)
|
#:use-module (gnu packages mpi)
|
||||||
#:use-module (gnu packages ncurses)
|
#:use-module (gnu packages ncurses)
|
||||||
#:use-module (gnu packages nettle)
|
#:use-module (gnu packages nettle)
|
||||||
#:use-module (gnu packages openldap)
|
|
||||||
#:use-module (gnu packages onc-rpc)
|
#:use-module (gnu packages onc-rpc)
|
||||||
|
#:use-module (gnu packages openldap)
|
||||||
#:use-module (gnu packages password-utils)
|
#:use-module (gnu packages password-utils)
|
||||||
#:use-module (gnu packages pcre)
|
#:use-module (gnu packages pcre)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
@@ -204,6 +185,25 @@
|
|||||||
#:use-module (gnu packages wxwidgets)
|
#:use-module (gnu packages wxwidgets)
|
||||||
#:use-module (gnu packages xiph)
|
#:use-module (gnu packages xiph)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
|
#:use-module (guix build-system copy)
|
||||||
|
#:use-module (guix build-system glib-or-gtk)
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system go)
|
||||||
|
#:use-module (guix build-system meson)
|
||||||
|
#:use-module (guix build-system perl)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system qt)
|
||||||
|
#:use-module (guix build-system trivial)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix utils)
|
||||||
#:use-module (ice-9 match))
|
#:use-module (ice-9 match))
|
||||||
|
|
||||||
(define-public usrsctp
|
(define-public usrsctp
|
||||||
|
|||||||
+13
-13
@@ -31,20 +31,10 @@
|
|||||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
(define-module (gnu packages node)
|
(define-module (gnu packages node)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
|
||||||
#:use-module ((guix build utils) #:select (alist-replace))
|
|
||||||
#:use-module (guix packages)
|
|
||||||
#:use-module (guix derivations)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (guix build-system gnu)
|
|
||||||
#:use-module (guix build-system node)
|
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (gnu packages adns)
|
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages dns)
|
||||||
#:use-module (gnu packages gcc)
|
#:use-module (gnu packages gcc)
|
||||||
#:use-module (gnu packages icu4c)
|
#:use-module (gnu packages icu4c)
|
||||||
#:use-module (gnu packages libevent)
|
#:use-module (gnu packages libevent)
|
||||||
@@ -55,6 +45,16 @@
|
|||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages web)
|
#:use-module (gnu packages web)
|
||||||
|
#:use-module (gnu packages)
|
||||||
|
#:use-module ((guix build utils) #:select (alist-replace))
|
||||||
|
#:use-module (guix build-system gnu)
|
||||||
|
#:use-module (guix build-system node)
|
||||||
|
#:use-module (guix derivations)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix utils)
|
||||||
#:use-module (ice-9 match)
|
#:use-module (ice-9 match)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (srfi srfi-26))
|
#:use-module (srfi srfi-26))
|
||||||
@@ -966,7 +966,7 @@ fi"
|
|||||||
icu4c-76
|
icu4c-76
|
||||||
libuv-for-node-lts
|
libuv-for-node-lts
|
||||||
`(,nghttp2 "lib")
|
`(,nghttp2 "lib")
|
||||||
openssl
|
openssl-3.0
|
||||||
zlib
|
zlib
|
||||||
; ngtcp2? nghttp3?
|
; ngtcp2? nghttp3?
|
||||||
;; Regular build-time dependencies.
|
;; Regular build-time dependencies.
|
||||||
@@ -986,7 +986,7 @@ fi"
|
|||||||
ngtcp2
|
ngtcp2
|
||||||
nghttp3
|
nghttp3
|
||||||
`(,nghttp2 "lib")
|
`(,nghttp2 "lib")
|
||||||
openssl
|
openssl-3.0
|
||||||
zlib))
|
zlib))
|
||||||
(supported-systems
|
(supported-systems
|
||||||
(cons "riscv64-linux" (package-supported-systems node-bootstrap)))
|
(cons "riscv64-linux" (package-supported-systems node-bootstrap)))
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ This package tracks the Extended Support Release (ESR) channel.")
|
|||||||
(package
|
(package
|
||||||
(inherit nss)
|
(inherit nss)
|
||||||
(name "nss-rapid")
|
(name "nss-rapid")
|
||||||
(version "3.121")
|
(version "3.123")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(inherit (package-source nss))
|
(inherit (package-source nss))
|
||||||
@@ -297,7 +297,7 @@ This package tracks the Extended Support Release (ESR) channel.")
|
|||||||
"releases/NSS_" version-with-underscores "_RTM/src/"
|
"releases/NSS_" version-with-underscores "_RTM/src/"
|
||||||
"nss-" version ".tar.gz")))
|
"nss-" version ".tar.gz")))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0bk3lxmj364vlf4x2q01pf0li3mm5ixgnfnxirxqp9xyh63qyfnb"))
|
(base32 "0jafdl18q9j36bwk73i462qkc24070b5llchffd7fsd2k0ri2i91"))
|
||||||
(patches
|
(patches
|
||||||
(search-patches "nss-3.56-pkgconfig.patch"
|
(search-patches "nss-3.56-pkgconfig.patch"
|
||||||
"nss-getcwd-nonnull.patch"
|
"nss-getcwd-nonnull.patch"
|
||||||
|
|||||||
@@ -173,7 +173,7 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.")
|
|||||||
(native-inputs (list which pkg-config))
|
(native-inputs (list which pkg-config))
|
||||||
(inputs (cons* guile-3.0 ; for wrap-script
|
(inputs (cons* guile-3.0 ; for wrap-script
|
||||||
libevent
|
libevent
|
||||||
openssl
|
openssl-3.0
|
||||||
perl
|
perl
|
||||||
perl-http-tiny
|
perl-http-tiny
|
||||||
perl-io-socket-ssl
|
perl-io-socket-ssl
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user