mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-07-10 11:24:08 +02:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b5f2d456b | |||
| e1e28adb79 | |||
| ea66f97ff3 | |||
| 76ac03cb0b | |||
| f88a63b636 |
@@ -16,8 +16,6 @@
|
|||||||
( ;; primary: "D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F"
|
( ;; primary: "D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F"
|
||||||
"01FD 85F4 1A7B 7F82 0583 06A5 935E BE07 36DC 857E"
|
"01FD 85F4 1A7B 7F82 0583 06A5 935E BE07 36DC 857E"
|
||||||
(name "avp"))
|
(name "avp"))
|
||||||
("5D54 CF25 57B2 38E8 8DC1 80A2 2D22 3241 0AB7 4043"
|
|
||||||
(name "baleine"))
|
|
||||||
( ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E"
|
( ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E"
|
||||||
"A3A4 B419 0074 087C A7DE 5698 BC45 CA67 E2F8 D007"
|
"A3A4 B419 0074 087C A7DE 5698 BC45 CA67 E2F8 D007"
|
||||||
(name "bavier"))
|
(name "bavier"))
|
||||||
|
|||||||
+6
-6
@@ -13,6 +13,7 @@ gnu/packages/fluidplug\.scm @guix/audio
|
|||||||
gnu/packages/music\.scm @guix/audio
|
gnu/packages/music\.scm @guix/audio
|
||||||
gnu/packages/xiph\.scm @guix/audio
|
gnu/packages/xiph\.scm @guix/audio
|
||||||
|
|
||||||
|
gnu/packages/beam-.+\.scm$ @guix/beam
|
||||||
gnu/packages/elixir(-.+|)\.scm$ @guix/beam
|
gnu/packages/elixir(-.+|)\.scm$ @guix/beam
|
||||||
guix/build/mix-build-system\.scm @guix/beam
|
guix/build/mix-build-system\.scm @guix/beam
|
||||||
guix/build-system/mix\.scm @guix/beam
|
guix/build-system/mix\.scm @guix/beam
|
||||||
@@ -20,7 +21,12 @@ gnu/packages/erlang(-.+|)\.scm$ @guix/beam
|
|||||||
guix/build/rebar-build-system\.scm @guix/beam
|
guix/build/rebar-build-system\.scm @guix/beam
|
||||||
guix/build-system/rebar\.scm @guix/beam
|
guix/build-system/rebar\.scm @guix/beam
|
||||||
guix/import/hexpm\.scm @guix/beam
|
guix/import/hexpm\.scm @guix/beam
|
||||||
|
guix/import/mix\.scm @guix/beam
|
||||||
|
guix/import/mix/mix-lock\.scm @guix/beam
|
||||||
guix/scripts/import/hexpm\.scm @guix/beam
|
guix/scripts/import/hexpm\.scm @guix/beam
|
||||||
|
guix/scripts/import/mix\.scm @guix/beam
|
||||||
|
tests/import/hexpm\.scm @guix/beam
|
||||||
|
tests/import/mix\.scm @guix/beam
|
||||||
|
|
||||||
gnu/packages/bioinformatics\.scm @guix/bioinformatics
|
gnu/packages/bioinformatics\.scm @guix/bioinformatics
|
||||||
|
|
||||||
@@ -68,7 +74,6 @@ 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
|
||||||
@@ -179,7 +184,6 @@ 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
|
||||||
@@ -264,7 +268,6 @@ gnu/installer(\.scm$|/) @guix/installer
|
|||||||
gnu/packages/clojure\.scm @guix/java
|
gnu/packages/clojure\.scm @guix/java
|
||||||
gnu/packages/java(-.+|)\.scm$ @guix/java
|
gnu/packages/java(-.+|)\.scm$ @guix/java
|
||||||
gnu/packages/maven(-.+|)\.scm$ @guix/java
|
gnu/packages/maven(-.+|)\.scm$ @guix/java
|
||||||
gnu/packages/netbeans\.scm @guix/java
|
|
||||||
guix/build/ant-build-system\.scm @guix/java
|
guix/build/ant-build-system\.scm @guix/java
|
||||||
guix/build/clojure-build-system\.scm @guix/java
|
guix/build/clojure-build-system\.scm @guix/java
|
||||||
guix/build/clojure-utils\.scm @guix/java
|
guix/build/clojure-utils\.scm @guix/java
|
||||||
@@ -275,7 +278,6 @@ guix/build-system/ant\.scm @guix/java
|
|||||||
guix/build-system/clojure\.scm @guix/java
|
guix/build-system/clojure\.scm @guix/java
|
||||||
guix/build-system/maven\.scm @guix/java
|
guix/build-system/maven\.scm @guix/java
|
||||||
|
|
||||||
gnu/packages/javascript\.scm @guix/javascript
|
|
||||||
gnu/packages/node-xyz\.scm @guix/javascript
|
gnu/packages/node-xyz\.scm @guix/javascript
|
||||||
gnu/packages/node\.scm @guix/javascript
|
gnu/packages/node\.scm @guix/javascript
|
||||||
guix/build-system/node\.scm @guix/javascript
|
guix/build-system/node\.scm @guix/javascript
|
||||||
@@ -321,7 +323,6 @@ 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
|
||||||
@@ -489,7 +490,6 @@ 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
|
||||||
|
|||||||
+5
-4
@@ -22,6 +22,7 @@
|
|||||||
# Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
|
# Copyright © 2024 gemmaro <gemmaro.dev@gmail.com>
|
||||||
# Copyright © 2025 Brice Waegeneire <brice@waegenei.re>
|
# Copyright © 2025 Brice Waegeneire <brice@waegenei.re>
|
||||||
# Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
|
# Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
|
||||||
|
# Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
|
||||||
#
|
#
|
||||||
# This file is part of GNU Guix.
|
# This file is part of GNU Guix.
|
||||||
#
|
#
|
||||||
@@ -104,7 +105,6 @@ 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 \
|
||||||
@@ -237,7 +237,6 @@ 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 \
|
||||||
@@ -322,6 +321,8 @@ MODULES = \
|
|||||||
guix/import/launchpad.scm \
|
guix/import/launchpad.scm \
|
||||||
guix/import/luanti.scm \
|
guix/import/luanti.scm \
|
||||||
guix/import/minetest.scm \
|
guix/import/minetest.scm \
|
||||||
|
guix/import/mix.scm \
|
||||||
|
guix/import/mix/mix-lock.scm \
|
||||||
guix/import/nuget.scm \
|
guix/import/nuget.scm \
|
||||||
guix/import/npm-binary.scm \
|
guix/import/npm-binary.scm \
|
||||||
guix/import/opam.scm \
|
guix/import/opam.scm \
|
||||||
@@ -379,6 +380,7 @@ MODULES = \
|
|||||||
guix/scripts/import/json.scm \
|
guix/scripts/import/json.scm \
|
||||||
guix/scripts/import/luanti.scm \
|
guix/scripts/import/luanti.scm \
|
||||||
guix/scripts/import/minetest.scm \
|
guix/scripts/import/minetest.scm \
|
||||||
|
guix/scripts/import/mix.scm \
|
||||||
guix/scripts/import/npm-binary.scm \
|
guix/scripts/import/npm-binary.scm \
|
||||||
guix/scripts/import/nuget.scm \
|
guix/scripts/import/nuget.scm \
|
||||||
guix/scripts/import/opam.scm \
|
guix/scripts/import/opam.scm \
|
||||||
@@ -457,8 +459,6 @@ AUX_FILES = \
|
|||||||
gnu/packages/aux-files/findclass.php \
|
gnu/packages/aux-files/findclass.php \
|
||||||
gnu/packages/aux-files/guix.vim \
|
gnu/packages/aux-files/guix.vim \
|
||||||
gnu/packages/aux-files/guix-nvim.vim \
|
gnu/packages/aux-files/guix-nvim.vim \
|
||||||
gnu/packages/aux-files/linux-libre/7.0-arm64.conf \
|
|
||||||
gnu/packages/aux-files/linux-libre/7.0-x86_64.conf \
|
|
||||||
gnu/packages/aux-files/linux-libre/6.19-arm64.conf \
|
gnu/packages/aux-files/linux-libre/6.19-arm64.conf \
|
||||||
gnu/packages/aux-files/linux-libre/6.19-i686.conf \
|
gnu/packages/aux-files/linux-libre/6.19-i686.conf \
|
||||||
gnu/packages/aux-files/linux-libre/6.19-x86_64.conf \
|
gnu/packages/aux-files/linux-libre/6.19-x86_64.conf \
|
||||||
@@ -581,6 +581,7 @@ SCM_TESTS = \
|
|||||||
tests/import/hackage.scm \
|
tests/import/hackage.scm \
|
||||||
tests/import/hexpm.scm \
|
tests/import/hexpm.scm \
|
||||||
tests/import/luanti.scm \
|
tests/import/luanti.scm \
|
||||||
|
tests/import/mix.scm \
|
||||||
tests/import/npm-binary.scm \
|
tests/import/npm-binary.scm \
|
||||||
tests/import/nuget.scm \
|
tests/import/nuget.scm \
|
||||||
tests/import/opam.scm \
|
tests/import/opam.scm \
|
||||||
|
|||||||
@@ -18,10 +18,6 @@ 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,9 +1667,6 @@ 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}).
|
||||||
|
|
||||||
@@ -1699,68 +1696,6 @@ 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
|
||||||
@@ -2715,7 +2650,6 @@ 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
|
||||||
@@ -2730,26 +2664,6 @@ 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
|
||||||
|
|
||||||
|
|||||||
+92
-310
@@ -29,6 +29,7 @@ Copyright @copyright{} 2025 45mg@*
|
|||||||
Copyright @copyright{} 2023 Marek Felšöci@*
|
Copyright @copyright{} 2023 Marek Felšöci@*
|
||||||
Copyright @copyright{} 2023 Konrad Hinsen@*
|
Copyright @copyright{} 2023 Konrad Hinsen@*
|
||||||
Copyright @copyright{} 2023 Philippe Swartvagher@*
|
Copyright @copyright{} 2023 Philippe Swartvagher@*
|
||||||
|
Copyright @copyright{} 2026 Igorj Gorjaĉev@*
|
||||||
|
|
||||||
Permission is granted to copy, distribute and/or modify this document
|
Permission is granted to copy, distribute and/or modify this document
|
||||||
under the terms of the GNU Free Documentation License, Version 1.3 or
|
under the terms of the GNU Free Documentation License, Version 1.3 or
|
||||||
@@ -140,14 +141,13 @@ Programmable and automated package definition
|
|||||||
Packaging Workflows
|
Packaging Workflows
|
||||||
|
|
||||||
* Packaging Rust Crates::
|
* Packaging Rust Crates::
|
||||||
|
* Packaging Elixir Applications::
|
||||||
|
|
||||||
Packaging Rust Crates
|
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
|
||||||
|
|
||||||
@@ -1634,6 +1634,7 @@ systems, serving as extensions to the concise packaging guidelines
|
|||||||
|
|
||||||
@menu
|
@menu
|
||||||
* Packaging Rust Crates::
|
* Packaging Rust Crates::
|
||||||
|
* Packaging Elixir Applications::
|
||||||
@end menu
|
@end menu
|
||||||
|
|
||||||
@node Packaging Rust Crates
|
@node Packaging Rust Crates
|
||||||
@@ -1649,8 +1650,6 @@ $ 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
|
||||||
@@ -1709,15 +1708,6 @@ $ 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
|
||||||
@@ -2000,316 +1990,108 @@ 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
|
@node Packaging Elixir Applications
|
||||||
@subsubsection Common Workflow for Updating Existing Rust Packages
|
@subsection Packaging Elixir Applications
|
||||||
|
|
||||||
For this example, we'll update @code{niri}. The package definition looks like
|
In preparation, add the following packages to your environment:
|
||||||
this initially:
|
|
||||||
|
@example
|
||||||
|
$ guix shell elixir elixir-depscheck elixir-mix-audit
|
||||||
|
@end example
|
||||||
|
|
||||||
|
In this example, we package @uref{https://livebook.dev, livebook},
|
||||||
|
which is an interactive, web-based notebook environment for writing,
|
||||||
|
running, and sharing Elixir code with rich documentation and
|
||||||
|
visualizations.
|
||||||
|
|
||||||
|
@enumerate
|
||||||
|
@item
|
||||||
|
We retrieve the @code{livebook} source code with the latest version
|
||||||
|
from the corresponding @code{git} repository:
|
||||||
|
|
||||||
|
@example
|
||||||
|
$ git clone --branch v0.18.2 --depth 1 \
|
||||||
|
https://github.com/livebook-dev/livebook
|
||||||
|
@end example
|
||||||
|
|
||||||
|
We should prepare the following definiton for this package (the suggested
|
||||||
|
location for this definition should be @code{gnu/packages/beam-packages.scm}
|
||||||
|
or up to your mind):
|
||||||
|
|
||||||
@lisp
|
@lisp
|
||||||
(define-public niri
|
(define-public livebook
|
||||||
(package
|
(package
|
||||||
(name "niri")
|
(name "livebook")
|
||||||
(version "25.08")
|
(version "0.18.2")
|
||||||
(source (origin
|
(source
|
||||||
(method git-fetch)
|
(origin
|
||||||
(uri (git-reference
|
(method git-fetch)
|
||||||
(url "https://github.com/YaLTeR/niri")
|
(uri (git-reference
|
||||||
(commit (string-append "v" version))))
|
(url "https://github.com/livebook-dev/livebook")
|
||||||
(file-name (git-file-name name version))
|
(commit (string-append "v" version))))
|
||||||
(sha256
|
(file-name (git-file-name name version))
|
||||||
(base32
|
(sha256
|
||||||
"09nsxd211mly8r1ys2lq6ia4jxgb980h1axrbgw748r0knfbbj7n"))))
|
(base32
|
||||||
(build-system cargo-build-system)
|
"1pq227nabslr7gh4qvg24wj4320djc0vrh6x6l23g3468x6znxjm"))))
|
||||||
...
|
(build-system mix-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:tests? #f ; TODO: make them work a little bit later
|
||||||
|
#:vendorize? #t
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(replace 'install
|
||||||
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
(let ((out (assoc-ref outputs "out")))
|
||||||
|
(copy-recursively "_build/prod/rel/livebook/"
|
||||||
|
out)))))))
|
||||||
|
(inputs (mix-inputs 'livebook))
|
||||||
|
(synopsis "Web application for writing code notebooks")
|
||||||
|
(description "This package provides @code{Livebook}, a web application
|
||||||
|
for writing interactive and collaborative code notebooks.")
|
||||||
|
(home-page "https://livebook.dev/")
|
||||||
|
(license license:asl2.0)))
|
||||||
@end lisp
|
@end lisp
|
||||||
|
|
||||||
We start by running the usual @command{guix refresh -u niri}.
|
The identifier used to invoke @code{mix-inputs}, in this case the scheme
|
||||||
|
symbol @code{'livebook}, must be unique, usually matching the variable name
|
||||||
|
of the package.
|
||||||
|
|
||||||
The @command{-u} flag will update in place the version and hash for the
|
@item
|
||||||
@code{niri} package.
|
Navigate to the unpacked directory, then run the following commands:
|
||||||
|
|
||||||
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
|
@example
|
||||||
$ git rebase --abort
|
$ mix deps.get
|
||||||
|
$ mix deps.audit
|
||||||
|
$ mix depscheck --verbose
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
@cindex git rebase --interactive
|
@command{mix deps.audit} checks known vulnerabilities and @command{mix
|
||||||
@cindex interactive rebase
|
depscheck --verbose} checks licenses, for all the dependencies. We must
|
||||||
To begin, we interactively rebase our PR branch by marking as
|
have an acceptable output (i.e. message ``No vulnerabilities found.'') of
|
||||||
@code{edit} the commit we want to edit, which is the one containing the
|
@command{mix deps.audit} and ensure all dependencies are licensed with our
|
||||||
@file{gnu/packages/rust-crates.scm} changes:
|
supported licenses (@pxref{Defining Packages,,, guix, GNU Guix Reference Manual}).
|
||||||
|
|
||||||
|
@item
|
||||||
|
Import dependencies from the lockfile:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
# Change 1 to the number of relevant commits
|
$ guix import --insert=gnu/packages/beam-packages.scm \
|
||||||
$ git rebase -i HEAD~1
|
mix --lockfile=/path/to/mix.lock livebook
|
||||||
|
|
||||||
|
# or:
|
||||||
|
$ guix import -i gnu/packages/beam-packages.scm \
|
||||||
|
mix -f /path/to/mix.lock livebook
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
In our example, we would mark the @code{codeberg-cli} commit like so:
|
After that the package could be build by using the following command:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
edit 6ef4f1ad043 # gnu: codeberg-cli: Update to 0.5.4.
|
$ guix build livebook
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
After that, we'll be in rebase mode, where we can restore the changes made to
|
@end enumerate
|
||||||
@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
|
||||||
@@ -3256,8 +3038,8 @@ your Linode Summary section.) Now you can run the "install guix from
|
|||||||
|
|
||||||
@example
|
@example
|
||||||
sudo apt-get install gpg
|
sudo apt-get install gpg
|
||||||
wget https://codeberg.org/efraim.gpg -qO - | gpg --import -
|
wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -
|
||||||
wget https://guix.gnu.org/guix-install.sh
|
wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
|
||||||
chmod +x guix-install.sh
|
chmod +x guix-install.sh
|
||||||
./guix-install.sh
|
./guix-install.sh
|
||||||
guix pull
|
guix pull
|
||||||
@@ -3436,7 +3218,7 @@ Now you can run the "install guix from @pxref{Binary Installation,,,
|
|||||||
guix, GNU Guix}" steps:
|
guix, GNU Guix}" steps:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
wget https://guix.gnu.org/guix-install.sh
|
wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh
|
||||||
chmod +x guix-install.sh
|
chmod +x guix-install.sh
|
||||||
./guix-install.sh
|
./guix-install.sh
|
||||||
guix pull
|
guix pull
|
||||||
@@ -4491,7 +4273,7 @@ network. Assuming your interface is named @samp{enp2s0}, the following
|
|||||||
command can be used to do so:
|
command can be used to do so:
|
||||||
|
|
||||||
@example sh
|
@example sh
|
||||||
# nmcli con add type bridge-slave autoconnect yes ifname enp2s0 master br0
|
# nmcli con add type bridge-slave ifname enp2s0 master br0
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
@quotation Important
|
@quotation Important
|
||||||
@@ -4527,8 +4309,8 @@ bridge interface, as the default is to deny all. Add the following to
|
|||||||
your list of services to do so:
|
your list of services to do so:
|
||||||
|
|
||||||
@example lisp
|
@example lisp
|
||||||
(extra-special-file "/etc/qemu/bridge.conf"
|
(extra-special-file "/etc/qemu/host.conf"
|
||||||
(plain-file "bridge.conf" "allow br0\n"))
|
(plain-file "host.conf" "allow br0\n"))
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
@subsection Invoking QEMU with the right command line options
|
@subsection Invoking QEMU with the right command line options
|
||||||
@@ -4546,7 +4328,7 @@ machine making use of the bridge would cause networking issues.
|
|||||||
@example sh
|
@example sh
|
||||||
$ qemu-system-x86_64 [...] \
|
$ qemu-system-x86_64 [...] \
|
||||||
-device virtio-net-pci,netdev=user0,mac=XX:XX:XX:XX:XX:XX \
|
-device virtio-net-pci,netdev=user0,mac=XX:XX:XX:XX:XX:XX \
|
||||||
-netdev bridge,helper=/run/privileged/bin/qemu-bridge-helper,id=user0,br=br0 \
|
-netdev bridge,id=user0,br=br0 \
|
||||||
[...]
|
[...]
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
|
|||||||
+67
-230
@@ -10,8 +10,8 @@
|
|||||||
@include version.texi
|
@include version.texi
|
||||||
|
|
||||||
@c Identifier of the OpenPGP key used to sign tarballs and such.
|
@c Identifier of the OpenPGP key used to sign tarballs and such.
|
||||||
@set OPENPGP-SIGNING-KEY-ID A28BF40C3E551372662D14F741AAE7DCCA3D8351
|
@set OPENPGP-SIGNING-KEY-ID 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
|
||||||
@set OPENPGP-SIGNING-KEY-URL https://codeberg.org/efraim.gpg
|
@set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=15145
|
||||||
|
|
||||||
@c Base URL for downloads.
|
@c Base URL for downloads.
|
||||||
@set BASE-URL https://ftpmirror.gnu.org/gnu/guix
|
@set BASE-URL https://ftpmirror.gnu.org/gnu/guix
|
||||||
@@ -151,6 +151,7 @@ Copyright @copyright{} 2025 Noé Lopez@*
|
|||||||
Copyright @copyright{} 2026 David Elsing@*
|
Copyright @copyright{} 2026 David Elsing@*
|
||||||
Copyright @copyright{} 2026 Nguyễn Gia Phong@*
|
Copyright @copyright{} 2026 Nguyễn Gia Phong@*
|
||||||
Copyright @copyright{} 2026 Yarl Baudig@*
|
Copyright @copyright{} 2026 Yarl Baudig@*
|
||||||
|
Copyright @copyright{} 2026 Igorj Gorjaĉev@*
|
||||||
|
|
||||||
Permission is granted to copy, distribute and/or modify this document
|
Permission is granted to copy, distribute and/or modify this document
|
||||||
under the terms of the GNU Free Documentation License, Version 1.3 or
|
under the terms of the GNU Free Documentation License, Version 1.3 or
|
||||||
@@ -2658,13 +2659,12 @@ bootloaders.
|
|||||||
|
|
||||||
Once you are done partitioning the target hard disk drive, you have to
|
Once you are done partitioning the target hard disk drive, you have to
|
||||||
create a file system on the relevant partition(s)@footnote{Currently
|
create a file system on the relevant partition(s)@footnote{Currently
|
||||||
Guix System can mount only ext4, btrfs, JFS, F2FS, and XFS file systems
|
Guix System supports only ext4, btrfs, bcachefs, JFS, F2FS, and XFS
|
||||||
at boot time. In particular, code that reads file system UUIDs and
|
file systems. In particular, code that reads file system UUIDs and
|
||||||
labels works only for these file system types. The code for bcachefs is
|
labels works only for these file system types. For bcachefs, also add
|
||||||
in place, but support for loading out-of-tree kernel modules in the
|
the @code{bcachefs-linux-module} to your @code{operating-system}'s
|
||||||
initrd is not.}.
|
@code{initrd-modules}.}. For the ESP, if you have one and assuming it is
|
||||||
|
@file{/dev/sda1}, run:
|
||||||
For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:
|
|
||||||
|
|
||||||
@example
|
@example
|
||||||
mkfs.fat -F32 /dev/sda1
|
mkfs.fat -F32 /dev/sda1
|
||||||
@@ -6591,21 +6591,6 @@ directory within the container. If this is undesirable,
|
|||||||
be automatically shared and will change to the user's home directory
|
be automatically shared and will change to the user's home directory
|
||||||
within the container instead. See also @option{--user}.
|
within the container instead. See also @option{--user}.
|
||||||
|
|
||||||
@item --cwd=@var{directory}
|
|
||||||
For containers, change to @var{directory} inside the container instead
|
|
||||||
of the default location. The default location is the current working
|
|
||||||
directory when @option{--no-cwd} is not used, or the user's home
|
|
||||||
directory when @option{--no-cwd} is used. When @var{directory} is a
|
|
||||||
relative file name, it is interpreted relative to the current working
|
|
||||||
directory on the host. Note that @option{--cwd} does not automatically
|
|
||||||
share @var{directory}---you must ensure it is accessible via the default
|
|
||||||
current directory sharing or explicit @option{--share}/@option{--expose}
|
|
||||||
options. For example:
|
|
||||||
|
|
||||||
@example
|
|
||||||
guix shell --container --cwd=/tmp --share=/tmp coreutils
|
|
||||||
@end example
|
|
||||||
|
|
||||||
@item --writable-root
|
@item --writable-root
|
||||||
When using @option{--container}, this option makes the root file system
|
When using @option{--container}, this option makes the root file system
|
||||||
writable (it is read-only by default).
|
writable (it is read-only by default).
|
||||||
@@ -7107,17 +7092,6 @@ directory within the container. If this is undesirable,
|
|||||||
be automatically shared and will change to the user's home directory
|
be automatically shared and will change to the user's home directory
|
||||||
within the container instead. See also @option{--user}.
|
within the container instead. See also @option{--user}.
|
||||||
|
|
||||||
@item --cwd=@var{directory}
|
|
||||||
For containers, change to @var{directory} inside the container instead
|
|
||||||
of the default location. The default location is the current working
|
|
||||||
directory when @option{--no-cwd} is not used, or the user's home
|
|
||||||
directory when @option{--no-cwd} is used. When @var{directory} is a
|
|
||||||
relative file name, it is interpreted relative to the current working
|
|
||||||
directory on the host. Note that @option{--cwd} does not automatically
|
|
||||||
share @var{directory}---you must ensure it is accessible via the default
|
|
||||||
current directory sharing or explicit @option{--share}/@option{--expose}
|
|
||||||
options.
|
|
||||||
|
|
||||||
@item --expose=@var{source}[=@var{target}]
|
@item --expose=@var{source}[=@var{target}]
|
||||||
@itemx --share=@var{source}[=@var{target}]
|
@itemx --share=@var{source}[=@var{target}]
|
||||||
For containers, @option{--expose} (resp. @option{--share}) exposes the
|
For containers, @option{--expose} (resp. @option{--share}) exposes the
|
||||||
@@ -8764,52 +8738,6 @@ 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
|
||||||
|
|
||||||
@@ -8870,12 +8798,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/inherit gdb
|
(package
|
||||||
|
(inherit gdb)
|
||||||
(inputs (modify-inputs inputs
|
(inputs (modify-inputs inputs
|
||||||
(delete "guile")))))
|
(delete "guile")))))
|
||||||
@end lisp
|
@end lisp
|
||||||
@@ -8883,23 +8811,6 @@ 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.
|
||||||
|
|
||||||
@@ -14884,7 +14795,7 @@ provided through NuGet's v3 API at @code{api.nuget.org} and includes
|
|||||||
most relevant information, including package dependencies.
|
most relevant information, including package dependencies.
|
||||||
There are some caveats, however. The metadata does not always include
|
There are some caveats, however. The metadata does not always include
|
||||||
repository information, in which case the importer attempts to extract
|
repository information, in which case the importer attempts to extract
|
||||||
it from the symbol package (@file{.snupkg}) if available.
|
it from the symbol package (@file{.snupkg}) if available.
|
||||||
Additionally, dependencies are grouped by target framework in NuGet,
|
Additionally, dependencies are grouped by target framework in NuGet,
|
||||||
but the importer flattens all dependency groups into a single list.
|
but the importer flattens all dependency groups into a single list.
|
||||||
|
|
||||||
@@ -15478,6 +15389,31 @@ Additional options include:
|
|||||||
Traverse the dependency graph of the given upstream package recursively
|
Traverse the dependency graph of the given upstream package recursively
|
||||||
and generate package expressions for all those packages that are not yet
|
and generate package expressions for all those packages that are not yet
|
||||||
in Guix.
|
in Guix.
|
||||||
|
@item --mix-inputs
|
||||||
|
@itemx -m
|
||||||
|
Use vendored @code{mix-inputs} for @code{input} field instead of common
|
||||||
|
dependencies.
|
||||||
|
@end table
|
||||||
|
|
||||||
|
@item mix
|
||||||
|
@cindex mix
|
||||||
|
Import metadata from the @file{mix.lock}, Elixir's
|
||||||
|
@uref{https://hexdocs.pm/elixir/introduction-to-mix.html, mix} lock file,
|
||||||
|
as in this example:
|
||||||
|
|
||||||
|
@example
|
||||||
|
guix import mix -f mix.lock yourapp
|
||||||
|
@end example
|
||||||
|
|
||||||
|
Mandatory options are:
|
||||||
|
|
||||||
|
@table @code
|
||||||
|
@item --lockfile=@var{file}
|
||||||
|
@itemx -f @var{file}
|
||||||
|
@option{--lockfile} must be a @file{mix.lock} file.
|
||||||
|
|
||||||
|
@xref{Packaging Elixir Applications,,, guix-cookbook, GNU Guix Cookbook}, for
|
||||||
|
packaging workflow utilizing it.
|
||||||
@end table
|
@end table
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
@@ -15578,7 +15514,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 @option{--target-version} is made available by
|
A per-package equivalent to --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:
|
||||||
|
|
||||||
@@ -16139,7 +16075,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 a version string, possibly prefixed by ``v'', change the
|
with @code{version} or @code{(string-append ``v'' version)}, 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:
|
||||||
|
|
||||||
@@ -16168,16 +16104,14 @@ 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
|
(source (origin
|
||||||
(origin
|
(method git-fetch)
|
||||||
(method git-fetch)
|
(uri (git-reference (url
|
||||||
(uri (git-reference
|
"https://github.com/aconchillo/guile-json")
|
||||||
(url "https://github.com/aconchillo/guile-json")
|
(commit version)))
|
||||||
(commit version)))
|
(file-name (git-file-name name version))
|
||||||
(file-name (git-file-name name version))
|
(sha256 (base32
|
||||||
(sha256
|
"0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
|
||||||
(base32
|
|
||||||
"0akhm8xjv8fl55fyq0w6c9c6hi5j7mifjx01w07np7qg1cjl9f06"))))))
|
|
||||||
@end lisp
|
@end lisp
|
||||||
|
|
||||||
@end table
|
@end table
|
||||||
@@ -19242,7 +19176,7 @@ Partitioning}, for an example.
|
|||||||
|
|
||||||
When using GRUB as the bootloader, the LUKS password is only requested
|
When using GRUB as the bootloader, the LUKS password is only requested
|
||||||
once: GRUB passes the master key to the initial RAM disk automatically.
|
once: GRUB passes the master key to the initial RAM disk automatically.
|
||||||
@xref{grub-luks-root-device-key, Automatic LUKS Master Key Passing}, for
|
@xref{Bootloader Configuration, Automatic LUKS Master Key Passing}, for
|
||||||
details.
|
details.
|
||||||
|
|
||||||
@end defvar
|
@end defvar
|
||||||
@@ -27294,28 +27228,6 @@ 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
|
||||||
@@ -45277,12 +45189,6 @@ Extra command line options for @code{guix-data-service}.
|
|||||||
@item @code{extra-process-jobs-options} (default: @var{'()})
|
@item @code{extra-process-jobs-options} (default: @var{'()})
|
||||||
Extra command line options for @code{guix-data-service-process-jobs}.
|
Extra command line options for @code{guix-data-service-process-jobs}.
|
||||||
|
|
||||||
@item @code{extra-environment-variables} (default: @var{'()})
|
|
||||||
Extra environment variables for @code{guix-data-service}.
|
|
||||||
|
|
||||||
@item @code{extra-process-jobs-environment-variables} (default: @var{'()})
|
|
||||||
Extra environment variables for @code{guix-data-service-process-jobs}.
|
|
||||||
|
|
||||||
@item @code{git-repositories} (default: @var{#f})
|
@item @code{git-repositories} (default: @var{#f})
|
||||||
List of git-repository information to insert into the database.
|
List of git-repository information to insert into the database.
|
||||||
|
|
||||||
@@ -48992,28 +48898,8 @@ This option in enabled by default. In some cases involving the
|
|||||||
in RAM, it can be handy to disable the option by setting it to
|
in RAM, it can be handy to disable the option by setting it to
|
||||||
@code{#f}.
|
@code{#f}.
|
||||||
|
|
||||||
@item @code{extra-initrd} (default: @code{#f})
|
@subsubheading Automatic LUKS Master Key Passing
|
||||||
File name of an additional initrd to load during the boot. It may or
|
|
||||||
may not point to a file in the store, but the main use case is for
|
|
||||||
out-of-store files containing secrets.
|
|
||||||
|
|
||||||
For any use case not involving secrets, you should use regular initrd
|
|
||||||
(@pxref{operating-system Reference, @code{initrd}}) instead.
|
|
||||||
|
|
||||||
Be careful when using this option, since pointing to a file that is not
|
|
||||||
readable by the grub while booting will cause the boot to fail and
|
|
||||||
require a manual edit of the initrd line in the grub menu.
|
|
||||||
|
|
||||||
Currently only supported by GRUB.
|
|
||||||
@end table
|
|
||||||
|
|
||||||
@end deftp
|
|
||||||
|
|
||||||
@anchor{grub-luks-root-device-key}
|
|
||||||
@unnumberedsubsec Automatic LUKS Master Key Passing
|
|
||||||
|
|
||||||
@cindex LUKS, root file system encryption
|
|
||||||
@cindex passphrase, for LUKS-encrypted root
|
|
||||||
When booting from a LUKS-encrypted device using GRUB, the password is
|
When booting from a LUKS-encrypted device using GRUB, the password is
|
||||||
normally requested twice: once by GRUB to access @file{/boot}, and a
|
normally requested twice: once by GRUB to access @file{/boot}, and a
|
||||||
second time by the initial RAM disk to mount the root file system.
|
second time by the initial RAM disk to mount the root file system.
|
||||||
@@ -49054,7 +48940,22 @@ No configuration is required: GRUB's @code{procfs} and @code{luks}
|
|||||||
modules are loaded automatically when encrypted devices are declared
|
modules are loaded automatically when encrypted devices are declared
|
||||||
via @code{luks-device-mapping} (@pxref{Mapped Devices}).
|
via @code{luks-device-mapping} (@pxref{Mapped Devices}).
|
||||||
|
|
||||||
@unnumberedsubsec Additional Boot Entries
|
@item @code{extra-initrd} (default: @code{#f})
|
||||||
|
File name of an additional initrd to load during the boot. It may or
|
||||||
|
may not point to a file in the store, but the main use case is for
|
||||||
|
out-of-store files containing secrets.
|
||||||
|
|
||||||
|
For any use case not involving secrets, you should use regular initrd
|
||||||
|
(@pxref{operating-system Reference, @code{initrd}}) instead.
|
||||||
|
|
||||||
|
Be careful when using this option, since pointing to a file that is not
|
||||||
|
readable by the grub while booting will cause the boot to fail and
|
||||||
|
require a manual edit of the initrd line in the grub menu.
|
||||||
|
|
||||||
|
Currently only supported by GRUB.
|
||||||
|
@end table
|
||||||
|
|
||||||
|
@end deftp
|
||||||
|
|
||||||
@cindex dual boot
|
@cindex dual boot
|
||||||
@cindex boot menu
|
@cindex boot menu
|
||||||
@@ -49183,13 +49084,9 @@ example of chainloading a different GNU/Linux system.
|
|||||||
@end table
|
@end table
|
||||||
@end deftp
|
@end deftp
|
||||||
|
|
||||||
@unnumberedsubsec Themes
|
|
||||||
|
|
||||||
@cindex HDPI
|
@cindex HDPI
|
||||||
@cindex HiDPI
|
@cindex HiDPI
|
||||||
@cindex resolution
|
@cindex resolution
|
||||||
@cindex themes, for GRUB
|
|
||||||
@cindex bootloader themes
|
|
||||||
@c FIXME: Write documentation once it's stable.
|
@c FIXME: Write documentation once it's stable.
|
||||||
For now only GRUB has theme support. GRUB themes are created using
|
For now only GRUB has theme support. GRUB themes are created using
|
||||||
the @code{grub-theme} form, which is not fully documented yet.
|
the @code{grub-theme} form, which is not fully documented yet.
|
||||||
@@ -49209,7 +49106,7 @@ Return the default GRUB theme used by the operating system if no
|
|||||||
@code{theme} field is specified in @code{bootloader-configuration}
|
@code{theme} field is specified in @code{bootloader-configuration}
|
||||||
record.
|
record.
|
||||||
|
|
||||||
It comes with a fancy background image displaying the Guix
|
It comes with a fancy background image displaying the GNU and Guix
|
||||||
logos.
|
logos.
|
||||||
@end deffn
|
@end deffn
|
||||||
|
|
||||||
@@ -49584,7 +49481,7 @@ how to generate an image that uses the @code{grub-efi-bootloader}
|
|||||||
bootloader and boot it with QEMU:
|
bootloader and boot it with QEMU:
|
||||||
|
|
||||||
@example
|
@example
|
||||||
image=$(guix system image --image-type=qcow2-gpt \
|
image=$(guix system image --image-type=qcow2 \
|
||||||
gnu/system/examples/lightweight-desktop.tmpl)
|
gnu/system/examples/lightweight-desktop.tmpl)
|
||||||
cp $image /tmp/my-image.qcow2
|
cp $image /tmp/my-image.qcow2
|
||||||
chmod +w /tmp/my-image.qcow2
|
chmod +w /tmp/my-image.qcow2
|
||||||
@@ -51792,63 +51689,6 @@ 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
|
||||||
@@ -53591,9 +53431,6 @@ 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
|
||||||
|
|||||||
+398
-1961
File diff suppressed because it is too large
Load Diff
+11
-22
@@ -16,7 +16,6 @@ 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.
|
||||||
;;;
|
;;;
|
||||||
@@ -483,15 +482,21 @@ already exists. Lookup team IDs among CURRENT-TEAMS."
|
|||||||
#:name "Erlang/Elixir/BEAM team"
|
#:name "Erlang/Elixir/BEAM team"
|
||||||
#:description "The virtual machine at the core of the Erlang Open
|
#:description "The virtual machine at the core of the Erlang Open
|
||||||
Telecom Platform (OTP), Erlang and Elxir languages and packages, development
|
Telecom Platform (OTP), Erlang and Elxir languages and packages, development
|
||||||
of Rebar and Mix build systems and Hex.pm importer."
|
of Rebar and Mix build systems, Hex.pm and Mix importers."
|
||||||
#:scope (list (make-regexp* "^gnu/packages/elixir(-.+|)\\.scm$")
|
#:scope (list (make-regexp* "^gnu/packages/beam-.+\\.scm$")
|
||||||
|
(make-regexp* "^gnu/packages/elixir(-.+|)\\.scm$")
|
||||||
"guix/build/mix-build-system.scm"
|
"guix/build/mix-build-system.scm"
|
||||||
"guix/build-system/mix.scm"
|
"guix/build-system/mix.scm"
|
||||||
(make-regexp* "^gnu/packages/erlang(-.+|)\\.scm$")
|
(make-regexp* "^gnu/packages/erlang(-.+|)\\.scm$")
|
||||||
"guix/build/rebar-build-system.scm"
|
"guix/build/rebar-build-system.scm"
|
||||||
"guix/build-system/rebar.scm"
|
"guix/build-system/rebar.scm"
|
||||||
"guix/import/hexpm.scm"
|
"guix/import/hexpm.scm"
|
||||||
"guix/scripts/import/hexpm.scm")))
|
"guix/import/mix.scm"
|
||||||
|
"guix/import/mix/mix-lock.scm"
|
||||||
|
"guix/scripts/import/hexpm.scm"
|
||||||
|
"guix/scripts/import/mix.scm"
|
||||||
|
"tests/import/hexpm.scm"
|
||||||
|
"tests/import/mix.scm")))
|
||||||
|
|
||||||
(define-team bioinformatics
|
(define-team bioinformatics
|
||||||
(team 'bioinformatics
|
(team 'bioinformatics
|
||||||
@@ -566,7 +571,6 @@ 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"
|
||||||
@@ -691,7 +695,6 @@ 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
|
||||||
@@ -828,7 +831,6 @@ and the maven-build-system."
|
|||||||
(make-regexp* "^gnu/packages/java(-.+|)\\.scm$")
|
(make-regexp* "^gnu/packages/java(-.+|)\\.scm$")
|
||||||
;; Match maven.scm and maven-*.scm
|
;; Match maven.scm and maven-*.scm
|
||||||
(make-regexp* "^gnu/packages/maven(-.+|)\\.scm$")
|
(make-regexp* "^gnu/packages/maven(-.+|)\\.scm$")
|
||||||
"gnu/packages/netbeans.scm"
|
|
||||||
"guix/build/ant-build-system.scm"
|
"guix/build/ant-build-system.scm"
|
||||||
"guix/build/clojure-build-system.scm"
|
"guix/build/clojure-build-system.scm"
|
||||||
"guix/build/clojure-utils.scm"
|
"guix/build/clojure-utils.scm"
|
||||||
@@ -845,8 +847,7 @@ and the maven-build-system."
|
|||||||
#:name "JavaScript team"
|
#:name "JavaScript team"
|
||||||
#:description
|
#:description
|
||||||
"JavaScript/Node.js packages, the node build system."
|
"JavaScript/Node.js packages, the node build system."
|
||||||
#:scope (list "gnu/packages/javascript.scm"
|
#:scope (list "gnu/packages/node-xyz.scm"
|
||||||
"gnu/packages/node-xyz.scm"
|
|
||||||
"gnu/packages/node.scm"
|
"gnu/packages/node.scm"
|
||||||
"guix/build-system/node.scm"
|
"guix/build-system/node.scm"
|
||||||
"guix/build/node-build-system.scm"
|
"guix/build/node-build-system.scm"
|
||||||
@@ -947,7 +948,6 @@ 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"
|
||||||
@@ -1220,7 +1220,6 @@ 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")))
|
||||||
@@ -1251,11 +1250,6 @@ 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")
|
||||||
@@ -1639,7 +1633,7 @@ the \"texlive\" importer."
|
|||||||
(define-member (person "Thanos Apollo"
|
(define-member (person "Thanos Apollo"
|
||||||
"public@thanosapollo.org"
|
"public@thanosapollo.org"
|
||||||
"thanosapollo")
|
"thanosapollo")
|
||||||
vcs emacs)
|
vcs)
|
||||||
|
|
||||||
(define-member (person "Ashish SHUKLA"
|
(define-member (person "Ashish SHUKLA"
|
||||||
"ashish.is@lostca.se"
|
"ashish.is@lostca.se"
|
||||||
@@ -1661,11 +1655,6 @@ the \"texlive\" importer."
|
|||||||
"tok")
|
"tok")
|
||||||
electronics)
|
electronics)
|
||||||
|
|
||||||
(define-member (person "gemmaro"
|
|
||||||
"gemmaro.dev@gmail.com"
|
|
||||||
"gemmaro")
|
|
||||||
ruby)
|
|
||||||
|
|
||||||
|
|
||||||
(define (find-team name)
|
(define (find-team name)
|
||||||
(or (hash-ref %teams (string->symbol name))
|
(or (hash-ref %teams (string->symbol name))
|
||||||
|
|||||||
@@ -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, 2026 Efraim Flashner <efraim@flashner.co.il>
|
# Copyright © 2025 Efraim Flashner <efraim@flashner.co.il>
|
||||||
#
|
#
|
||||||
# This file is part of GNU Guix.
|
# This file is part of GNU Guix.
|
||||||
#
|
#
|
||||||
@@ -21,22 +21,20 @@
|
|||||||
# ./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 {
|
||||||
"which cargo-audit" | getline cargoAudit
|
if (system("which cargo-audit 1> /dev/null"))
|
||||||
close("which cargo-audit")
|
exit 1;
|
||||||
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, like in rust-crates.scm
|
# Check the crate-source origin-only inputs
|
||||||
/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") {
|
||||||
crateName = $(i+1)
|
cargoLock = cargoLock "[[package]]\nname = " $(i+1) "\nversion = " $(i+2) "\n"
|
||||||
crateVersion = $(i+2)
|
|
||||||
cargoLock = cargoLock "[[package]]\nname = " crateName "\nversion = " crateVersion "\n"
|
|
||||||
next
|
next
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -46,64 +44,27 @@ 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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Parse the crates created from packages using 'cargo package'
|
# The xxxx-cargo-input variables have a set style
|
||||||
/package:rust/ {
|
# TODO: Replace the last dash between the name and the version with a space!
|
||||||
pkg = $2
|
# This doesn't take into account swapping between "-" and "_" so we skip it.
|
||||||
split(pkg, name_version, "-")
|
#( $2 ~ /-cargo-inputs/ ) {
|
||||||
crateVersion = name_version[length(name_version)]
|
# sub(/-cargo-inputs/, "", $2)
|
||||||
crateName = substr(pkg, 6, (length(pkg) - length(crateVersion) - 6))
|
# gsub(/)/, "", $0)
|
||||||
split(crateVersion, versionDots, ".")
|
# gsub(/rust-/, "", $0)
|
||||||
if(crateVersion && (crateVersion != "(git-version") && (length(versionDots) == 3) && crateName) {
|
# #gensub(/([[:alpha:]])-([[:digit:]]+)/, "\\1 \\2", "g", $i)
|
||||||
cargoLock = cargoLock "[[package]]\nname = \"" crateName "\"\nversion = \"" crateVersion "\"\n"
|
# print "[[package]]\nname = \"" $2 "\"\nversion = \"1.0.0\"\ndependencies = ["
|
||||||
} else {
|
# for (i = 4; i <= NF; i++) {
|
||||||
untested++
|
# print "\"" $i "\","
|
||||||
#print("Unable to test " $0)
|
# }
|
||||||
}
|
# print "]"
|
||||||
next
|
#}
|
||||||
}
|
|
||||||
|
|
||||||
# We make an attempt to create the crate name from the package name otherwise
|
END { print cargoLock | cargoAudit }
|
||||||
/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,6 +26,7 @@
|
|||||||
|
|
||||||
(define %sundry-texlive-packages
|
(define %sundry-texlive-packages
|
||||||
(list bibtool
|
(list bibtool
|
||||||
|
dvisvgm
|
||||||
rubber
|
rubber
|
||||||
texmaker
|
texmaker
|
||||||
texstudio
|
texstudio
|
||||||
|
|||||||
@@ -1226,12 +1226,10 @@ file name or an nfs-root containing ':/')."
|
|||||||
|
|
||||||
(match spec
|
(match spec
|
||||||
((? string?)
|
((? string?)
|
||||||
(if (string-match "^/dev/[a-zA-Z0-9]+$" spec)
|
(if (string-prefix? "/dev/" spec)
|
||||||
;; Nothing to do, but wait until SPEC shows up.
|
;; Nothing to do, but wait until SPEC shows up.
|
||||||
(resolve device-exists? spec identity)
|
(resolve device-exists? spec identity)
|
||||||
;; Do not resolve NFS / CIFS / tmpfs devices
|
spec)) ; do not resolve NFS / CIFS / tmpfs devices
|
||||||
;; or bcachefs multi-device specifications.
|
|
||||||
spec))
|
|
||||||
((? file-system-label?)
|
((? file-system-label?)
|
||||||
;; Resolve the label.
|
;; Resolve the label.
|
||||||
(resolve find-partition-by-label
|
(resolve find-partition-by-label
|
||||||
|
|||||||
@@ -445,14 +445,10 @@ load path must be adjusted as needed."
|
|||||||
;; Behave like an init process: create a sub-process that calls
|
;; Behave like an init process: create a sub-process that calls
|
||||||
;; THUNK, and wait for child processes. Furthermore, forward
|
;; THUNK, and wait for child processes. Furthermore, forward
|
||||||
;; RELAYED-SIGNALS to the child process.
|
;; RELAYED-SIGNALS to the child process.
|
||||||
;; We presently use `safe-clone` here due to a bug in the interaction
|
(match (primitive-fork)
|
||||||
;; between Guix and `primitive-fork` in Guile 3.0.11:
|
(0
|
||||||
;; https://codeberg.org/guix/guix/issues/7690#issuecomment-12744123
|
|
||||||
(safe-clone
|
|
||||||
SIGCHLD
|
|
||||||
(lambda ()
|
|
||||||
(call-with-clean-exit thunk))
|
(call-with-clean-exit thunk))
|
||||||
(lambda (pid)
|
(pid
|
||||||
(install-signal-handlers pid)
|
(install-signal-handlers pid)
|
||||||
(let loop ()
|
(let loop ()
|
||||||
(match (wait-child-process)
|
(match (wait-child-process)
|
||||||
|
|||||||
+10
-19
@@ -81,10 +81,7 @@ 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}."
|
||||||
@@ -107,7 +104,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? shepherd-requirement)
|
(gnupg ssh-support?)
|
||||||
;; '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").
|
||||||
@@ -122,21 +119,15 @@ 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
|
(start #~(make-systemd-constructor
|
||||||
#~(lambda args
|
(list #$(file-append gnupg "/bin/gpg-agent")
|
||||||
((make-systemd-constructor
|
"--supervised" "--enable-ssh-support")
|
||||||
(list #$(file-append gnupg "/bin/gpg-agent")
|
(list #$(endpoint "ssh" "S.gpg-agent.ssh")
|
||||||
"--supervised" "--enable-ssh-support")
|
#$(endpoint "browser" "S.gpg-agent.browser")
|
||||||
(list #$(endpoint "ssh" "S.gpg-agent.ssh")
|
#$(endpoint "extra" "S.gpg-agent.extra")
|
||||||
#$(endpoint "browser" "S.gpg-agent.browser")
|
;; #$(endpoint "scdaemon" "S.scdaemon")
|
||||||
#$(endpoint "extra" "S.gpg-agent.extra")
|
#$(endpoint "std" "S.gpg-agent"))))
|
||||||
;; #$(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."))))
|
||||||
|
|||||||
+13
-60
@@ -56,8 +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-2026 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>
|
||||||
# Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
|
# Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
|
||||||
@@ -76,6 +75,7 @@
|
|||||||
# Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
|
# Copyright © 2025 Nigko Yerden <nigko.yerden@gmail.com>
|
||||||
# Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
|
# Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
|
||||||
# Copyright © 2025 bdunahu <bdunahu@operationnull.com>
|
# Copyright © 2025 bdunahu <bdunahu@operationnull.com>
|
||||||
|
# Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
|
||||||
#
|
#
|
||||||
# This file is part of GNU Guix.
|
# This file is part of GNU Guix.
|
||||||
#
|
#
|
||||||
@@ -176,6 +176,9 @@ GNU_SYSTEM_MODULES = \
|
|||||||
%D%/packages/bash.scm \
|
%D%/packages/bash.scm \
|
||||||
%D%/packages/batik.scm \
|
%D%/packages/batik.scm \
|
||||||
%D%/packages/bdw-gc.scm \
|
%D%/packages/bdw-gc.scm \
|
||||||
|
%D%/packages/beam-apps.scm \
|
||||||
|
%D%/packages/beam-packages.scm \
|
||||||
|
%D%/packages/beam-sources.scm \
|
||||||
%D%/packages/benchmark.scm \
|
%D%/packages/benchmark.scm \
|
||||||
%D%/packages/bioconductor.scm \
|
%D%/packages/bioconductor.scm \
|
||||||
%D%/packages/bioinformatics.scm \
|
%D%/packages/bioinformatics.scm \
|
||||||
@@ -217,7 +220,6 @@ 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 \
|
||||||
@@ -502,7 +504,6 @@ GNU_SYSTEM_MODULES = \
|
|||||||
%D%/packages/myrddin.scm \
|
%D%/packages/myrddin.scm \
|
||||||
%D%/packages/ncdu.scm \
|
%D%/packages/ncdu.scm \
|
||||||
%D%/packages/ncurses.scm \
|
%D%/packages/ncurses.scm \
|
||||||
%D%/packages/netbeans.scm \
|
|
||||||
%D%/packages/netpbm.scm \
|
%D%/packages/netpbm.scm \
|
||||||
%D%/packages/nettle.scm \
|
%D%/packages/nettle.scm \
|
||||||
%D%/packages/networking.scm \
|
%D%/packages/networking.scm \
|
||||||
@@ -611,7 +612,6 @@ 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 \
|
||||||
@@ -742,8 +742,6 @@ 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 \
|
||||||
@@ -1041,7 +1039,6 @@ 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 \
|
||||||
@@ -1094,7 +1091,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/catdoc-CVE-2017-11110.patch \
|
%D%/packages/patches/catdoc-CVE-2017-11110.patch \
|
||||||
%D%/packages/patches/chez-irregex-import-cond-expand.patch \
|
%D%/packages/patches/chez-irregex-import-cond-expand.patch \
|
||||||
%D%/packages/patches/chez-scheme-bin-sh.patch \
|
%D%/packages/patches/chez-scheme-bin-sh.patch \
|
||||||
%D%/packages/patches/cianna-remove-error-for-missing-cuda.patch \
|
|
||||||
%D%/packages/patches/circos-remove-findbin.patch \
|
%D%/packages/patches/circos-remove-findbin.patch \
|
||||||
%D%/packages/patches/cdparanoia-fpic.patch \
|
%D%/packages/patches/cdparanoia-fpic.patch \
|
||||||
%D%/packages/patches/cdrkit-libre-cross-compile.patch \
|
%D%/packages/patches/cdrkit-libre-cross-compile.patch \
|
||||||
@@ -1133,10 +1129,9 @@ 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.11.1-disable-code-mode.patch \
|
%D%/packages/patches/codex-acp-0.9.2-remove-patch-sections.patch \
|
||||||
%D%/packages/patches/codex-acp-0.11.1-remove-patch-sections.patch \
|
%D%/packages/patches/codex-acp-0.9.2-replace-result-flatten.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 \
|
||||||
@@ -1180,7 +1175,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/curlftpfs-fix-no_verify_hostname.patch \
|
%D%/packages/patches/curlftpfs-fix-no_verify_hostname.patch \
|
||||||
%D%/packages/patches/cursynth-wave-rand.patch \
|
%D%/packages/patches/cursynth-wave-rand.patch \
|
||||||
%D%/packages/patches/cvc5-reproducible-build.patch \
|
%D%/packages/patches/cvc5-reproducible-build.patch \
|
||||||
%D%/packages/patches/cvc5-symfpu-compatibility.patch \
|
|
||||||
%D%/packages/patches/cvs-CVE-2017-12836.patch \
|
%D%/packages/patches/cvs-CVE-2017-12836.patch \
|
||||||
%D%/packages/patches/cyrus-sasl-fix-time-h.patch \
|
%D%/packages/patches/cyrus-sasl-fix-time-h.patch \
|
||||||
%D%/packages/patches/d-feet-drop-unused-meson-argument.patch \
|
%D%/packages/patches/d-feet-drop-unused-meson-argument.patch \
|
||||||
@@ -1238,12 +1232,13 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/elfutils-tests-ptrace.patch \
|
%D%/packages/patches/elfutils-tests-ptrace.patch \
|
||||||
%D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch \
|
%D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch \
|
||||||
%D%/packages/patches/elixir-path-length.patch \
|
%D%/packages/patches/elixir-path-length.patch \
|
||||||
|
%D%/packages/patches/elixir-vendoring-support.patch \
|
||||||
%D%/packages/patches/elm-ghc9.2.patch \
|
%D%/packages/patches/elm-ghc9.2.patch \
|
||||||
%D%/packages/patches/exaile-gstreamer-1.28.patch \
|
%D%/packages/patches/exaile-gstreamer-1.28.patch \
|
||||||
%D%/packages/patches/python-treelib-remove-python2-compat.patch \
|
%D%/packages/patches/python-treelib-remove-python2-compat.patch \
|
||||||
%D%/packages/patches/elm-offline-package-registry.patch \
|
%D%/packages/patches/elm-offline-package-registry.patch \
|
||||||
%D%/packages/patches/elm-reactor-static-files.patch \
|
%D%/packages/patches/elm-reactor-static-files.patch \
|
||||||
%D%/packages/patches/emacs-agent-shell-fix-tests.patch \
|
%D%/packages/patches/emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch \
|
||||||
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
|
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
|
||||||
%D%/packages/patches/emacs-disable-jit-compilation.patch \
|
%D%/packages/patches/emacs-disable-jit-compilation.patch \
|
||||||
%D%/packages/patches/emacs-doc-toc-shell-commands.patch \
|
%D%/packages/patches/emacs-doc-toc-shell-commands.patch \
|
||||||
@@ -1471,6 +1466,7 @@ 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 \
|
||||||
@@ -1620,6 +1616,7 @@ 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 \
|
||||||
@@ -1655,7 +1652,6 @@ 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 \
|
||||||
@@ -1678,7 +1674,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/java-commons-collections-fix-java8.patch \
|
%D%/packages/patches/java-commons-collections-fix-java8.patch \
|
||||||
%D%/packages/patches/java-guava-remove-annotation-deps.patch \
|
%D%/packages/patches/java-guava-remove-annotation-deps.patch \
|
||||||
%D%/packages/patches/java-jeromq-fix-tests.patch \
|
%D%/packages/patches/java-jeromq-fix-tests.patch \
|
||||||
%D%/packages/patches/java-jtidy-remove-xerces-dependency.patch \
|
|
||||||
%D%/packages/patches/java-openjfx-build-jdk_version.patch \
|
%D%/packages/patches/java-openjfx-build-jdk_version.patch \
|
||||||
%D%/packages/patches/java-powermock-fix-java-files.patch \
|
%D%/packages/patches/java-powermock-fix-java-files.patch \
|
||||||
%D%/packages/patches/java-simple-xml-fix-tests.patch \
|
%D%/packages/patches/java-simple-xml-fix-tests.patch \
|
||||||
@@ -1687,8 +1682,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/java-xerces-build_dont_unzip.patch \
|
%D%/packages/patches/java-xerces-build_dont_unzip.patch \
|
||||||
%D%/packages/patches/java-xerces-xjavac_taskdef.patch \
|
%D%/packages/patches/java-xerces-xjavac_taskdef.patch \
|
||||||
%D%/packages/patches/jbr-17-xcursor-no-dynamic.patch \
|
%D%/packages/patches/jbr-17-xcursor-no-dynamic.patch \
|
||||||
%D%/packages/patches/jbr-25-wayland-drag-icon.patch \
|
|
||||||
%D%/packages/patches/jbr-25-wayland-intra-jvm-dnd.patch \
|
|
||||||
%D%/packages/patches/jdk-currency-time-bomb.patch \
|
%D%/packages/patches/jdk-currency-time-bomb.patch \
|
||||||
%D%/packages/patches/jdk-currency-time-bomb2.patch \
|
%D%/packages/patches/jdk-currency-time-bomb2.patch \
|
||||||
%D%/packages/patches/jfsutils-add-sysmacros.patch \
|
%D%/packages/patches/jfsutils-add-sysmacros.patch \
|
||||||
@@ -1751,7 +1744,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-8-runtime-keymap-switch.patch \
|
%D%/packages/patches/kmscon-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 \
|
||||||
@@ -1980,11 +1973,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/netcdf-date-time.patch \
|
%D%/packages/patches/netcdf-date-time.patch \
|
||||||
%D%/packages/patches/netdde-build-fix.patch \
|
%D%/packages/patches/netdde-build-fix.patch \
|
||||||
%D%/packages/patches/netdde-csum.patch \
|
%D%/packages/patches/netdde-csum.patch \
|
||||||
%D%/packages/patches/java-apache-xml-commons-resolver-1.2-netbeans.patch \
|
|
||||||
%D%/packages/patches/java-simplevalidation-1.14.1.patch \
|
|
||||||
%D%/packages/patches/netbeans-25-nativeexecution-paths.patch \
|
|
||||||
%D%/packages/patches/netbeans-25-terminal-no-login-shell.patch \
|
|
||||||
%D%/packages/patches/netbeans-25-source-only-build.patch \
|
|
||||||
%D%/packages/patches/netpbm-CVE-2017-2586.patch \
|
%D%/packages/patches/netpbm-CVE-2017-2586.patch \
|
||||||
%D%/packages/patches/netpbm-CVE-2017-2587.patch \
|
%D%/packages/patches/netpbm-CVE-2017-2587.patch \
|
||||||
%D%/packages/patches/netsurf-message-timestamp.patch \
|
%D%/packages/patches/netsurf-message-timestamp.patch \
|
||||||
@@ -1995,7 +1983,6 @@ 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 \
|
||||||
@@ -2079,7 +2066,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/open-zwave-hidapi.patch \
|
%D%/packages/patches/open-zwave-hidapi.patch \
|
||||||
%D%/packages/patches/opusfile-CVE-2022-47021.patch \
|
%D%/packages/patches/opusfile-CVE-2022-47021.patch \
|
||||||
%D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
|
%D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
|
||||||
%D%/packages/patches/orca-fix-gst-init-check-call.patch \
|
|
||||||
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \
|
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \
|
||||||
%D%/packages/patches/ots-no-include-missing-file.patch \
|
%D%/packages/patches/ots-no-include-missing-file.patch \
|
||||||
%D%/packages/patches/owncloud-disable-updatecheck.patch \
|
%D%/packages/patches/owncloud-disable-updatecheck.patch \
|
||||||
@@ -2127,7 +2113,6 @@ 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 \
|
||||||
@@ -2182,8 +2167,6 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/perl-www-curl-remove-symbol.patch \
|
%D%/packages/patches/perl-www-curl-remove-symbol.patch \
|
||||||
%D%/packages/patches/perl-xml-libxml-fix-function-prototypes.patch \
|
%D%/packages/patches/perl-xml-libxml-fix-function-prototypes.patch \
|
||||||
%D%/packages/patches/phoronix-test-suite-fsdg.patch \
|
%D%/packages/patches/phoronix-test-suite-fsdg.patch \
|
||||||
%D%/packages/patches/php-01-fix-expired-certificate.patch \
|
|
||||||
%D%/packages/patches/php-02-fix-sni-tests.patch \
|
|
||||||
%D%/packages/patches/picprog-non-intel-support.patch \
|
%D%/packages/patches/picprog-non-intel-support.patch \
|
||||||
%D%/packages/patches/pidgin-add-search-path.patch \
|
%D%/packages/patches/pidgin-add-search-path.patch \
|
||||||
%D%/packages/patches/pinball-system-ltdl.patch \
|
%D%/packages/patches/pinball-system-ltdl.patch \
|
||||||
@@ -2272,7 +2255,6 @@ 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 \
|
||||||
@@ -2362,16 +2344,8 @@ dist_patch_DATA = \
|
|||||||
%D%/packages/patches/renpy-fix-integer-slots.patch \
|
%D%/packages/patches/renpy-fix-integer-slots.patch \
|
||||||
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
|
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
|
||||||
%D%/packages/patches/rdkit-unbundle-external-dependencies.patch \
|
%D%/packages/patches/rdkit-unbundle-external-dependencies.patch \
|
||||||
%D%/packages/patches/r-biostrings-r4.6.0-compat.patch \
|
|
||||||
%D%/packages/patches/r-h5mread-0001-h5mread-1.3.2-Get-rid-of-non-API-calls-to-R.patch \
|
|
||||||
%D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch \
|
%D%/packages/patches/r-httpuv-1.6.6-unvendor-libuv.patch \
|
||||||
%D%/packages/patches/r-mscoreutils-0001-fix-non-API-call-to-R-SETLENGTH-by-using-lengthgets.patch \
|
|
||||||
%D%/packages/patches/r-rsamtools-r-4.6.0-compat.patch \
|
|
||||||
%D%/packages/patches/r-snpstats-0001-fixed-non-API-except-for-IS_S4_OBJECT.patch \
|
|
||||||
%D%/packages/patches/r-snpstats-0002-fixed-IS_S4_OBJECT.patch \
|
|
||||||
%D%/packages/patches/r-sapa-lapack.patch \
|
%D%/packages/patches/r-sapa-lapack.patch \
|
||||||
%D%/packages/patches/r-shortread-0001-ShortRead-1.69.3-Get-rid-of-non-API-calls-to-R.patch \
|
|
||||||
%D%/packages/patches/r-sparsearray-r-4.6.0-compat.patch \
|
|
||||||
%D%/packages/patches/ripperx-missing-file.patch \
|
%D%/packages/patches/ripperx-missing-file.patch \
|
||||||
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
|
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \
|
||||||
%D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch \
|
%D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch \
|
||||||
@@ -2411,19 +2385,10 @@ 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-codex-0.124.0-code-mode-stub-toolname.patch \
|
|
||||||
%D%/packages/patches/rust-codex-0.124.0-remove-patch-sections.patch \
|
|
||||||
%D%/packages/patches/rust-librocksdb-sys-unbundled-sources.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 \
|
||||||
@@ -2554,11 +2519,10 @@ 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 \
|
||||||
@@ -2659,17 +2623,6 @@ 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 \
|
||||||
|
|||||||
@@ -185,7 +185,7 @@ terminals.")
|
|||||||
(native-inputs
|
(native-inputs
|
||||||
(append
|
(append
|
||||||
(list clisp
|
(list clisp
|
||||||
python-cython-0 ;; See https://bugzilla.redhat.com/show_bug.cgi?id=2231865
|
python-cython
|
||||||
doxygen
|
doxygen
|
||||||
gettext-minimal)
|
gettext-minimal)
|
||||||
;; icedtea doesn't build reliably on all architectures.
|
;; icedtea doesn't build reliably on all architectures.
|
||||||
|
|||||||
+51
-90
@@ -1,5 +1,5 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2012-2026 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
|
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
|
||||||
;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2014, 2015-2018, 2020-2023 Eric Bavier <bavier@posteo.net>
|
;;; Copyright © 2014, 2015-2018, 2020-2023 Eric Bavier <bavier@posteo.net>
|
||||||
@@ -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.5.1")
|
(version "3.4.1")
|
||||||
(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 "187gyj081n6qsidll5wdri3jkr4m2i4m461z3xv03y342f5yj3lv"))
|
(base32 "058y4a4mvx9m179dyr4wi8mlm6i4ybywshadaj4cvfn9fv0r0nkx"))
|
||||||
(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,8 +1309,7 @@ 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
|
||||||
@@ -3442,7 +3441,7 @@ modules and plugins that extend Ansible.")
|
|||||||
(list ansible
|
(list ansible
|
||||||
bash-minimal
|
bash-minimal
|
||||||
encfs
|
encfs
|
||||||
fuse
|
fuse-2
|
||||||
util-linux ;; for umount
|
util-linux ;; for umount
|
||||||
findutils
|
findutils
|
||||||
git
|
git
|
||||||
@@ -3751,68 +3750,59 @@ summarizes network bandwidth by process and remote host.")
|
|||||||
(define-public munge
|
(define-public munge
|
||||||
(package
|
(package
|
||||||
(name "munge")
|
(name "munge")
|
||||||
(version "0.5.18")
|
(version "0.5.14")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method url-fetch)
|
||||||
(uri (git-reference
|
(uri (string-append "https://github.com/dun/munge/releases/"
|
||||||
(url "https://github.com/dun/munge")
|
"download/munge-" version "/munge-"
|
||||||
(commit (string-append "munge-" version))))
|
version ".tar.xz"))
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1b7gm680dlvmgvj9vxy7n0cqmnv1rl9n4563vasxdxx54f78j30s"))
|
"0h06sghb4rqvv1ywyd6mzsmbcgh712v6ygrff0gzm440y4ca41k6"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
;; Don't insist on write access to /var.
|
'(begin
|
||||||
#~(substitute* "src/etc/Makefile.am"
|
;; Don't insist on write access to /var.
|
||||||
(("\\$\\(MKDIR_P\\) .*(local|run)statedir.*" all)
|
(substitute* "src/etc/Makefile.in"
|
||||||
(string-append ": " all))))))
|
(("\\$\\(INSTALL\\)(.*)localstatedir" _ middle)
|
||||||
|
(string-append "-$(INSTALL)" middle "localstatedir"))
|
||||||
|
(("\\$\\(MKDIR_P\\) .*(local|run)statedir.*")
|
||||||
|
""))
|
||||||
|
#t))))
|
||||||
(inputs
|
(inputs
|
||||||
(list openssl libgcrypt))
|
(list openssl libgcrypt))
|
||||||
(native-inputs
|
|
||||||
(list autoconf
|
|
||||||
automake
|
|
||||||
libtool
|
|
||||||
procps)) ;for tests
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:configure-flags
|
`(#:configure-flags
|
||||||
#~(list "--localstatedir=/var"
|
(list "--localstatedir=/var"
|
||||||
"--disable-static"
|
(string-append "--with-pkgconfigdir="
|
||||||
#$@(if (%current-target-system)
|
(assoc-ref %outputs "out") "/lib/pkgconfig")
|
||||||
;; Assume yes on pipes when cross compiling.
|
(string-append "--with-libgcrypt-prefix="
|
||||||
`("ac_cv_file__dev_spx=yes"
|
(assoc-ref %build-inputs "libgcrypt"))
|
||||||
"x_ac_cv_check_fifo_recvfd=yes")
|
,@(if (%current-target-system)
|
||||||
'())
|
;; Assume yes on pipes when cross compiling.
|
||||||
|
`("ac_cv_file__dev_spx=yes"
|
||||||
;; The '.pc' file is not installed when omitting this flag.
|
"x_ac_cv_check_fifo_recvfd=yes")
|
||||||
(string-append "--with-pkgconfigdir="
|
'()))
|
||||||
#$output "/lib/pkgconfig"))
|
#:phases
|
||||||
#:phases
|
(modify-phases %standard-phases
|
||||||
#~(modify-phases %standard-phases
|
;; XXX Many test series fail. Some might be fixable, others do no-no
|
||||||
(add-before 'bootstrap 'pre-bootstrap
|
;; things like invoking ‘sudo’.
|
||||||
(lambda _
|
(add-after 'unpack 'skip-failing-tests
|
||||||
(for-each patch-shebang (find-files "build-aux"))))
|
(lambda _
|
||||||
(add-after 'unpack 'skip-failing-tests
|
(for-each (lambda (test)
|
||||||
(lambda _
|
(substitute* "t/Makefile.in"
|
||||||
;; Pass '--force' to 'munged'; without it, it fails with "Socket
|
(((string-append test "\\.t ")) "")))
|
||||||
;; is inaccessible" due to the build directory not being
|
(list "0100-munged-lock"
|
||||||
;; world-readable.
|
"0010-basic"
|
||||||
(substitute* "tests/sharness.d/03-munged.sh"
|
"0011-munged-cmdline"
|
||||||
(("--group-update-time=-1" all)
|
"0012-munge-cmdline"
|
||||||
(string-append all " --force")))
|
"0013-unmunge-cmdline"
|
||||||
|
"0101-munged-security-socket"
|
||||||
;; The tests below invoke 'sudo' or have special expectations
|
"0102-munged-security-keyfile"
|
||||||
;; about network interfaces.
|
"0103-munged-security-logfile"
|
||||||
(for-each (lambda (test)
|
"0110-munged-origin-addr"))
|
||||||
(substitute* "tests/Makefile.am"
|
#t)))))
|
||||||
(((string-append test "\\.t "))
|
|
||||||
"")))
|
|
||||||
(list "0100-munged-lock"
|
|
||||||
"0101-munged-security-socket"
|
|
||||||
"0102-munged-security-keyfile"
|
|
||||||
"0103-munged-security-logfile"
|
|
||||||
"0110-munged-origin-addr")))))))
|
|
||||||
(home-page "https://dun.github.io/munge/")
|
(home-page "https://dun.github.io/munge/")
|
||||||
(synopsis "Cluster computing authentication service")
|
(synopsis "Cluster computing authentication service")
|
||||||
(description
|
(description
|
||||||
@@ -7052,7 +7042,7 @@ network, which causes enabled computers to power on.")
|
|||||||
(define-public witr
|
(define-public witr
|
||||||
(package
|
(package
|
||||||
(name "witr")
|
(name "witr")
|
||||||
(version "0.3.1")
|
(version "0.1.7")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -7061,7 +7051,7 @@ network, which causes enabled computers to power on.")
|
|||||||
(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 "03v9n4mdvqm0knqjl4s64321i5clqpmlrlkkdb87glzb9p28sg00"))))
|
(base32 "18xx01lxd5j019gy9jmpms3awv4snlr028w01bfkyfid6hlwxbq2"))))
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -7179,35 +7169,6 @@ 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")
|
||||||
|
|||||||
+160
-12
@@ -1,4 +1,9 @@
|
|||||||
;;; 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.
|
||||||
@@ -17,20 +22,163 @@
|
|||||||
;;; 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 (gnu packages dns)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix deprecation))
|
#:use-module (gnu packages m4)
|
||||||
|
#: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-deprecated/public-alias adns
|
(define-public adns
|
||||||
(@ (gnu packages dns) 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))))
|
||||||
|
(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-deprecated/public-alias c-ares
|
(define-public c-ares
|
||||||
(@ (gnu packages dns) 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-deprecated/public-alias c-ares-for-node-lts
|
(define-public c-ares-for-node-lts
|
||||||
(@ (gnu packages dns) c-ares-for-node-lts))
|
(hidden-package c-ares))
|
||||||
|
|
||||||
(define-deprecated/public-alias c-ares-for-node-bootstrap
|
(define-public c-ares-for-node-bootstrap
|
||||||
(@ (gnu packages dns) 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")))))))
|
||||||
|
|
||||||
(define-deprecated/public-alias c-ares/cmake
|
;; gRPC requires a c-ares built with CMake in order to get the .cmake modules.
|
||||||
(@ (gnu packages dns) c-ares/cmake))
|
;; We can not build c-ares itself with CMake because that would introduce a
|
||||||
|
;; 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))
|
v4l-utils-minimal))
|
||||||
(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+))
|
||||||
|
|||||||
@@ -458,7 +458,7 @@ precision.")
|
|||||||
(inputs
|
(inputs
|
||||||
;; TODO: Unbundle "libmicropython.a".
|
;; TODO: Unbundle "libmicropython.a".
|
||||||
(list ao
|
(list ao
|
||||||
fltk
|
fltk-1.3
|
||||||
glpk
|
glpk
|
||||||
gmp
|
gmp
|
||||||
gsl
|
gsl
|
||||||
|
|||||||
+20
-12
@@ -765,7 +765,7 @@ file system.")
|
|||||||
(sha256
|
(sha256
|
||||||
(base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
|
(base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(propagated-inputs (list python-requests python-argcomplete python-urllib3
|
(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,7 +773,8 @@ file system.")
|
|||||||
(list $SSL_CERT_FILE))
|
(list $SSL_CERT_FILE))
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:test-backend #~'unittest
|
#:test-flags
|
||||||
|
#~(list "-k" "test_*")
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'patch-tests
|
(add-after 'unpack 'patch-tests
|
||||||
@@ -792,7 +793,11 @@ 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
|
||||||
@@ -1177,16 +1182,14 @@ 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.3")
|
(version "2.4.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method url-fetch)
|
||||||
(uri (git-reference
|
(uri (pypi-uri "fdroidserver" version))
|
||||||
(url "https://gitlab.com/fdroid/fdroidserver")
|
|
||||||
(commit version)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1745fqxr2qfrls4wr6x9w1262b9pxmw9yvzd9b71ya2qmj74q17n"))))
|
(base32
|
||||||
|
"06xybginrwi5c7bw000wz5s5hzi0aqrxskzwh8qc6wv463w2djax"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -1197,17 +1200,22 @@ 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-platformdirs
|
(list python-androguard
|
||||||
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
|
||||||
|
|||||||
@@ -238,12 +238,12 @@ contains the graphical user interface for synfig.")
|
|||||||
(when tests?
|
(when tests?
|
||||||
(invoke "./tests")))))))
|
(invoke "./tests")))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(cons* gettext-minimal
|
(list gettext-minimal
|
||||||
`(,glib "bin")
|
`(,glib "bin")
|
||||||
perl
|
nasm
|
||||||
pkg-config
|
perl
|
||||||
python-wrapper
|
pkg-config
|
||||||
(maybe-nasm)))
|
python-wrapper))
|
||||||
(inputs
|
(inputs
|
||||||
(list cairo
|
(list cairo
|
||||||
curl
|
curl
|
||||||
|
|||||||
@@ -33,8 +33,9 @@
|
|||||||
;; 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 (string-append "https://ftp.jaist.ac.jp/pub/Linux/Gentoo/"
|
(uri (list (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)
|
||||||
|
|||||||
@@ -19,11 +19,9 @@
|
|||||||
(define-module (gnu packages appimage)
|
(define-module (gnu packages appimage)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages c)
|
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages file-systems)
|
#:use-module (gnu packages file-systems)
|
||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages pkg-config)
|
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
@@ -32,9 +30,9 @@
|
|||||||
#:use-module (guix utils))
|
#:use-module (guix utils))
|
||||||
|
|
||||||
(define-public appimage-type2-runtime
|
(define-public appimage-type2-runtime
|
||||||
(let ((revision "1")
|
(let ((revision "0")
|
||||||
;; No releases, just the latest commit.
|
;; No releases, just the latest commit.
|
||||||
(commit "caf24f9f712084686bfc24a70b75e50df0aefb9c"))
|
(commit "47b665594856b4e8928f8932adcf6d13061d8c30"))
|
||||||
(package
|
(package
|
||||||
(name "appimage-type2-runtime")
|
(name "appimage-type2-runtime")
|
||||||
(version (git-version "continuous" revision commit))
|
(version (git-version "continuous" revision commit))
|
||||||
@@ -46,16 +44,16 @@
|
|||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "17z0byws3dp375wcyq5xwy5npqy7hslqw21n677dp38z4f940nzv"))))
|
(base32 "0954crhlbapxis96g1s0vfpf78ybr64zvjalak387ksxj560g44x"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:tests? #f ; No tests
|
#:tests? #f ; No tests
|
||||||
#:make-flags
|
#:make-flags
|
||||||
#~(list "-Csrc/runtime" "runtime"
|
#~(list "-Csrc/runtime" "runtime-fuse3"
|
||||||
(string-append "CC=" #$(cc-for-target))
|
(string-append "CC=" #$(cc-for-target))
|
||||||
(string-append
|
(string-append
|
||||||
"CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse3/"
|
"CFLAGS=" "-I" #$(this-package-input "fuse") "/include/fuse/"
|
||||||
" -DGIT_COMMIT='\"" "guix-" #$version "\"'"
|
" -DGIT_COMMIT='\"" "guix-" #$version "\"'"
|
||||||
" -D_FILE_OFFSET_BITS=64"
|
" -D_FILE_OFFSET_BITS=64"
|
||||||
" -static"
|
" -static"
|
||||||
@@ -66,22 +64,17 @@
|
|||||||
(ice-9 binary-ports))
|
(ice-9 binary-ports))
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'use-pkgconfig-flags
|
|
||||||
(lambda _
|
|
||||||
(substitute* "src/runtime/Makefile"
|
|
||||||
(("-lmimalloc")
|
|
||||||
"$(pkg-config --cflags mimalloc)"))))
|
|
||||||
(delete 'configure)
|
(delete 'configure)
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda _
|
(lambda _
|
||||||
(install-file "src/runtime/runtime"
|
(install-file "src/runtime/runtime-fuse3"
|
||||||
(string-append #$output "/bin"))))
|
(string-append #$output "/bin"))))
|
||||||
;; Must be after all elf reliant phases. Used to identify the
|
;; Must be after all elf reliant phases. Used to identify the
|
||||||
;; executable as an AppImage as per the specification.
|
;; executable as an AppImage as per the specification.
|
||||||
(add-after 'make-dynamic-linker-cache 'set-magic-bytes
|
(add-after 'make-dynamic-linker-cache 'set-magic-bytes
|
||||||
(lambda _
|
(lambda _
|
||||||
(let ((port (open (string-append #$output
|
(let ((port (open (string-append #$output
|
||||||
"/bin/runtime")
|
"/bin/runtime-fuse3")
|
||||||
(logior O_WRONLY))))
|
(logior O_WRONLY))))
|
||||||
(seek port 8 SEEK_SET)
|
(seek port 8 SEEK_SET)
|
||||||
(put-bytevector port #vu8(#x41 #x49 #x02))
|
(put-bytevector port #vu8(#x41 #x49 #x02))
|
||||||
@@ -91,12 +84,9 @@
|
|||||||
(this-package-input "fuse")
|
(this-package-input "fuse")
|
||||||
(gexp-input (this-package-input "zstd") "static")
|
(gexp-input (this-package-input "zstd") "static")
|
||||||
(gexp-input (this-package-input "zlib") "static"))))
|
(gexp-input (this-package-input "zlib") "static"))))
|
||||||
(native-inputs (list pkg-config))
|
|
||||||
;; Only needed at build time.
|
;; Only needed at build time.
|
||||||
(inputs (list `(,fuse "out")
|
(inputs (list squashfuse-for-appimage
|
||||||
`(,fuse "static")
|
fuse-for-appimage
|
||||||
mimalloc
|
|
||||||
squashfuse-for-appimage
|
|
||||||
`(,zstd "static")
|
`(,zstd "static")
|
||||||
`(,zlib "static")))
|
`(,zlib "static")))
|
||||||
(synopsis "Runtime for executing AppImages")
|
(synopsis "Runtime for executing AppImages")
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2016, 2020, 2021, 2025, 2026 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2016, 2020, 2021, 2025 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
|
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
|
||||||
;;; Copyright © 2019, 2022, 2024 Andy Tai <atai@atai.org>
|
;;; Copyright © 2019, 2022, 2024 Andy Tai <atai@atai.org>
|
||||||
@@ -43,7 +43,6 @@
|
|||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix utils)
|
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
@@ -249,16 +248,6 @@ complex. It supports all currently known x86 architectural extensions, and
|
|||||||
has strong support for macros.")
|
has strong support for macros.")
|
||||||
(license license:bsd-2)))
|
(license license:bsd-2)))
|
||||||
|
|
||||||
(define* (maybe-nasm #:optional
|
|
||||||
(system (or (%current-target-system)
|
|
||||||
(%current-system))))
|
|
||||||
;; For some packages nasm is only needed when compiling to/for x86/x86_64.
|
|
||||||
(if (target-x86? system)
|
|
||||||
(list nasm)
|
|
||||||
'()))
|
|
||||||
|
|
||||||
(export maybe-nasm)
|
|
||||||
|
|
||||||
(define-public yasm
|
(define-public yasm
|
||||||
(package
|
(package
|
||||||
(name "yasm")
|
(name "yasm")
|
||||||
|
|||||||
+305
-1048
File diff suppressed because it is too large
Load Diff
+23
-68
@@ -62,7 +62,6 @@
|
|||||||
;;; 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.
|
||||||
;;;
|
;;;
|
||||||
@@ -1210,7 +1209,7 @@ PulseAudio clients, featuring:
|
|||||||
(define-public ardour
|
(define-public ardour
|
||||||
(package
|
(package
|
||||||
(name "ardour")
|
(name "ardour")
|
||||||
(version "9.2")
|
(version "9.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -1227,7 +1226,7 @@ PulseAudio clients, featuring:
|
|||||||
namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
|
namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"14s6cq3x7l7b682ah9k8cdr6plfirlgm882dc2nm51lxwl91zcfd"))
|
"00bramm8dq0ihr376n7l9rg0mjzxmzw6lxvsbsdlrdsimfwsy16p"))
|
||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system waf-build-system)
|
(build-system waf-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
@@ -3439,7 +3438,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 "0fvnvr74q5khxlj5sylfnkblydmwgdbvj04mhdqw0zzmfqwignhd"))))
|
(base32 "08ji4lg24flzi6g3yaavfq8hz3kr98q2ripk5m4qk9z172qxbbc9"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -3704,44 +3703,6 @@ 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")
|
||||||
@@ -6529,23 +6490,22 @@ on the ALSA software PCM plugin.")
|
|||||||
(define-public snd
|
(define-public snd
|
||||||
(package
|
(package
|
||||||
(name "snd")
|
(name "snd")
|
||||||
(version "26.3")
|
(version "25.2")
|
||||||
(source
|
(source (origin
|
||||||
(origin
|
(method url-fetch)
|
||||||
(method url-fetch)
|
(uri (string-append "ftp://ccrma-ftp.stanford.edu/pub/Lisp/"
|
||||||
(uri (string-append "https://ccrma.stanford.edu/software/snd/snd-"
|
"snd-" version ".tar.gz"))
|
||||||
version ".tar.gz"))
|
(sha256
|
||||||
(sha256
|
(base32
|
||||||
(base32
|
"0fgxqk0byxdj6059mb9d5qic2dqjabz49j0szsrn2y3c9nz6iyq4"))))
|
||||||
"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 ; Required by 'install-doc'.
|
#:out-of-source? #f ; for the 'install-doc' phase
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
#~(let
|
#~(let ((docdir (string-append #$output "/share/doc/"
|
||||||
((docdir (string-append #$output "/share/doc/snd-" #$version)))
|
#$name "-" #$version)))
|
||||||
(list "--with-alsa"
|
(list "--with-alsa"
|
||||||
"--with-jack"
|
"--with-jack"
|
||||||
"--with-gmp"
|
"--with-gmp"
|
||||||
@@ -6553,20 +6513,18 @@ 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-h
|
(add-after 'install 'install-s7
|
||||||
(lambda _
|
(lambda _
|
||||||
(install-file "s7.h" (string-append #$output
|
(install-file "s7.h" (string-append #$output "/include"))))
|
||||||
"/include"))))
|
|
||||||
(add-after 'install 'install-doc
|
(add-after 'install 'install-doc
|
||||||
(lambda _
|
(lambda _
|
||||||
(let
|
(let ((doc (string-append #$output "/share/doc/"
|
||||||
((docdir (string-append #$output "/share/doc/snd-"
|
#$name "-" #$version)))
|
||||||
#$version)))
|
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (f)
|
(lambda (f)
|
||||||
(install-file f docdir))
|
(install-file f doc))
|
||||||
(find-files "." "\\.html$"))
|
(find-files "." "\\.html$"))
|
||||||
(copy-recursively "pix" (string-append docdir "/pix"))))))))
|
(copy-recursively "pix" (string-append doc "/pix"))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config))
|
(list pkg-config))
|
||||||
(inputs
|
(inputs
|
||||||
@@ -6585,16 +6543,13 @@ 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 (license:non-copyleft "file://COPYING"))))
|
||||||
;; 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
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,25 @@
|
|||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.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 beam-apps)
|
||||||
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module (guix build-system mix))
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2026 Giacomo Leidi <goodoldpaul@autistici.org>
|
;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -16,20 +16,28 @@
|
|||||||
;;; You should have received a copy of the GNU General Public License
|
;;; You should have received a copy of the GNU General Public License
|
||||||
;;; 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 services configuration utils)
|
(define-module (gnu packages beam-packages)
|
||||||
#:use-module (ice-9 string-fun)
|
#:use-module (guix gexp)
|
||||||
#:export (uglify-snake-case))
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module (guix build-system mix)
|
||||||
|
#:use-module (gnu packages beam-sources)
|
||||||
|
#:export (lookup-mix-inputs))
|
||||||
|
|
||||||
(define (uglify-snake-case field-name)
|
;;;
|
||||||
"Serializes FIELD-NAME, a field name from @code{(gnu services configuration)},
|
;;; This file is managed by ‘guix import’. Do NOT add definitions manually.
|
||||||
to a downcased, snake case string representation of the field name. Trailing
|
;;;
|
||||||
@code{?} in the name are dropped and dashes are replaced with underscores.
|
;;; BEAM libraries fetched from hex.pm.
|
||||||
|
;;;
|
||||||
|
|
||||||
For example the procedure would convert @code{'A-Field?} to @code{\"a_field\"}."
|
(define aaaa-separator 'begin-of-beam-packages)
|
||||||
(define str (symbol->string field-name))
|
|
||||||
(string-downcase
|
(define cccc-separator 'end-of-beam-packages)
|
||||||
(string-replace-substring
|
|
||||||
(if (string-suffix? "?" str)
|
|
||||||
(string-drop-right str 1)
|
;;;
|
||||||
str)
|
;;; Mix inputs.
|
||||||
"-" "_")))
|
;;;
|
||||||
|
|
||||||
|
(define-mix-inputs lookup-mix-inputs)
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
|
;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.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 beam-sources)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix git-download)
|
||||||
|
#:use-module (guix build-system mix))
|
||||||
|
|
||||||
|
;;;
|
||||||
|
;;; BEAM libraries requiring modification.
|
||||||
|
;;; These packages are hidden, as they are not interesting to users.
|
||||||
|
;;;
|
||||||
+10
-24
@@ -14,7 +14,6 @@
|
|||||||
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
|
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
|
||||||
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
|
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
|
||||||
;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com>
|
||||||
;;; Copyright © 2026 Sughosha <sughosha@disroot.org>
|
|
||||||
;;; Copyright © 2023 Advanced Micro Devices, Inc.
|
;;; Copyright © 2023 Advanced Micro Devices, Inc.
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
@@ -42,7 +41,6 @@
|
|||||||
#:use-module (guix amd-gpu)
|
#:use-module (guix amd-gpu)
|
||||||
#:use-module (guix search-paths)
|
#:use-module (guix search-paths)
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix build-system qt)
|
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system python)
|
#:use-module (guix build-system python)
|
||||||
#:use-module (guix build-system pyproject)
|
#:use-module (guix build-system pyproject)
|
||||||
@@ -732,7 +730,7 @@ and options. With careful benchmarking, different hardware can be compared.")
|
|||||||
(define-public kdiskmark
|
(define-public kdiskmark
|
||||||
(package
|
(package
|
||||||
(name "kdiskmark")
|
(name "kdiskmark")
|
||||||
(version "3.2.0")
|
(version "3.1.4")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -741,13 +739,14 @@ and options. With careful benchmarking, different hardware can be compared.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"161yyy4fcy5bnzhbcd7p90nlcslcsfp7n3m3bz9bygch7bdjw46g"))))
|
"1x8vd6swmf0i7f6m6wl2154n6plx8jkmcqfq6zxbdy255f1da74c"))))
|
||||||
(build-system qt-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:qtbase qtbase
|
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
#~(list (string-append "-DPOLKITQT-1_INSTALL_DIR=" #$output))
|
;; Drop runtime dependency on KDE's KFAuth.
|
||||||
|
#~(list "-DPERFORM_PAGECACHE_CLEARING_USING_KF5AUTH=no"
|
||||||
|
(string-append "-DPOLKITQT-1_INSTALL_DIR=" #$output))
|
||||||
#:tests? #f ;no test suite
|
#:tests? #f ;no test suite
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
@@ -760,10 +759,10 @@ and options. With careful benchmarking, different hardware can be compared.")
|
|||||||
(lambda _
|
(lambda _
|
||||||
(rmdir "src/singleapplication")
|
(rmdir "src/singleapplication")
|
||||||
(symlink #$(package-source
|
(symlink #$(package-source
|
||||||
(this-package-input "single-application"))
|
(this-package-input "single-application-qt5"))
|
||||||
"src/singleapplication"))))))
|
"src/singleapplication"))))))
|
||||||
(native-inputs (list extra-cmake-modules qttools))
|
(native-inputs (list extra-cmake-modules qttools-5))
|
||||||
(inputs (list fio polkit-qt6 single-application qtwayland))
|
(inputs (list fio polkit-qt qtbase-5 single-application-qt5))
|
||||||
(home-page "https://github.com/JonMagon/KDiskMark")
|
(home-page "https://github.com/JonMagon/KDiskMark")
|
||||||
(synopsis "Simple disk benchmark tool")
|
(synopsis "Simple disk benchmark tool")
|
||||||
(description "KDiskMark is an HDD and SSD benchmark tool. KDiskMark
|
(description "KDiskMark is an HDD and SSD benchmark tool. KDiskMark
|
||||||
@@ -945,20 +944,7 @@ 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
|
||||||
|
|||||||
+593
-472
File diff suppressed because it is too large
Load Diff
@@ -913,7 +913,7 @@ suite native in R.")
|
|||||||
(define-public r-bpcells
|
(define-public r-bpcells
|
||||||
(package
|
(package
|
||||||
(name "r-bpcells")
|
(name "r-bpcells")
|
||||||
(version "0.3.1")
|
(version "0.3.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -922,7 +922,7 @@ suite native in R.")
|
|||||||
(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 "0yqgcajq83g25mznwcngaw7pi6vcqxqdnynpgb95yci57k3wrp6j"))
|
(base32 "12h1di45fg06nhsliii7v0h1z567pkpis1xm4ar1qr8ns1n8iljw"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(delete-file-recursively "r/src/vendor/highway"))))
|
'(delete-file-recursively "r/src/vendor/highway"))))
|
||||||
@@ -931,15 +931,13 @@ suite native in R.")
|
|||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:phases
|
#:phases
|
||||||
`(modify-phases %standard-phases
|
'(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'chdir
|
(add-after 'unpack 'chdir
|
||||||
(lambda _ (chdir "r")))
|
(lambda _
|
||||||
,@(if (target-x86-32?)
|
(substitute* "r/configure"
|
||||||
'((add-after 'chdir 'require-sse2
|
(("tools/hwy-test.cpp" m)
|
||||||
;; This avoids falling back to the scalar backend in
|
(string-append m " $HWY_LIBS $HWY_CFLAGS")))
|
||||||
;; highway, which fails to build.
|
(chdir "r"))))))
|
||||||
(lambda _ (setenv "CFLAGS" "-msse2"))))
|
|
||||||
'()))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list r-dplyr
|
(list r-dplyr
|
||||||
r-ggplot2
|
r-ggplot2
|
||||||
@@ -18337,6 +18335,44 @@ 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")
|
||||||
@@ -22351,6 +22387,37 @@ 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,16 +41,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 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)
|
||||||
@@ -60,9 +76,8 @@
|
|||||||
#: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 ncurses)
|
|
||||||
#:use-module (gnu packages nettle)
|
#:use-module (gnu packages nettle)
|
||||||
#:use-module (gnu packages nss)
|
#:use-module (gnu packages ncurses)
|
||||||
#: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)
|
||||||
@@ -71,30 +86,15 @@
|
|||||||
#: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 qt)
|
|
||||||
#:use-module (gnu packages serialization)
|
#:use-module (gnu packages serialization)
|
||||||
|
#:use-module (gnu packages qt)
|
||||||
#: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 license:gpl2 license:gpl3))))
|
(license (list l:gpl2 l: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 license:gpl2+)))
|
(license l: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 license:gpl3)))
|
(license l: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 license:gpl2+)))
|
(license l: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 license:gpl2+)))
|
(license l: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 license:gpl3+))))
|
(license l: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 license:gpl2+)))
|
(license l: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 license:lgpl2.1+)))
|
(license l: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 license:public-domain ; sha1.*, used to build without OpenSSL
|
(license (list l:public-domain ; sha1.*, used to build without OpenSSL
|
||||||
license:gpl2+)))) ; with permission to link with OpenSSL
|
l: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 license:bsd-2)))
|
(license l: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 license:gpl2+)))
|
(license l: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 license:gpl3+)))
|
(license l: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 "004af606e6a0efc22bc65ab1016b553441cacb71")
|
(commit "011eef4a5b36a7ebf4adedc486d96b77cfa25c54")
|
||||||
(revision "6")
|
(revision "5")
|
||||||
(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 "1bfd2d53flrkgvjcr1kj9nbxj4y9a4pcr7m3dycccdhd21x6k0ln")))))
|
(base32 "0ng8a88zdvrxg30fz83gswjy27b3hfx9q11n2i715id7az7kqf9x")))))
|
||||||
|
|
||||||
(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 "6c15e4ef91888c610caf73829dc78ae9549ed24a")
|
(commit "6844322800de647da0c4fe06dd6a0b212a3942e4")
|
||||||
(revision "6")
|
(revision "5")
|
||||||
(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 "0n2h6drqh44b1zgl729bfr70n08mkm536a2vqgivw7dm5dmi8zd3")))))
|
(base32 "13vxq4z1wxivz5xklncxd2sj5aqkyhq919vzbbfp0fgh0imhikib")))))
|
||||||
|
|
||||||
(define ublock-origin
|
(define ublock-origin
|
||||||
(package
|
(package
|
||||||
(name "ublock-origin")
|
(name "ublock-origin")
|
||||||
(version "1.70.0")
|
(version "1.66.2")
|
||||||
(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
|
||||||
"0j1m80nz86yc69c42hv5di5zza0vkycqmjaydb9jgx0abcvi19x5"))))
|
"16ph031hb8bf4rxyxvm6jr0bxmy0snza11jfrbjgfb390gax9r63"))))
|
||||||
(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")))
|
||||||
@@ -328,15 +328,15 @@ with the @uref{https://keepassxc.org, KeePassXC} password manager.")
|
|||||||
(define noscript
|
(define noscript
|
||||||
(package
|
(package
|
||||||
(name "noscript")
|
(name "noscript")
|
||||||
(version "13.6.18.1984")
|
(version "13.2.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch/zipbomb)
|
(method url-fetch/zipbomb)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"https://archive.torproject.org/tor-package-archive/torbrowser/noscript/noscript-"
|
"https://noscript.net/download/releases/noscript-" version
|
||||||
version ".xpi"))
|
".xpi"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0assv8v89hhg302q81vvv7ln3q8k9m6rzjkbprv2j05ghb23kkvm"))))
|
"0w2w0a76dk01bkh83mqwgs9ky02rjqk15z5sxg4a6mw0hpr81bpm"))))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(properties '((addon-id . "{73a6fe31-595d-460b-a920-fcc0f8843232}")))
|
(properties '((addon-id . "{73a6fe31-595d-460b-a920-fcc0f8843232}")))
|
||||||
(arguments
|
(arguments
|
||||||
|
|||||||
@@ -44,17 +44,37 @@
|
|||||||
;;; 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)
|
||||||
@@ -85,27 +105,7 @@
|
|||||||
#: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,8 +196,7 @@ 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))
|
||||||
@@ -208,7 +207,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
|
||||||
(list python-minimal-wrapper))
|
`(("python" ,python-2)))
|
||||||
(inputs
|
(inputs
|
||||||
(list lua))
|
(list lua))
|
||||||
(home-page "https://matricks.github.io/bam/")
|
(home-page "https://matricks.github.io/bam/")
|
||||||
@@ -275,14 +274,14 @@ generate such a compilation database.")
|
|||||||
(define-public bmake
|
(define-public bmake
|
||||||
(package
|
(package
|
||||||
(name "bmake")
|
(name "bmake")
|
||||||
(version "20260406")
|
(version "20260313")
|
||||||
(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 "09nzd9v12n2pwxmf67056kzjnvxcpk5q2x1fs5qkrsk1ssh5yvpd"))
|
(base32 "0xgryknmv625idw37rq89mpl5rymwdb15j5w8zxwy1gf8b6z7j3n"))
|
||||||
(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
|
||||||
@@ -345,8 +344,8 @@ programs and other files depend.")
|
|||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public gn
|
(define-public gn
|
||||||
(let ((commit "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a")
|
(let ((commit "ee5b7e32b961a9da1933e9f46a018ba6cac8ef60")
|
||||||
(revision "2354")) ;as returned by `git describe`, used below
|
(revision "2277")) ;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))
|
||||||
@@ -356,7 +355,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
|
||||||
"0yz38czmbc72q1hkiv3cwxqh2i8ji2vkkvvk5ws2cjplmn2vj0x9"))
|
"19kkvwxl66vlzlfppbq03fmi59i5g8a1yc71fsfgwqqmx4wywd6w"))
|
||||||
(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
|
||||||
@@ -366,8 +365,7 @@ programs and other files depend.")
|
|||||||
(lambda _
|
(lambda _
|
||||||
(setenv "CC" "gcc")
|
(setenv "CC" "gcc")
|
||||||
(setenv "CXX" "g++")
|
(setenv "CXX" "g++")
|
||||||
(setenv "CXXFLAGS"
|
(setenv "CXXFLAGS" "-g -O2 -Wno-error=redundant-move")
|
||||||
"-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, 2026 Ashish SHUKLA <ashish.is@lostca.se>
|
;;; Copyright © 2025 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 "9.0.0")
|
(version "7.7.1")
|
||||||
(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 "0f5ccvqj7pfa69m9y1kxp2v1lybx6x8i9pykdqfkr7dydqbhrhx6"))))
|
(base32 "0kw4j4qqcfjaii667xa745pklj50m70nqq8cj5agj714acczbk7y"))))
|
||||||
(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")
|
||||||
|
|||||||
+21
-26
@@ -595,11 +595,7 @@ 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
|
||||||
@@ -629,28 +625,27 @@ capacity is user-selectable.")
|
|||||||
#t)))
|
#t)))
|
||||||
#:tests? #f)) ; No tests.
|
#:tests? #f)) ; No tests.
|
||||||
(inputs ; TODO package bundled wxvillalib
|
(inputs ; TODO package bundled wxvillalib
|
||||||
(list bash-minimal ; for wrap-program
|
`(("wxwidgets" ,wxwidgets)
|
||||||
cdrtools
|
("wssvg" ,wxsvg)
|
||||||
dbus
|
("bash" ,bash-minimal) ; for wrap-program
|
||||||
dvd+rw-tools
|
("dbus" ,dbus)
|
||||||
dvdauthor
|
("cdrtools" ,cdrtools)
|
||||||
eudev
|
("dvd+rw-tools" ,dvd+rw-tools)
|
||||||
ffmpeg-4
|
("dvdauthor" ,dvdauthor)
|
||||||
fontconfig
|
("eudev" ,eudev)
|
||||||
libexif
|
("fontconfig" ,fontconfig)
|
||||||
libjpeg-turbo
|
("libexif" ,libexif)
|
||||||
wxsvg
|
("libjpeg" ,libjpeg-turbo)
|
||||||
wxwidgets))
|
("ffmpeg" ,ffmpeg-4)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list bison
|
`(("pkg-config" ,pkg-config)
|
||||||
docbook-xml
|
("flex" ,flex)
|
||||||
docbook-xsl
|
("python" ,python-2)
|
||||||
flex
|
("xmlto" ,xmlto)
|
||||||
gettext-minimal
|
("gettext" ,gettext-minimal)
|
||||||
pkg-config
|
("docbook-xml" ,docbook-xml)
|
||||||
python-minimal-wrapper
|
("docbook-xsl" ,docbook-xsl)
|
||||||
xmlto
|
("zip" ,zip)))
|
||||||
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
|
||||||
|
|||||||
+25
-1
@@ -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") ; On bump, remove some skipped tests in python-cherrypy.
|
(version "3.8.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (pypi-uri "flaky" version))
|
(uri (pypi-uri "flaky" version))
|
||||||
@@ -3719,6 +3719,30 @@ 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 "lib")
|
`(,hwloc-2 "lib")
|
||||||
libtirpc
|
libtirpc
|
||||||
lmfit
|
lmfit
|
||||||
muparser
|
muparser
|
||||||
|
|||||||
+71
-119
@@ -79,13 +79,11 @@
|
|||||||
'("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
|
||||||
@@ -106,11 +104,8 @@
|
|||||||
"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
|
||||||
@@ -125,12 +120,19 @@
|
|||||||
"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
|
"third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;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
|
||||||
@@ -138,25 +140,19 @@
|
|||||||
;; 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
|
||||||
@@ -168,12 +164,10 @@
|
|||||||
"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
|
||||||
|
|
||||||
@@ -185,7 +179,6 @@
|
|||||||
"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
|
||||||
@@ -194,9 +187,7 @@
|
|||||||
"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
|
||||||
@@ -205,9 +196,6 @@
|
|||||||
"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
|
||||||
@@ -220,14 +208,12 @@
|
|||||||
"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
|
||||||
@@ -241,15 +227,11 @@
|
|||||||
"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
|
||||||
@@ -262,7 +244,6 @@
|
|||||||
"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
|
||||||
@@ -270,20 +251,14 @@
|
|||||||
"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
|
||||||
@@ -293,7 +268,6 @@
|
|||||||
"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
|
||||||
@@ -305,14 +279,11 @@
|
|||||||
"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/include/third_party/vulkan" ;BSD-3
|
"third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
|
||||||
"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
|
||||||
@@ -367,6 +338,7 @@
|
|||||||
"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
|
||||||
@@ -400,7 +372,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 "147.0.7727.137")
|
(define %chromium-version "141.0.7390.65")
|
||||||
(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))
|
||||||
|
|
||||||
@@ -412,7 +384,7 @@
|
|||||||
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
|
(file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1ha84j3zckdv2l8dpicqhmr6a8mq3bqwalw0bmgamvlmns9i7nrj"))))
|
"1hk4rww2gccly1qv0xnswd77haj02rlza82403dxdjm8fkdfndy6"))))
|
||||||
|
|
||||||
(define %debian-origin
|
(define %debian-origin
|
||||||
(origin
|
(origin
|
||||||
@@ -425,7 +397,7 @@
|
|||||||
((_ version) version))))
|
((_ version) version))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"04lqbclkvn9nsksgjpjilh78a8y17mwwq4pmhr6h8gvpp2y3bhhc"))))
|
"06s3kvwb3490xb28n6r3q5n1c0ylsvchiw6s4h1rrp8jqzwjbmc6"))))
|
||||||
|
|
||||||
(define (origin-file origin file)
|
(define (origin-file origin file)
|
||||||
(computed-file
|
(computed-file
|
||||||
@@ -438,38 +410,26 @@
|
|||||||
|
|
||||||
(define %debian-patches
|
(define %debian-patches
|
||||||
(map debian-patch
|
(map debian-patch
|
||||||
'("bookworm/foreach.patch"
|
'("bookworm/clang19.patch"
|
||||||
"debianization/safe-libcxx.patch"
|
"bookworm/foreach.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"
|
||||||
"trixie/cookie-string-view.patch"
|
;; Remove after rust is past
|
||||||
"trixie/nodejs-main.patch")))
|
;; <https://github.com/rust-lang/rust/pull/141061>.
|
||||||
|
"trixie/rust-no-alloc-shim.patch")))
|
||||||
|
|
||||||
(define %guix-patches
|
(define %guix-patches
|
||||||
(list (local-file
|
(list (local-file
|
||||||
(assume-valid-file-name
|
|
||||||
(search-patch
|
|
||||||
"ungoogled-chromium-custom-compiler.patch")))
|
|
||||||
(local-file
|
|
||||||
(assume-valid-file-name
|
|
||||||
(search-patch
|
|
||||||
"ungoogled-chromium-empty-parsed-rustc-args.patch")))
|
|
||||||
(local-file
|
|
||||||
(assume-valid-file-name
|
(assume-valid-file-name
|
||||||
(search-patch
|
(search-patch
|
||||||
"ungoogled-chromium-extension-search-path.patch")))
|
"ungoogled-chromium-extension-search-path.patch")))
|
||||||
|
(local-file
|
||||||
|
(assume-valid-file-name
|
||||||
|
(search-patch
|
||||||
|
"ungoogled-chromium-unbundle-icu-target.patch")))
|
||||||
(local-file
|
(local-file
|
||||||
(assume-valid-file-name
|
(assume-valid-file-name
|
||||||
(search-patch
|
(search-patch
|
||||||
@@ -540,8 +500,9 @@
|
|||||||
"#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" "libjpeg" "libpng" "libwebp" "libxml"
|
"harfbuzz-ng" "icu" "libjpeg"
|
||||||
"libxslt" "openh264" "opus" "zlib")))))
|
"libpng" "libwebp" "libxml" "libxslt" "openh264" "opus"
|
||||||
|
"zlib")))))
|
||||||
|
|
||||||
(define opus+custom
|
(define opus+custom
|
||||||
(package/inherit opus
|
(package/inherit opus
|
||||||
@@ -570,7 +531,7 @@
|
|||||||
%chromium-version "-lite.tar.xz"))
|
%chromium-version "-lite.tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1m22whg5n9lw9gqhalm95jwfm45lqp4a7cs3mn3f4n8w0rvr0r5j"))
|
"09iwglswnr6d45zz3zsjw7jpm1xlwwkxlz9h5nlhqxyd933a04fq"))
|
||||||
(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)
|
||||||
@@ -587,7 +548,6 @@
|
|||||||
;; 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"
|
||||||
@@ -595,8 +555,6 @@
|
|||||||
"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"
|
|
||||||
"build_tflite_with_xnnpack=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"
|
||||||
@@ -614,10 +572,12 @@
|
|||||||
"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"
|
||||||
"fatal_linker_warnings=false"
|
;; Disable type-checking for the Web UI to avoid a Java dependency.
|
||||||
|
"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"
|
||||||
@@ -629,11 +589,6 @@
|
|||||||
"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=\"\""
|
||||||
|
|
||||||
@@ -642,8 +597,6 @@
|
|||||||
"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
|
||||||
@@ -675,10 +628,26 @@
|
|||||||
;; 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=false"
|
"use_system_icu=true"
|
||||||
"use_system_lcms2=true"
|
"use_system_lcms2=true"
|
||||||
"use_system_libffi=true"
|
"use_system_libffi=true"
|
||||||
"use_system_libjpeg=true"
|
"use_system_libjpeg=true"
|
||||||
@@ -689,7 +658,7 @@
|
|||||||
"use_gnome_keyring=false" ;deprecated by libsecret
|
"use_gnome_keyring=false" ;deprecated by libsecret
|
||||||
"use_pulseaudio=true"
|
"use_pulseaudio=true"
|
||||||
"link_pulseaudio=true"
|
"link_pulseaudio=true"
|
||||||
"icu_use_data_file=true"
|
"icu_use_data_file=false"
|
||||||
|
|
||||||
;; VA-API acceleration is currently only supported on x86_64-linux.
|
;; VA-API acceleration is currently only supported on x86_64-linux.
|
||||||
#$@(if (string-prefix? "x86_64" (or (%current-target-system)
|
#$@(if (string-prefix? "x86_64" (or (%current-target-system)
|
||||||
@@ -697,13 +666,6 @@
|
|||||||
'("use_vaapi=true")
|
'("use_vaapi=true")
|
||||||
'())
|
'())
|
||||||
|
|
||||||
#$@(if (string-prefix? "aarch64" (or (%current-target-system)
|
|
||||||
(%current-system)))
|
|
||||||
'("use_v4l2_codec=true"
|
|
||||||
"use_vaapi=false"
|
|
||||||
"use_av1_hw_decoder=true")
|
|
||||||
'())
|
|
||||||
|
|
||||||
;; Do not artificially restrict formats supported by system ffmpeg.
|
;; Do not artificially restrict formats supported by system ffmpeg.
|
||||||
"proprietary_codecs=true"
|
"proprietary_codecs=true"
|
||||||
"ffmpeg_branding=\"Chrome\""
|
"ffmpeg_branding=\"Chrome\""
|
||||||
@@ -751,9 +713,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"
|
||||||
@@ -770,13 +732,15 @@
|
|||||||
(("include \"third_party/curl")
|
(("include \"third_party/curl")
|
||||||
"include \"curl"))
|
"include \"curl"))
|
||||||
|
|
||||||
;; Our clang libs and rustfmt are not under bindgen root directory.
|
;; Unknown flags as of clang-19, can be removed when building with
|
||||||
(substitute* '("build/rust/rust_bindgen_generator.gni"
|
;; newer clang.
|
||||||
"build/rust/rust_bindgen.gni")
|
(substitute* "build/config/compiler/BUILD.gn"
|
||||||
|
(("-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"))))))
|
||||||
(("(_rustfmt_path = \")\\$\\{rust_bindgen_root\\}" _ rustfmt)
|
|
||||||
(string-append rustfmt "${rust_sysroot_absolute}"))))))
|
|
||||||
(add-after 'patch-stuff 'add-absolute-references
|
(add-after 'patch-stuff '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"))
|
||||||
@@ -799,22 +763,13 @@
|
|||||||
(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". Also clang is
|
;; "fatal error: 'format' file not found".
|
||||||
;; 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)
|
||||||
(let* ((libcxx-v1 (search-input-directory inputs
|
(setenv "CPLUS_INCLUDE_PATH"
|
||||||
"include/c++/v1"))
|
(string-append
|
||||||
(target-system #$(nix-system->gnu-triplet
|
(search-input-directory inputs
|
||||||
(or (%current-target-system)
|
"/include/c++/v1")
|
||||||
(%current-system))))
|
":" (getenv "CPLUS_INCLUDE_PATH")))))
|
||||||
(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)
|
||||||
@@ -895,7 +850,6 @@
|
|||||||
"resources.pak"
|
"resources.pak"
|
||||||
"v8_context_snapshot.bin"
|
"v8_context_snapshot.bin"
|
||||||
"chrome_crashpad_handler"
|
"chrome_crashpad_handler"
|
||||||
"icudtl.dat"
|
|
||||||
|
|
||||||
;; Swiftshader ICD.
|
;; Swiftshader ICD.
|
||||||
"libvk_swiftshader.so"
|
"libvk_swiftshader.so"
|
||||||
@@ -918,11 +872,9 @@
|
|||||||
|
|
||||||
(substitute* '("chrome/app/resources/manpage.1.in"
|
(substitute* '("chrome/app/resources/manpage.1.in"
|
||||||
"chrome/installer/linux/common/desktop.template")
|
"chrome/installer/linux/common/desktop.template")
|
||||||
(("@@MENUNAME") "Chromium")
|
(("@@MENUNAME@@") "Chromium")
|
||||||
(("@@PACKAGE") "chromium")
|
(("@@PACKAGE@@") "chromium")
|
||||||
(("/usr/bin/@@usr_bin_symlink_name") exe)
|
(("/usr/bin/@@USR_BIN_SYMLINK_NAME@@") exe))
|
||||||
(("@@uri_scheme") "x-scheme-handler/chromium")
|
|
||||||
(("@@extra_desktop_entries") ""))
|
|
||||||
|
|
||||||
(mkdir-p man)
|
(mkdir-p man)
|
||||||
(copy-file "chrome/app/resources/manpage.1.in"
|
(copy-file "chrome/app/resources/manpage.1.in"
|
||||||
@@ -1003,7 +955,7 @@
|
|||||||
glib
|
glib
|
||||||
gtk+
|
gtk+
|
||||||
harfbuzz
|
harfbuzz
|
||||||
icu4c-77
|
icu4c
|
||||||
lcms
|
lcms
|
||||||
libcxx
|
libcxx
|
||||||
libffi
|
libffi
|
||||||
|
|||||||
+128
-633
@@ -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.124.0, transitively loads (gnu packages
|
;;; defines rust-codex-0.98.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.124.0 is defined, causing an unbound
|
;;; rust-apps before rust-codex-0.98.0 is defined, causing an unbound
|
||||||
;;; variable error.
|
;;; variable error.
|
||||||
|
|
||||||
(define-module (gnu packages codex)
|
(define-module (gnu packages codex)
|
||||||
@@ -36,46 +36,33 @@
|
|||||||
#: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.124.0))
|
(version (package-version rust-codex-0.98.0))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(inherit (package-source rust-codex-0.124.0))
|
(inherit (package-source rust-codex-0.98.0))
|
||||||
(patches (search-patches
|
(patches (search-patches
|
||||||
"codex-acp-0.11.1-disable-code-mode.patch"
|
"codex-0.98.0-remove-patch-sections.patch"
|
||||||
"rust-codex-0.124.0-code-mode-stub-toolname.patch"
|
|
||||||
"rust-codex-0.124.0-remove-patch-sections.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.120.0-test-timeout.patch"))))
|
"rust-codex-0.98.0-test-timeout.patch"))))
|
||||||
(build-system cargo-build-system)
|
(build-system cargo-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:install-source? #f
|
#:install-source? #f
|
||||||
;; exec-server is library-only in 0.124 (no [[bin]] in
|
#:cargo-install-paths '(list "cli" "exec" "exec-server"
|
||||||
;; exec-server/Cargo.toml); cargo install --path exec-server fails
|
"linux-sandbox" "mcp-server" "network-proxy"
|
||||||
;; with "no packages found with binaries or examples". Drop it
|
|
||||||
;; from the install paths -- the library is consumed via the
|
|
||||||
;; workspace by other binaries here, not installed standalone.
|
|
||||||
#:cargo-install-paths '(list "cli" "exec"
|
|
||||||
"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,
|
||||||
@@ -84,55 +71,72 @@
|
|||||||
#:cargo-test-flags '(list "--workspace"
|
#:cargo-test-flags '(list "--workspace"
|
||||||
"--exclude" "codex-app-server-protocol"
|
"--exclude" "codex-app-server-protocol"
|
||||||
"--"
|
"--"
|
||||||
;;; BEGIN Landlock returns NotEnforced
|
;; These tests exercise sandbox denial and
|
||||||
;;; in the build container; the sandbox
|
;; escalation, which requires Landlock to
|
||||||
;;; binary panics instead of cleanly
|
;; cleanly deny filesystem access. Inside the
|
||||||
;;; denying filesystem access.
|
;; build container Landlock returns NotEnforced
|
||||||
;; Sandbox denial and escalation tests.
|
;; and the sandbox binary panics instead.
|
||||||
|
;; 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"
|
||||||
;; codex-exec: spawn_command_under_linux_sandbox
|
;; These tests (in codex-exec) directly call
|
||||||
;; panics with LandlockRestrict (exit 101).
|
;; spawn_command_under_linux_sandbox to verify
|
||||||
|
;; 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"
|
||||||
;; linux-sandbox: process_exec_tool_call
|
;; These linux-sandbox tests directly invoke
|
||||||
;; invokes Landlock; same panic.
|
;; the Landlock sandbox via
|
||||||
|
;; 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"
|
||||||
;; One scenario runs through Landlock
|
;; This test iterates many approval scenarios;
|
||||||
;; which panics; cargo --skip cannot
|
;; one of them
|
||||||
;; target individual scenarios.
|
;; (danger_full_access_on_request_allows_network)
|
||||||
|
;; 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"
|
||||||
;; Landlock panic triggers escalation-retry
|
;; This test verifies session-level patch
|
||||||
;; which interferes with the approval cache.
|
;; approval caching: approve once, skip
|
||||||
|
;; 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. What happens:
|
;; TurnAborted. Default test config is
|
||||||
|
;; 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, so the
|
;; 2. Landlock is unavailable in the Guix
|
||||||
;; sandbox binary exits instantly.
|
;; build container, so the sandbox
|
||||||
|
;; 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, so no escalation --
|
;; returns false (sandboxing.rs:222),
|
||||||
;; denial returned directly.
|
;; so no escalation -- denial returned
|
||||||
|
;; directly.
|
||||||
;; 4. ToolEmitter::finish sends the error
|
;; 4. ToolEmitter::finish sends the error
|
||||||
;; to the mock model.
|
;; to the mock model as
|
||||||
|
;; 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,
|
||||||
@@ -146,370 +150,74 @@
|
|||||||
;; 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"
|
||||||
;; WorkspaceWrite sandbox policy wraps
|
;; Upstream bug: test hardcodes "0.0.0" in the
|
||||||
;; commands with codex-linux-sandbox;
|
;; expected user-agent string but the workspace
|
||||||
;; Landlock panics, command never runs,
|
;; version is "0.98.0".
|
||||||
;; exit_code is None instead of Some(0).
|
"--skip" "get_user_agent_returns_current_codex_user_agent"
|
||||||
"--skip" "request_permissions_grants_apply_to_later_exec_command_calls"
|
;; Same upstream bug: mcp-server tests
|
||||||
;; Same root cause.
|
;; check the initialize response which
|
||||||
"--skip" "request_permissions_grants_apply_to_later_shell_command_calls"
|
;; includes "version": "0.0.0" but the
|
||||||
;; Same root cause.
|
;; server returns "0.98.0".
|
||||||
"--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"
|
||||||
;;; END version mismatch
|
;; These codex-exec-server tests need
|
||||||
;;; BEGIN Test isolation bug:
|
;; "dotslash", a Meta tool that lazily
|
||||||
;;; unique_temp_dir() in
|
;; downloads pre-built binaries from a
|
||||||
;;; state/src/runtime.rs names dirs
|
;; JSON manifest. The test helper
|
||||||
;;; using nanosecond timestamps, so
|
;; create_transport runs
|
||||||
;;; parallel tests can collide. The
|
;; `dotslash -- fetch <path>` to obtain a
|
||||||
;;; SQLite migration runs CREATE TABLE
|
;; custom bash binary described in
|
||||||
;;; threads (without IF NOT EXISTS),
|
;; exec-server/tests/suite/bash.
|
||||||
;;; so the second init panics with
|
;; dotslash is not available in the build
|
||||||
;;; "table threads already exists".
|
;; container.
|
||||||
|
"--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"
|
|
||||||
;;; BEGIN Stack overflow in 'current_thread'
|
|
||||||
;;; tokio runtime. The sibling tests in
|
|
||||||
;;; tracing_tests.rs use the local helper
|
|
||||||
;;; run_current_thread_test_with_stack
|
|
||||||
;;; (4 MiB) but this one uses bare
|
|
||||||
;;; #[tokio::test] on the 2 MiB default
|
|
||||||
;;; test-thread stack, and TurnStart's
|
|
||||||
;;; future graph exceeds it. With
|
|
||||||
;;; RUST_MIN_STACK raised the overflow is
|
|
||||||
;;; gone but the test then deterministically
|
|
||||||
;;; times out waiting for a span tagged
|
|
||||||
;;; codex.op = "user_input" on the remote
|
|
||||||
;;; trace that upstream never emits on that
|
|
||||||
;;; trace in our environment.
|
|
||||||
"--skip" "turn_start_jsonrpc_span_parents_core_turn_spans"
|
|
||||||
;;; END tracing test stack/timeout
|
|
||||||
;;; BEGIN The upstream loader resolves the
|
|
||||||
;;; MCP OAuth credentials store mode by
|
|
||||||
;;; calling
|
|
||||||
;;; resolve_mcp_oauth_credentials_store_mode
|
|
||||||
;;; with env!("CARGO_PKG_VERSION") -- which
|
|
||||||
;;; in the released 0.124.0 tarball is
|
|
||||||
;;; "0.124.0". These fixture tests
|
|
||||||
;;; construct the expected Config by
|
|
||||||
;;; passing the LOCAL_DEV_BUILD_VERSION
|
|
||||||
;;; constant ("0.0.0") to the same
|
|
||||||
;;; resolver, and the resolver only returns
|
|
||||||
;;; File for "0.0.0" -- Auto otherwise.
|
|
||||||
;;; Upstream CI builds from a checkout
|
|
||||||
;;; still carrying version = "0.0.0" so the
|
|
||||||
;;; tests pass there; they cannot pass
|
|
||||||
;;; against a released tag.
|
|
||||||
"--skip" "test_precedence_fixture_with_gpt3_profile"
|
|
||||||
"--skip" "test_precedence_fixture_with_gpt5_profile"
|
|
||||||
"--skip" "test_precedence_fixture_with_o3_profile"
|
|
||||||
"--skip" "test_precedence_fixture_with_zdr_profile"
|
|
||||||
;;; END LOCAL_DEV_BUILD_VERSION fixture mismatch
|
|
||||||
;;; BEGIN Verifies that Codex's user-shell
|
|
||||||
;;; spawn produces a child where
|
|
||||||
;;; CODEX_SANDBOX_NETWORK_DISABLED is unset
|
|
||||||
;;; (asserts stdout == "not-set"). We
|
|
||||||
;;; deliberately set that env var at the
|
|
||||||
;;; check phase to trigger upstream's
|
|
||||||
;;; skip_if_no_network! guards; the var then
|
|
||||||
;;; leaks into the spawned shell and the
|
|
||||||
;;; assertion fails. The guix skip is a
|
|
||||||
;;; direct cost of the network-gate fix --
|
|
||||||
;;; trading one broken test for two that
|
|
||||||
;;; now skip cleanly.
|
|
||||||
"--skip" "user_shell_command_does_not_set_network_sandbox_env_var"
|
|
||||||
;;; END CODEX_SANDBOX_NETWORK_DISABLED leak
|
|
||||||
;;; BEGIN The exec-server/tests/file_system
|
|
||||||
;;; integration tests invoke the real
|
|
||||||
;;; system bwrap, which tries to execvp the
|
|
||||||
;;; test binary at the cargo target path
|
|
||||||
;;; under the build dir. Same root cause
|
|
||||||
;;; as the existing
|
|
||||||
;;; sandbox_reenables_writable_subpaths_under_unreadable_parents
|
|
||||||
;;; skip: guix builds live under /tmp but
|
|
||||||
;;; bwrap's mount namespace excludes /tmp,
|
|
||||||
;;; making the binary invisible inside the
|
|
||||||
;;; namespace.
|
|
||||||
"--skip" "file_system_copy_preserves_symlink_source"
|
|
||||||
"--skip" "file_system_copy_rejects_symlink_escape_destination"
|
|
||||||
"--skip" "file_system_copy_rejects_symlink_escape_source"
|
|
||||||
"--skip" "file_system_create_directory_rejects_symlink_escape"
|
|
||||||
"--skip" "file_system_read_directory_rejects_symlink_escape"
|
|
||||||
"--skip" "file_system_remove_rejects_symlink_escape"
|
|
||||||
"--skip" "file_system_remove_removes_symlink_not_target"
|
|
||||||
"--skip" "file_system_sandboxed_read_allows_readable_root"
|
|
||||||
"--skip" "file_system_sandboxed_read_rejects_symlink_escape"
|
|
||||||
"--skip" "file_system_sandboxed_read_rejects_symlink_parent_dotdot_escape"
|
|
||||||
"--skip" "file_system_sandboxed_write_allows_additional_write_root"
|
|
||||||
"--skip" "file_system_sandboxed_write_rejects_symlink_escape"
|
|
||||||
"--skip" "file_system_sandboxed_write_rejects_unwritable_path"
|
|
||||||
;;; END bwrap-cant-see-/tmp file_system tests
|
|
||||||
;;; BEGIN Landlock is unavailable on Guix,
|
|
||||||
;;; so the sandbox cannot deny network
|
|
||||||
;;; syscalls. These tests expect
|
|
||||||
;;; SandboxErr::Denied for the nc, ping,
|
|
||||||
;;; ssh, getent, and dev_tcp_redirection
|
|
||||||
;;; commands but those commands instead
|
|
||||||
;;; block on connect() until the test's 2s
|
|
||||||
;;; timeout fires (Timeout, exit 124).
|
|
||||||
;;; Same root cause as the Landlock skips
|
|
||||||
;;; at the top of this list; new test names
|
|
||||||
;;; in 0.124.
|
|
||||||
"--skip" "sandbox_blocks_nc"
|
|
||||||
"--skip" "sandbox_blocks_ping"
|
|
||||||
"--skip" "sandbox_blocks_dev_tcp_redirection"
|
|
||||||
"--skip" "sandbox_blocks_getent"
|
|
||||||
"--skip" "sandbox_blocks_ssh"
|
|
||||||
;;; END Landlock network block
|
|
||||||
;;; BEGIN Requires github.com network access.
|
|
||||||
;;; With no "extraKnownMarketplaces" entry
|
|
||||||
;;; in settings.json,
|
|
||||||
;;; collect_marketplace_import_sources
|
|
||||||
;;; inserts a fallback entry for the
|
|
||||||
;;; "claude-plugins-official" marketplace
|
|
||||||
;;; pointing at the github shorthand
|
|
||||||
;;; "anthropics/claude-plugins-official".
|
|
||||||
;;; add_marketplace -> parse_marketplace_source
|
|
||||||
;;; expands that to a github.com/.git URL
|
|
||||||
;;; and clone_git_source runs 'git clone'.
|
|
||||||
;;; The Guix build sandbox has no network,
|
|
||||||
;;; so the clone fails and the marketplace
|
|
||||||
;;; lands in failed_marketplaces. No mock
|
|
||||||
;;; cloner is injected via
|
|
||||||
;;; ExternalAgentConfigService::new_for_test,
|
|
||||||
;;; so there is no in-tree way to satisfy
|
|
||||||
;;; the test offline.
|
|
||||||
"--skip" "import_plugins_infers_claude_official_marketplace_when_missing_from_settings"
|
|
||||||
;;; END github.com network access
|
|
||||||
;;; BEGIN Async race between the rollout
|
|
||||||
;;; writer task and a direct SQLite read.
|
|
||||||
;;; The test calls
|
|
||||||
;;; update_memory_settings_with_app_server,
|
|
||||||
;;; which routes through the in-memory
|
|
||||||
;;; thread path on the app-server's
|
|
||||||
;;; ThreadMemoryModeSet handler ->
|
|
||||||
;;; Session::set_thread_memory_mode ->
|
|
||||||
;;; persist_thread_memory_mode_update,
|
|
||||||
;;; which writes a RolloutItem::SessionMeta
|
|
||||||
;;; with the new mode to the rollout file
|
|
||||||
;;; via recorder.record_items + flush. The
|
|
||||||
;;; rollout writer task then asynchronously
|
|
||||||
;;; calls sync_thread_state_after_write,
|
|
||||||
;;; which calls state_db::apply_rollout_items
|
|
||||||
;;; to mirror the SessionMeta into SQLite.
|
|
||||||
;;; flush() only awaits the rollout-file
|
|
||||||
;;; write, not the subsequent SQLite sync.
|
|
||||||
;;; The test opens a fresh StateRuntime and
|
|
||||||
;;; reads get_thread_memory_mode
|
|
||||||
;;; immediately, so it observes the creation
|
|
||||||
;;; default of "enabled" written by
|
|
||||||
;;; upsert_thread_with_creation_memory_mode
|
|
||||||
;;; instead of the new "disabled". Upstream
|
|
||||||
;;; CI wins this race; we lose.
|
|
||||||
"--skip" "update_memory_settings_updates_current_thread_memory_mode"
|
|
||||||
;;; END memory-mode rollout/sqlite race
|
|
||||||
;;; BEGIN The Stopwatch::new constructor in
|
|
||||||
;;; codex_shell_escalation anchors
|
|
||||||
;;; T0 = Instant::now() at construction;
|
|
||||||
;;; the spawned cancellation task fires at
|
|
||||||
;;; T0 + limit. The test captures
|
|
||||||
;;; start = Instant::now() at T1 > T0 (after
|
|
||||||
;;; cancellation_token() returns) and
|
|
||||||
;;; asserts start.elapsed() >= limit,
|
|
||||||
;;; i.e. (T0 + limit) - T1 >= limit, which
|
|
||||||
;;; is always false by the offset T1 - T0.
|
|
||||||
;;; The test only passes when scheduler
|
|
||||||
;;; jitter on the sleep wakeup happens to
|
|
||||||
;;; exceed that offset. Upstream wins the
|
|
||||||
;;; race; we don't always.
|
|
||||||
"--skip" "cancellation_receiver_fires_after_limit"
|
|
||||||
;;; END Stopwatch construction/start offset race
|
|
||||||
)
|
|
||||||
#: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-utils"
|
"codex-git"
|
||||||
"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-utils-template"
|
"codex-backend-openapi-models"
|
||||||
;;; Tier 1.
|
"codex-process-hardening"
|
||||||
|
"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"
|
||||||
@@ -518,69 +226,35 @@
|
|||||||
"codex-secrets"
|
"codex-secrets"
|
||||||
"codex-execpolicy-legacy"
|
"codex-execpolicy-legacy"
|
||||||
"codex-debug-client"
|
"codex-debug-client"
|
||||||
"codex-analytics"
|
|
||||||
"codex-rollout"
|
|
||||||
"codex-rollout-trace"
|
|
||||||
"codex-terminal-detection"
|
|
||||||
"codex-utils-approval-presets"
|
|
||||||
"codex-utils-cli"
|
|
||||||
"codex-uds"
|
|
||||||
"codex-install-context"
|
|
||||||
"codex-device-key"
|
|
||||||
;;; Tier 2.
|
;;; Tier 2.
|
||||||
"codex-app-server-protocol"
|
"codex-app-server-protocol"
|
||||||
"codex-rmcp-client"
|
"codex-rmcp-client"
|
||||||
"codex-otel"
|
"codex-otel"
|
||||||
"codex-thread-store"
|
|
||||||
"codex-state"
|
"codex-state"
|
||||||
"codex-features"
|
|
||||||
"codex-model-provider"
|
|
||||||
"codex-config"
|
|
||||||
"codex-agent-identity"
|
|
||||||
"codex-aws-auth"
|
|
||||||
"codex-hooks"
|
|
||||||
"codex-code-mode"
|
|
||||||
"codex-feedback"
|
|
||||||
"codex-skills"
|
|
||||||
"codex-test-binary-support"
|
|
||||||
"codex-core"
|
"codex-core"
|
||||||
"codex-core-plugins"
|
|
||||||
"codex-utils-sandbox-summary"
|
|
||||||
"codex-linux-sandbox"
|
"codex-linux-sandbox"
|
||||||
"codex-sandboxing"
|
"codex-feedback"
|
||||||
"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-utils-oss"
|
"codex-common"
|
||||||
"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-network-proxy"
|
|
||||||
"codex-stdio-to-uds"
|
"codex-stdio-to-uds"
|
||||||
|
"codex-network-proxy"
|
||||||
"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.
|
||||||
@@ -596,7 +270,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.124.0) ")))))
|
(("\\(v0\\.0\\.0\\) ") "(v0.98.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
|
||||||
@@ -605,57 +279,23 @@
|
|||||||
(("nucleo = \\{ git = [^}]+\\}")
|
(("nucleo = \\{ git = [^}]+\\}")
|
||||||
"nucleo = \"0.5.0\"")
|
"nucleo = \"0.5.0\"")
|
||||||
(("runfiles = \\{ git = [^}]+\\}")
|
(("runfiles = \\{ git = [^}]+\\}")
|
||||||
"runfiles = \"0.1.0\""))
|
"runfiles = \"0.1.0\""))))
|
||||||
;; Remove workspace members that have unbuildable deps
|
(add-after 'chdir-to-workspace 'add-version-to-workspace-deps
|
||||||
;; (v8-poc requires V8). code-mode stays a workspace member
|
|
||||||
;; so its codex-protocol resolves to the same local copy as
|
|
||||||
;; the rest of the build; disabling its default features
|
|
||||||
;; (below) avoids pulling in V8.
|
|
||||||
(substitute* "Cargo.toml"
|
|
||||||
(("\"v8-poc\",") ""))
|
|
||||||
;; Disable V8 runtime in codex-code-mode by turning off
|
|
||||||
;; default features. Keep path= so code-mode is resolved
|
|
||||||
;; from the local source tree and shares codex-protocol
|
|
||||||
;; (and other workspace crates) with the rest of the build;
|
|
||||||
;; resolving it from the vendor instead introduces a
|
|
||||||
;; duplicate codex-protocol and causes E0308 type
|
|
||||||
;; mismatches in codex-tools.
|
|
||||||
(substitute* "Cargo.toml"
|
|
||||||
(("codex-code-mode = \\{ path = \"code-mode\" \\}")
|
|
||||||
"codex-code-mode = { path = \"code-mode\", default-features = false }"))
|
|
||||||
;; cargo build at workspace root ignores per-dep
|
|
||||||
;; default-features=false and builds code-mode with its
|
|
||||||
;; own default features, which include v8-runtime and
|
|
||||||
;; would pull in V8. Make the default feature empty.
|
|
||||||
(substitute* "code-mode/Cargo.toml"
|
|
||||||
(("^default = \\[\"v8-runtime\"\\]") "default = []"))))
|
|
||||||
(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.
|
||||||
;; Add version = "0.124.0" to internal path dependencies.
|
;; cargo package requires all dependencies to have versions.
|
||||||
|
;; Add version = "0.98.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.124.0\", path = "))
|
(string-append name " = { version = \"0.98.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.124.0\", package = "))
|
(string-append name " = { version = \"0.98.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.124.0\""))))))
|
(string-append path-line "\nversion = \"0.98.0\""))))))
|
||||||
(add-after 'chdir-to-workspace 'use-gnu-store-in-sandbox
|
|
||||||
(lambda _
|
|
||||||
;; LINUX_PLATFORM_DEFAULT_READ_ROOTS in linux-sandbox/src/
|
|
||||||
;; bwrap.rs is the read-only baseline that codex's bwrap
|
|
||||||
;; sandbox bind-mounts so commands can read /usr/bin/ls,
|
|
||||||
;; libc, etc. Upstream lists "/nix/store" for NixOS;
|
|
||||||
;; Guix's equivalent is "/gnu/store". Without this swap,
|
|
||||||
;; the codex sandbox cannot locate any binaries on a Guix
|
|
||||||
;; system because every "system" path resolves into
|
|
||||||
;; /gnu/store/<hash>-pkg/bin/...
|
|
||||||
(substitute* "linux-sandbox/src/bwrap.rs"
|
|
||||||
(("\"/nix/store\"") "\"/gnu/store\""))))
|
|
||||||
(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
|
||||||
@@ -685,14 +325,6 @@
|
|||||||
(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 "\""))
|
||||||
@@ -707,150 +339,42 @@
|
|||||||
(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")))
|
||||||
;; Shebangs inside raw string literals (r#"..."#)
|
;; shebang in test-only file
|
||||||
;; 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*
|
||||||
(list "core/src/plugins/startup_sync_tests.rs"
|
"core/tests/suite/user_notification.rs"
|
||||||
"core/src/tools/runtimes/shell/unix_escalation_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"
|
|
||||||
"exec-server/tests/file_system.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 _
|
||||||
;; HOME must not be a prefix of /tmp, otherwise
|
(setenv "HOME" "/tmp")
|
||||||
;; the TUI's path shortener replaces /tmp/... with
|
(setenv "USER" "nixbld"))))))
|
||||||
;; ~/... and 30 snapshot tests fail.
|
(native-inputs (list clang ;bindgen uses libclang to parse BoringSSL's C headers
|
||||||
(setenv "HOME" "/tmp/guix-home")
|
cmake-minimal ;BoringSSL is compiled from C source
|
||||||
(mkdir-p "/tmp/guix-home")
|
libunwind ;BoringSSL tests verify stack unwinding in assembly
|
||||||
(setenv "USER" "nixbld")
|
perl python-minimal ;for tests
|
||||||
;; Default libtest thread stack is 2 MiB, which is not
|
pkg-config))
|
||||||
;; enough for tokio current_thread tests that drive
|
|
||||||
;; codex-core's full turn pipeline. Upstream gates such
|
|
||||||
;; tests through run_current_thread_test_with_stack (4 MiB)
|
|
||||||
;; in app-server/src/message_processor/tracing_tests.rs;
|
|
||||||
;; raise the global default so future additions that
|
|
||||||
;; forget the wrapper still pass.
|
|
||||||
(setenv "RUST_MIN_STACK" "8388608")
|
|
||||||
;; Disable network access.
|
|
||||||
(setenv "CODEX_SANDBOX_NETWORK_DISABLED" "1"))))))
|
|
||||||
(native-inputs `(("bubblewrap" ,bubblewrap) ;tests need bwrap on PATH
|
|
||||||
("clang" ,clang)
|
|
||||||
("cmake-minimal" ,cmake-minimal)
|
|
||||||
("libunwind" ,libunwind)
|
|
||||||
("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
|
||||||
libcap oniguruma openssl sqlite zlib `(,zstd "lib")
|
openssl sqlite `(,zstd "lib")
|
||||||
(cargo-inputs 'codex)))
|
(cargo-inputs 'codex)))
|
||||||
(properties '((timeout . 108000) ; 30 hours
|
|
||||||
(max-silent-time . 54000))) ; 15 hours
|
|
||||||
(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")
|
||||||
(description
|
(description
|
||||||
"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.11.1")
|
(version "0.9.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -859,8 +383,9 @@ codex-code-mode's V8 Javascript executor is disabled.")
|
|||||||
(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 "1rlgkbvrbdl5jhf49sjn2mifn2rq6z0vwf0gard23y1bz6sr3wmr"))
|
(base32 "190sq6s6jfz8dkj1y8305r7x6ln86qqr2j1bnfjci7f1x2wyzmsj"))
|
||||||
(patches (search-patches "codex-acp-0.11.1-remove-patch-sections.patch"))))
|
(patches (search-patches "codex-acp-0.9.2-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
|
||||||
@@ -868,43 +393,13 @@ codex-code-mode's V8 Javascript executor is disabled.")
|
|||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'patch-codex-deps
|
(add-after 'unpack 'patch-codex-deps
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda _
|
||||||
;; 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/openai/codex\", tag = \"rust-v0.117.0\"")
|
(("git = \"https://github.com/zed-industries/codex\", branch = \"acp\"")
|
||||||
"version = \"0.117.0\""))
|
"version = \"0.0.0\"")))))))
|
||||||
;; Disable V8 runtime in codex-code-mode (transitive dep).
|
(native-inputs (list pkg-config))
|
||||||
(let ((port (open-file "Cargo.toml" "a")))
|
(inputs (cons* openssl sqlite `(,zstd "lib") (cargo-inputs 'codex-acp)))
|
||||||
(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
|
||||||
|
|||||||
@@ -2375,9 +2375,7 @@ non-Windows systems without running the actual installer using wine.")
|
|||||||
(sha256
|
(sha256
|
||||||
(base32 "17k679glx05v23n8kxbg9vmbf89i2252g5xj6w3dkz19asmh1zd6"))))
|
(base32 "17k679glx05v23n8kxbg9vmbf89i2252g5xj6w3dkz19asmh1zd6"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs (list autoconf automake libtool nasm))
|
||||||
(cons* autoconf automake libtool
|
|
||||||
(maybe-nasm)))
|
|
||||||
(home-page "https://github.com/intel/isa-l")
|
(home-page "https://github.com/intel/isa-l")
|
||||||
(synopsis "Intelligent storage acceleration library")
|
(synopsis "Intelligent storage acceleration library")
|
||||||
(description "ISA-L is a collection of optimized low-level functions
|
(description "ISA-L is a collection of optimized low-level functions
|
||||||
|
|||||||
@@ -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.26")
|
(version "1.25.1")
|
||||||
(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
|
||||||
"1hdwk5dpsz9danxiyfli07b7sqid6hr34qmhs5qjl2dcc00is89j"))))
|
"02kksvnja234k8mpq5j7yms8npbpvh8iz3k03h21lwcqzqsb88rx"))))
|
||||||
(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.2")
|
(version "5.8.1")
|
||||||
(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 "12bmzbfyjsf0mwnam38cw9ib54wj1znh5b7lxzdyll9cvvkhqisr"))
|
(base32 "1wdsdc0nj4m1v8mn95dhavi87ad0adqmld70da59gvp2abff5f0f"))
|
||||||
(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
|
||||||
|
|||||||
@@ -1,226 +0,0 @@
|
|||||||
;;; 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)))
|
|
||||||
+11
-9
@@ -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, 2026 Ashish SHUKLA <ashish.is@lostca.se>
|
;;; Copyright © 2025 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>
|
||||||
@@ -52,7 +52,6 @@
|
|||||||
;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
|
;;; Copyright © 2025 Philippe Swartvagher <phil.swart@gmx.fr>
|
||||||
;;; Copyright © 2025 Murilo <murilo@disroot.org>
|
;;; Copyright © 2025 Murilo <murilo@disroot.org>
|
||||||
;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
|
;;; Copyright © 2026 Justin Veilleux <terramorpha@cock.li>
|
||||||
;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -3193,7 +3192,8 @@ pointers, containers, compiler building blocks, etc.")
|
|||||||
(native-inputs
|
(native-inputs
|
||||||
(list build))
|
(list build))
|
||||||
(inputs
|
(inputs
|
||||||
(list libcutl xerces-c))
|
`(("libcutl" ,libcutl)
|
||||||
|
("libxerces-c" ,xerces-c)))
|
||||||
(synopsis "XSD Front-end")
|
(synopsis "XSD Front-end")
|
||||||
(description "@code{libxsd-frontend} is a compiler frontend for the W3C
|
(description "@code{libxsd-frontend} is a compiler frontend for the W3C
|
||||||
XML Schema definition language. It includes a parser, semantic graph types
|
XML Schema definition language. It includes a parser, semantic graph types
|
||||||
@@ -3360,7 +3360,7 @@ which can evaluate Jsonnet files and expressions.")))
|
|||||||
(define-public simdjson
|
(define-public simdjson
|
||||||
(package
|
(package
|
||||||
(name "simdjson")
|
(name "simdjson")
|
||||||
(version "4.6.3")
|
(version "3.13.0")
|
||||||
(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
|
||||||
"0729mxnc2wjb94gr4znwlzfmgw5w2v9kd8glvn3vnjhkdnd87zry"))))
|
"005yli56nrkvlyx9g9cq8dczk42r9a18l162i2s5k81lj3y7mcrp"))))
|
||||||
(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.2.5")
|
(version "8.0.2")
|
||||||
(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
|
||||||
"1l13nsl4sgq71m7aifrmmmfyl14vp48vqdh7pb50hxqq6f8bq2b5"))))
|
"19x1yklf641yrpad6lk4cq3jmird10d5ig8hicm3p9lxh92k78cl"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -3628,10 +3628,12 @@ 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_MakeAvailable\\(supplemental_test_files.*")
|
(("FetchContent_GetProperties\\(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 ")\n"))))))))
|
#$fast-float-test-files ")\nif(0)\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++")
|
||||||
|
|||||||
+342
-1174
File diff suppressed because it is too large
Load Diff
+12
-11
@@ -276,17 +276,18 @@ Ed448-Goldilocks and Curve448, using the Decaf encoding.")
|
|||||||
(define-public libsodium
|
(define-public libsodium
|
||||||
(package
|
(package
|
||||||
(name "libsodium")
|
(name "libsodium")
|
||||||
(version "1.0.22")
|
(version "1.0.18")
|
||||||
(source
|
(source (origin
|
||||||
(origin
|
(method url-fetch)
|
||||||
(method git-fetch)
|
(uri (list (string-append
|
||||||
(uri (git-reference
|
"https://download.libsodium.org/libsodium/"
|
||||||
(url "https://github.com/jedisct1/libsodium")
|
"releases/libsodium-" version ".tar.gz")
|
||||||
(commit (string-append version "-RELEASE"))))
|
(string-append
|
||||||
(file-name (git-file-name name version))
|
"https://download.libsodium.org/libsodium/"
|
||||||
(sha256
|
"releases/old/libsodium-" version ".tar.gz")))
|
||||||
(base32
|
(sha256
|
||||||
"05lqdn6nzldsia5mv5a9xfvc5k0kybh9snwv7qsb135gva4bpjwk"))))
|
(base32
|
||||||
|
"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
|
||||||
|
|||||||
+2
-113
@@ -69,9 +69,6 @@
|
|||||||
;;; 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>
|
|
||||||
;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -128,7 +125,6 @@
|
|||||||
#: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)
|
||||||
@@ -201,7 +197,6 @@
|
|||||||
#: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)
|
||||||
@@ -3101,64 +3096,6 @@ 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")
|
||||||
@@ -4160,8 +4097,8 @@ programmatically or as a standalone CLI application.")
|
|||||||
(file-name (git-file-name name version))))
|
(file-name (git-file-name name version))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
(list openssl
|
`(("libcrypto" ,openssl)
|
||||||
tcl)) ;for tests
|
("libtcl8.6" ,tcl))) ; required for running the tests
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list tcl))
|
(list tcl))
|
||||||
(arguments
|
(arguments
|
||||||
@@ -5050,54 +4987,6 @@ 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,6 +20,18 @@
|
|||||||
;;; 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)
|
||||||
@@ -28,7 +40,6 @@
|
|||||||
#: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)
|
||||||
@@ -42,17 +53,6 @@
|
|||||||
#: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))
|
||||||
|
|
||||||
|
|||||||
+1
-46
@@ -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, 2026 Vinicius Monego <monego@posteo.net>
|
;;; Copyright © 2025 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,8 +94,6 @@
|
|||||||
#: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)
|
||||||
@@ -422,49 +420,6 @@ 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")
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
(define-public boinc-client
|
(define-public boinc-client
|
||||||
(package
|
(package
|
||||||
(name "boinc-client")
|
(name "boinc-client")
|
||||||
(version "8.2.12")
|
(version "8.2.9")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
(file-name (git-file-name "boinc" version))
|
(file-name (git-file-name "boinc" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0531n0yij1gh06xy6plwivbpmhqfq15jizg3rdgri40nz41rzbgr"))))
|
"0ik9423ii6kal29jdn907pxy8w86zpi8n158qx1gcsh8lsaif1v5"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
+18
-2
@@ -201,13 +201,13 @@ your project into different processes.")
|
|||||||
(define-public python-django
|
(define-public python-django
|
||||||
(package
|
(package
|
||||||
(name "python-django")
|
(name "python-django")
|
||||||
(version "5.2.13")
|
(version "5.2.11")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (pypi-uri "django" version))
|
(uri (pypi-uri "django" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1i1vlffzhwbzp6r6y8ycvwklc45diy4c6i897z379l48a7dqj5d3"))))
|
(base32 "1lq2dynfw6jmvzrzgfrlij2qnxcksaxgnrfr0pj3bvmrv0m2jbbz"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:test-flags
|
'(#:test-flags
|
||||||
@@ -298,6 +298,22 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
|
|||||||
;; This CVE is fixed in 4.1.9.
|
;; This CVE is fixed in 4.1.9.
|
||||||
"CVE-2023-31047"))))))
|
"CVE-2023-31047"))))))
|
||||||
|
|
||||||
|
(define-public python-django-4
|
||||||
|
(package
|
||||||
|
(inherit python-django)
|
||||||
|
(name "python-django-4")
|
||||||
|
(version "4.2.28")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (pypi-uri "django" version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1znc2q1m9p2kxz1rkfkh2hg2sx6i3aqv72zsraad7bci364cvfd4"))))
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments arguments
|
||||||
|
((#:phases phases)
|
||||||
|
#~(modify-phases #$phases (delete 'delete-sitecustomize)))))))
|
||||||
|
|
||||||
(define-public python-django-cache-url
|
(define-public python-django-cache-url
|
||||||
(package
|
(package
|
||||||
(name "python-django-cache-url")
|
(name "python-django-cache-url")
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
;;; Copyright © 2022 ( <paren@disroot.org>
|
;;; Copyright © 2022 ( <paren@disroot.org>
|
||||||
;;; Copyright © 2022 Esther Flashner <esther@flashner.co.il>
|
;;; Copyright © 2022 Esther Flashner <esther@flashner.co.il>
|
||||||
;;; Copyright © 2025-2026 Jonas Meeuws <jonas.meeuws@gmail.com>
|
;;; Copyright © 2025-2026 Jonas Meeuws <jonas.meeuws@gmail.com>
|
||||||
;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -109,7 +108,9 @@
|
|||||||
(lambda _
|
(lambda _
|
||||||
(invoke "cmake" "--install" "."))))))
|
(invoke "cmake" "--install" "."))))))
|
||||||
(inputs
|
(inputs
|
||||||
`(("zlib" ,zlib)))
|
`(("libconfig" ,libconfig)
|
||||||
|
("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)
|
||||||
@@ -321,11 +322,11 @@ integration tests...\n")
|
|||||||
"|core.thread.osthread-debug-shared")))
|
"|core.thread.osthread-debug-shared")))
|
||||||
(#t `("")))))))))))))
|
(#t `("")))))))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(modify-inputs native-inputs
|
(append (delete "llvm"
|
||||||
(delete "llvm")
|
(alist-replace "ldc" (list ldc-bootstrap)
|
||||||
(replace "ldc" ldc-bootstrap)
|
(package-native-inputs ldc-bootstrap)))
|
||||||
(append clang-17 ;propagates llvm and clang-runtime
|
`(("clang" ,clang-17) ;propagates llvm and clang-runtime
|
||||||
python-lit)))
|
("python-lit" ,python-lit))))
|
||||||
(properties
|
(properties
|
||||||
(alist-delete 'hidden? (package-properties ldc-bootstrap)))))
|
(alist-delete 'hidden? (package-properties ldc-bootstrap)))))
|
||||||
|
|
||||||
|
|||||||
+13
-263
@@ -1,13 +1,12 @@
|
|||||||
;;; 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, 2018 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2015-2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
;;; Copyright © 2016, 2017 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, 2019-2021 Marius Bakke <mbakke@fastmail.com>
|
;;; Copyright © 2016, 2020 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>
|
||||||
@@ -22,11 +21,9 @@
|
|||||||
;;; 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.
|
||||||
;;;
|
;;;
|
||||||
@@ -49,12 +46,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 compression)
|
|
||||||
#:use-module (gnu packages crypto)
|
|
||||||
#: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 documentation)
|
#:use-module (gnu packages documentation)
|
||||||
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages crypto)
|
||||||
|
#:use-module (gnu packages datastructures)
|
||||||
#: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)
|
||||||
@@ -68,7 +65,6 @@
|
|||||||
#: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)
|
||||||
@@ -77,8 +73,6 @@
|
|||||||
#: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)
|
||||||
@@ -90,176 +84,17 @@
|
|||||||
#: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 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 meson)
|
|
||||||
#:use-module (guix build-system pyproject)
|
|
||||||
#:use-module (guix build-system python)
|
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix git-download)
|
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
|
#:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
|
||||||
#:use-module (guix utils))
|
#:use-module (guix download)
|
||||||
|
#:use-module (guix git-download)
|
||||||
(define-public adns
|
#:use-module (guix utils)
|
||||||
(package
|
#:use-module (guix build-system copy)
|
||||||
(name "adns")
|
#:use-module (guix build-system glib-or-gtk)
|
||||||
(version "1.6.1")
|
#:use-module (guix build-system gnu)
|
||||||
(source
|
#:use-module (guix build-system meson))
|
||||||
(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
|
|
||||||
(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")
|
||||||
@@ -308,58 +143,6 @@ 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")
|
||||||
@@ -555,39 +338,6 @@ 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
|
||||||
|
|||||||
@@ -148,13 +148,13 @@ system.")
|
|||||||
(define-public r-duckdb
|
(define-public r-duckdb
|
||||||
(package
|
(package
|
||||||
(name "r-duckdb")
|
(name "r-duckdb")
|
||||||
(version "1.5.2")
|
(version "1.5.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (cran-uri "duckdb" version))
|
(uri (cran-uri "duckdb" version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1dldlfwvc33czvlxfmwaj4p9y6sjjj5iqy98yda47a8kclrqmyam"))
|
(base32 "177621m08whqqk4yhj3zrr08l3d9hhlqh3gm9jzhi5cplg47cksq"))
|
||||||
;; This package bundles the duckdb sources and builds a custom variant
|
;; This package bundles the duckdb sources and builds a custom variant
|
||||||
;; of duckdb. I'd be happy to link it with our duckdb library instead,
|
;; of duckdb. I'd be happy to link it with our duckdb library instead,
|
||||||
;; but it does not seem possible to do that.
|
;; but it does not seem possible to do that.
|
||||||
|
|||||||
@@ -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.1")
|
(version "10.0.0")
|
||||||
(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
|
||||||
"1mnlv8fyz03pfg8pkqwdl5gjz6vsk98c6414lf3wkvrkb85ljaav"))
|
"1470x1276yvd8li3w25zjg73fkpl2qp4dsx7adanafq5c4l47rmc"))
|
||||||
(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,9 +1185,7 @@ 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. To use
|
electrical diagrams), gerbview (viewing Gerber files) and others.")
|
||||||
SQLite-backed database libraries, install the optional @code{sqliteodbc}
|
|
||||||
package.")
|
|
||||||
(license license:gpl3+)))
|
(license license:gpl3+)))
|
||||||
|
|
||||||
(define-public kicad-doc
|
(define-public kicad-doc
|
||||||
@@ -1202,7 +1200,7 @@ package.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1c0vn13rp0z12rlqhl321pk2gj9577dyky6xj3i6hb040i3v7zrr"))))
|
"1k0ayxsy0nnv9qxkii9yrxs7jx9y3wfjpsv5yl9wql3vdg3qay69"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags (list "-DBUILD_FORMATS=html"
|
`(#:configure-flags (list "-DBUILD_FORMATS=html"
|
||||||
@@ -1234,7 +1232,7 @@ package.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0iz4lb33wdsw4f82a0ln8ycgaf39gjws03mvl2j1q9npwj6xl1cm"))))
|
"0khfnln0f2zsz5hy31nw2rr0nflb2z3s9n9f7g41g03m9l3s43v2"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(native-inputs (list python-wrapper))
|
(native-inputs (list python-wrapper))
|
||||||
(arguments
|
(arguments
|
||||||
@@ -1264,7 +1262,7 @@ libraries.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0jqgyi1yb2zc6w56ba7xama0wnhrqwbbnf2fqvr47xihvdcvs87v"))))
|
"0ymmd1rzrczpvcqzw1mld9x8xhbka0vvjy3kdqwysg4ri97f5wrm"))))
|
||||||
(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.")))
|
||||||
|
|
||||||
@@ -1281,7 +1279,7 @@ libraries.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0jr70ry6inzc2fy3s300z0zlmihbq95ba1zckyd1wwbpplaj1gbl"))))
|
"0k91iw661fpzb7saryjxdcdvk1kis7dhbcpzp7xzjk84i4jvxrp5"))))
|
||||||
(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.")))
|
||||||
|
|
||||||
@@ -2331,7 +2329,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
|
|||||||
(define-public nvc
|
(define-public nvc
|
||||||
(package
|
(package
|
||||||
(name "nvc")
|
(name "nvc")
|
||||||
(version "1.20.1")
|
(version "1.19.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -2340,7 +2338,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1b38x2ch468s4p6mrq6c8s0d95vb84p6w4v8in79l4w7sfy8jnr0"))))
|
"1zizz2dafm53lzpjayy6vig5pz5ri9cszdivg0jzzh8s3ggkpy1i"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:out-of-source? #t
|
(list #:out-of-source? #t
|
||||||
@@ -3461,7 +3459,7 @@ form of AXI, AXI lite, and AXI stream modules.")
|
|||||||
(define-public python-edalize
|
(define-public python-edalize
|
||||||
(package
|
(package
|
||||||
(name "python-edalize")
|
(name "python-edalize")
|
||||||
(version "0.6.8")
|
(version "0.6.6")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -3470,7 +3468,7 @@ form of AXI, AXI lite, and AXI stream modules.")
|
|||||||
(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 "04m2lhkclw9fj92k43c06j003qnq9i1yhy2131fvcnkkr0d9438m"))))
|
(base32 "115nc15n2cx4x9irjim07zkg0287418djqd6ja7rm8jrnyldvln9"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -3794,7 +3792,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.10") ;v4.7.0 dates back from 2 years ago.
|
(version "5.0.0-dev.9") ;v4.7.0 dates back from 2 years ago.
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -3803,7 +3801,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 "1gr9ghwgqly9zf0sf15ai20sac520rs84b9i5qjxdqpj26ayyl1q"))))
|
(base32 "1j9rvlshzi4mdy7wah1j8ri63drkjb47xly22q40wvl2xp2ghqgs"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -4516,7 +4514,7 @@ unique design feature of Trilinos is its focus on packages.")
|
|||||||
(define-public verilator
|
(define-public verilator
|
||||||
(package
|
(package
|
||||||
(name "verilator")
|
(name "verilator")
|
||||||
(version "5.048")
|
(version "5.046")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -4525,7 +4523,7 @@ unique design feature of Trilinos is its focus on packages.")
|
|||||||
(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 "16c1x66kqmc5ldqjij81kypj471fibfihcqn6kz4wbxvnn0smyn6"))))
|
(base32 "1gr1qhxvl4856hnmnx46dqd2qp0jhdh959zm2qfmxzzh19np7xkm"))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list autoconf
|
(list autoconf
|
||||||
automake
|
automake
|
||||||
|
|||||||
@@ -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.47.2")
|
(version "2.43.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 "1rivy61aq0c9zfklm4bpvvkj7lzjgy316rwxl8qz92xqp6xa292y"))))
|
(base32 "1wgwp74ya0gkvd5pk4qv9s38p85r5yw370y4wv7jywy3hrbrj9f5"))))
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
#:phases
|
#:phases
|
||||||
|
|||||||
@@ -303,17 +303,7 @@ 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
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2023 Pierre-Henry Fröhring <phfrohring@deeplinks.com>
|
;;; Copyright © 2023 Pierre-Henry Fröhring <phfrohring@deeplinks.com>
|
||||||
;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
|
;;; Copyright © 2024, 2026 Igorj Gorjaĉev <igor@goryachev.org>
|
||||||
;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
;;; Copyright © 2025 Giacomo Leidi <therewasa@fishinthecalculator.me>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
@@ -24,6 +24,7 @@
|
|||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages base)
|
#:use-module (gnu packages base)
|
||||||
|
#:use-module (gnu packages erlang)
|
||||||
#:use-module (gnu packages erlang-xyz)
|
#:use-module (gnu packages erlang-xyz)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
@@ -423,6 +424,25 @@ implementing function decorators for Elixir.")
|
|||||||
(home-page "https://hexdocs.pm/decorator/")
|
(home-page "https://hexdocs.pm/decorator/")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public elixir-depscheck
|
||||||
|
(package
|
||||||
|
(name "elixir-depscheck")
|
||||||
|
(version "1.0.11")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (hexpm-uri "depscheck" version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1v33ml2i19s59518j9031bsvipbf4xxr4xk49qx6xs3qby0018aw"))))
|
||||||
|
(build-system mix-build-system)
|
||||||
|
(synopsis "Checking dependency license compatibility in Elixir projects")
|
||||||
|
(description "This package provides @code{elixir-depscheck}, a @code{CI/CD}
|
||||||
|
tool for checking dependency license compatibility in Elixir projects. Reads
|
||||||
|
license information from local hex metadata files and validates compatibility
|
||||||
|
with your project's license using industry-standard rules.")
|
||||||
|
(home-page "https://hexdocs.pm/depscheck/")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public elixir-erlex
|
(define-public elixir-erlex
|
||||||
(package
|
(package
|
||||||
(name "elixir-erlex")
|
(name "elixir-erlex")
|
||||||
@@ -731,6 +751,28 @@ Elixir.")
|
|||||||
(home-page "https://hexdocs.pm/mimic/")
|
(home-page "https://hexdocs.pm/mimic/")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
|
(define-public elixir-mix-audit
|
||||||
|
(package
|
||||||
|
(name "elixir-mix-audit")
|
||||||
|
(version "2.1.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (hexpm-uri "mix_audit" version))
|
||||||
|
(sha256
|
||||||
|
(base32 "0s9dnk42n5665s6l22qf05x63ly11n37am2kmybzccns4672kyc7"))))
|
||||||
|
(build-system mix-build-system)
|
||||||
|
(propagated-inputs
|
||||||
|
(list elixir-jason
|
||||||
|
elixir-yaml-elixir))
|
||||||
|
(synopsis "Scanning Mix dependencies for security vulnerabilities")
|
||||||
|
(description "This package provides @code{elixir-mix-audit}, a
|
||||||
|
@code{mix deps.audit} task to scan @code{Mix} dependencies for security
|
||||||
|
vulnerabilities. It draw its inspiration from tools like npm audit and
|
||||||
|
bundler-audit.")
|
||||||
|
(home-page "https://hexdocs.pm/mix_audit/")
|
||||||
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public elixir-mox
|
(define-public elixir-mox
|
||||||
(package
|
(package
|
||||||
(name "elixir-mox")
|
(name "elixir-mox")
|
||||||
@@ -1227,6 +1269,34 @@ provides a polyfill for @code{dbg} which was introduced in Elixir 1.14.")
|
|||||||
(home-page "https://hexdocs.pm/verbs/")
|
(home-page "https://hexdocs.pm/verbs/")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
|
(define-public elixir-yaml-elixir
|
||||||
|
(package
|
||||||
|
(name "elixir-yaml-elixir")
|
||||||
|
(version "2.12.0")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (hexpm-uri "yaml_elixir" version))
|
||||||
|
(sha256
|
||||||
|
(base32 "1ihknd9qy8y533zd150ch2yag2h895hsp86wamqpm4dcgfpaqsya"))))
|
||||||
|
(build-system mix-build-system)
|
||||||
|
(arguments
|
||||||
|
(list
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'fix-yamerl-hrl-path
|
||||||
|
(lambda _
|
||||||
|
(substitute* "lib/yaml_elixir/records.ex"
|
||||||
|
(("internal\\/yamerl_constr\\.hrl")
|
||||||
|
"yamerl_constr.hrl")))))))
|
||||||
|
(propagated-inputs
|
||||||
|
(list erlang-yamerl))
|
||||||
|
(synopsis "YAML parser for Elixir based on native Erlang implementation")
|
||||||
|
(description "This package provides @code{elixir-yaml-elixir}, a @code{YAML}
|
||||||
|
parser for @code{Elixir} based on native @code{Erlang} implementation.")
|
||||||
|
(home-page "https://hexdocs.pm/yaml_elixir/")
|
||||||
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public elixir-zest
|
(define-public elixir-zest
|
||||||
(package
|
(package
|
||||||
(name "elixir-zest")
|
(name "elixir-zest")
|
||||||
|
|||||||
@@ -51,7 +51,8 @@
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1i10a5d7mlcrav47k7qirqvrqn2kbl5265fbcp8fzavr86xz67m6"))
|
(base32 "1i10a5d7mlcrav47k7qirqvrqn2kbl5265fbcp8fzavr86xz67m6"))
|
||||||
(patches (search-patches "elixir-path-length.patch"))))
|
(patches (search-patches "elixir-path-length.patch"
|
||||||
|
"elixir-vendoring-support.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -164,8 +165,7 @@ 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))
|
(inputs (list bash-minimal erlang rebar3 git))
|
||||||
(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")
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ as bold, underscore or italic.")
|
|||||||
(define-public emacs-buttercup
|
(define-public emacs-buttercup
|
||||||
(package
|
(package
|
||||||
(name "emacs-buttercup")
|
(name "emacs-buttercup")
|
||||||
(version "1.40")
|
(version "1.38")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -72,7 +72,9 @@ as bold, underscore or italic.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r"))))
|
"09n8skr5wi8bs7x81d5bi6z89dd8s1zi9a5f4r2qadaz69slncxq"))
|
||||||
|
(patches
|
||||||
|
(search-patches "emacs-buttercup-1.38-native-comp-spy-on-trampoline-scope.patch"))))
|
||||||
(build-system emacs-build-system)
|
(build-system emacs-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
+447
-1285
File diff suppressed because it is too large
Load Diff
@@ -28,7 +28,6 @@
|
|||||||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||||
;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com>
|
;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com>
|
||||||
;;; Copyright © 2025 John Kehayias <john@guixotic.coop>
|
;;; Copyright © 2025 John Kehayias <john@guixotic.coop>
|
||||||
;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -870,7 +869,7 @@ Started in 2014 as a GSOC project, Guile-Emacs was resurrected in 2024.")
|
|||||||
"0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"))))
|
"0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list gettext-minimal))
|
`(("gettext" ,gettext-minimal)))
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
(list (string-append "--with-charmaps="
|
(list (string-append "--with-charmaps="
|
||||||
|
|||||||
@@ -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-minimal-wrapper texinfo zlib))
|
(list bison boost flex python-2 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
|
||||||
|
|||||||
+10
-13
@@ -1264,8 +1264,7 @@ Enjoy all of your favorite Atari 2600 games on your PC thanks to Stella!")
|
|||||||
(base32 "1xf15b6c3i0vv92b420a92pfvfaxhji56ivin8pn5r7fajkqyfb7"))))
|
(base32 "1xf15b6c3i0vv92b420a92pfvfaxhji56ivin8pn5r7fajkqyfb7"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(cons* pkg-config which
|
(list pkg-config nasm which))
|
||||||
(maybe-nasm)))
|
|
||||||
(inputs
|
(inputs
|
||||||
(list freetype
|
(list freetype
|
||||||
glu
|
glu
|
||||||
@@ -1290,6 +1289,8 @@ Enjoy all of your favorite Atari 2600 games on your PC thanks to Stella!")
|
|||||||
(list "all" (string-append "PREFIX=" out)))
|
(list "all" (string-append "PREFIX=" out)))
|
||||||
;; There are no tests.
|
;; There are no tests.
|
||||||
#:tests? #f))
|
#:tests? #f))
|
||||||
|
;; As per the Makefile (in projects/unix/Makefile):
|
||||||
|
(supported-systems '("i686-linux" "x86_64-linux"))
|
||||||
(home-page "https://www.mupen64plus.org/")
|
(home-page "https://www.mupen64plus.org/")
|
||||||
(synopsis "Nintendo 64 emulator core library")
|
(synopsis "Nintendo 64 emulator core library")
|
||||||
(description
|
(description
|
||||||
@@ -2163,9 +2164,7 @@ as RetroArch.")
|
|||||||
(lambda _
|
(lambda _
|
||||||
(install-file "mupen64plus_next_libretro.so"
|
(install-file "mupen64plus_next_libretro.so"
|
||||||
(string-append #$output "/lib/libretro/")))))))
|
(string-append #$output "/lib/libretro/")))))))
|
||||||
(native-inputs
|
(native-inputs (list nasm pkg-config))
|
||||||
(cons* pkg-config
|
|
||||||
(maybe-nasm)))
|
|
||||||
(inputs (list mesa libpng minizip unzip xxhash zlib))
|
(inputs (list mesa libpng minizip unzip xxhash zlib))
|
||||||
(home-page "https://github.com/libretro/mupen64plus-libretro-nx")
|
(home-page "https://github.com/libretro/mupen64plus-libretro-nx")
|
||||||
(synopsis "Improved Mupen64Plus libretro core")
|
(synopsis "Improved Mupen64Plus libretro core")
|
||||||
@@ -3453,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.287")
|
(version "0.252")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -3462,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 "1p9v71gvaqiyj6sa1b0wkdksa9wnr6yr2a43ckycljjfas5s36kq"))
|
(base32 "07qhcm1v47sy2wj30nx3cbhvcbgki0cl83gabr0miiw60fhgyn6j"))
|
||||||
(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" "flac" "libjpeg" "lua"
|
'("asio" "expat" "glm" "libflac" "libjpeg" "lua"
|
||||||
"portaudio" "portmidi" "pugixml" "rapidjson"
|
"portaudio" "portmidi" "pugixml" "rapidjson" "SDL2"
|
||||||
"sqlite3" "utf8proc" "zlib")))))))
|
"SDL2-override" "sqlite3" "utf8proc" "zlib")))))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -3605,9 +3604,7 @@ This is a part of the TiLP project.")
|
|||||||
libjpeg-turbo
|
libjpeg-turbo
|
||||||
libxi
|
libxi
|
||||||
libxinerama
|
libxinerama
|
||||||
;; MAME requires Lua compiled as C++ to work correctly.
|
lua
|
||||||
;; See https://www.mamedev.org/?p=523
|
|
||||||
lua-5.4-for-c++
|
|
||||||
portaudio
|
portaudio
|
||||||
portmidi
|
portmidi
|
||||||
pugixml
|
pugixml
|
||||||
|
|||||||
@@ -50,7 +50,6 @@
|
|||||||
;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
|
;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org>
|
||||||
;;; Copyright © 2026 Daniel Khodabakhsh <d@niel.khodabakh.sh>
|
;;; Copyright © 2026 Daniel Khodabakhsh <d@niel.khodabakh.sh>
|
||||||
;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
|
;;; Copyright © 2026 Spencer King <spencer.king@wustl.edu>
|
||||||
;;; Copyright © 2026 Brent Wedderburn <mb@bean.za.net>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -254,21 +253,13 @@ their devices.")
|
|||||||
(replace 'build (assoc-ref gnu:%standard-phases 'build))
|
(replace 'build (assoc-ref gnu:%standard-phases 'build))
|
||||||
(replace 'check (assoc-ref gnu:%standard-phases 'check))
|
(replace 'check (assoc-ref gnu:%standard-phases 'check))
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda _
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let* ((bin (string-append #$output "/bin"))
|
(let ((bin (string-append #$output "/bin"))
|
||||||
(share (string-append #$output "/share"))
|
(share (string-append #$output "/share/librecad")))
|
||||||
(apps (string-append share "/applications"))
|
|
||||||
(icons (string-append share "/icons/hicolor/128x128/apps")))
|
|
||||||
(mkdir-p bin)
|
(mkdir-p bin)
|
||||||
(install-file "unix/librecad" bin)
|
(install-file "unix/librecad" bin)
|
||||||
(mkdir-p share)
|
(mkdir-p share)
|
||||||
(copy-recursively "unix/resources"
|
(copy-recursively "unix/resources" share)))))))
|
||||||
(string-append share "/librecad"))
|
|
||||||
(mkdir-p apps)
|
|
||||||
(install-file "desktop/librecad.desktop" apps)
|
|
||||||
(mkdir-p icons)
|
|
||||||
(copy-file "librecad/res/main/librecad.png"
|
|
||||||
(string-append icons "/librecad.png"))))))))
|
|
||||||
(inputs
|
(inputs
|
||||||
(list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
|
(list bash-minimal boost muparser freetype qtbase-5 qtsvg-5))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
@@ -2730,7 +2721,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.1")
|
(version "1.1.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -2740,7 +2731,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 "05dx7ifx33705mxb0vc82j0mzzkazakgadfgq5bws30qrxp49xgg"))
|
(base32 "029ndw1dypx0xhs4fyiinf7gpk8am0vm9b24idvdsx9x7ghrqz4j"))
|
||||||
(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 "28.4.3")
|
(version "27.3.4.6")
|
||||||
(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
|
||||||
"1dsdmp2rccc0rhzy2w8r4amxmc6nr9hbi053j2s0bg9db30b48rc"))
|
"0dhz2c7w28ss0ypj7jh88pfs3kc8hbwiiq91in1j2miy5sn4cp3x"))
|
||||||
(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
|
||||||
"1g17wzv8j12g9272yvv55nj4wqs09hxkv3i0vnp7d6gcs24bmphi"))))))
|
"1j1fcli7ma9vi4qyv67lq7yiznhpnfvcmh57bn8qxvha6ky2pngm"))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list ncurses openssl wxwidgets))
|
(list ncurses openssl wxwidgets))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
|
|||||||
@@ -220,7 +220,6 @@ 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,11 +148,6 @@ 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)
|
||||||
|
|||||||
@@ -1128,8 +1128,8 @@ transaction log.
|
|||||||
(inherit jfsutils)
|
(inherit jfsutils)
|
||||||
(name "jfsutils-static")
|
(name "jfsutils-static")
|
||||||
(inputs
|
(inputs
|
||||||
(modify-inputs inputs
|
`(("util-linux:static" ,util-linux "static")
|
||||||
(prepend (list util-linux "static")))))))
|
,@(package-inputs jfsutils))))))
|
||||||
|
|
||||||
(define-public jfs_fsck/static
|
(define-public jfs_fsck/static
|
||||||
(package
|
(package
|
||||||
@@ -2202,7 +2202,7 @@ while working with large number of files.")
|
|||||||
(define-public squashfuse
|
(define-public squashfuse
|
||||||
(package
|
(package
|
||||||
(name "squashfuse")
|
(name "squashfuse")
|
||||||
(version "0.6.1")
|
(version "0.1.105")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -2211,7 +2211,7 @@ while working with large number of files.")
|
|||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "16ds2xlk6hb5cggi6di8s0aalir3mrx7rk24rw5daad1xw4dbq0y"))))
|
(base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -2249,8 +2249,7 @@ memory-efficient.")
|
|||||||
(install-file "fuseprivate.h"
|
(install-file "fuseprivate.h"
|
||||||
(string-append #$output
|
(string-append #$output
|
||||||
"/include/squashfuse/")))))))))
|
"/include/squashfuse/")))))))))
|
||||||
(inputs (list `(,fuse "out")
|
(inputs (list fuse-for-appimage
|
||||||
`(,fuse "static")
|
|
||||||
`(,zstd "lib")
|
`(,zstd "lib")
|
||||||
`(,zstd "static")
|
`(,zstd "static")
|
||||||
`(,zlib "out")
|
`(,zlib "out")
|
||||||
|
|||||||
@@ -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 "31.0")
|
(version "30.2")
|
||||||
(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
|
||||||
"1qxkcyq8nwq6sw4qi660z8n8356mqdsf4jvpq5ndkvrsx9gfz80b"))))
|
"1jw4djh22v0nih0n7irdbknfbqavlc4l3b8176b5qgc88a60pl3g"))))
|
||||||
(build-system qt-build-system)
|
(build-system qt-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:qtbase qtbase
|
(list #:qtbase qtbase
|
||||||
@@ -197,7 +197,9 @@
|
|||||||
"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 pkg-config
|
(list bash ; provides the sh command for system_tests
|
||||||
|
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))
|
||||||
|
|||||||
@@ -1159,10 +1159,10 @@ Executables included are:
|
|||||||
(native-inputs
|
(native-inputs
|
||||||
(append
|
(append
|
||||||
(list acpica
|
(list acpica
|
||||||
|
nasm
|
||||||
perl
|
perl
|
||||||
python-3
|
python-3
|
||||||
(list util-linux "lib"))
|
(list util-linux "lib"))
|
||||||
(maybe-nasm (string-append arch "-" arch))
|
|
||||||
(if (not (string-prefix? arch (%current-system)))
|
(if (not (string-prefix? arch (%current-system)))
|
||||||
(if (string=? arch "armhf")
|
(if (string=? arch "armhf")
|
||||||
(list (cross-gcc "arm-linux-gnueabihf")
|
(list (cross-gcc "arm-linux-gnueabihf")
|
||||||
|
|||||||
@@ -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, 2021 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2016, 2018, 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,6 +84,7 @@
|
|||||||
#: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)
|
||||||
@@ -523,6 +524,162 @@ 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")
|
||||||
|
|||||||
+40
-33
@@ -4658,6 +4658,46 @@ 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")
|
||||||
@@ -5519,39 +5559,6 @@ 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
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;; Copyright © 2025 wvlab <me@wvlab.xyz>
|
;;; Copyright © 2025 wvlab <me@wvlab.xyz>
|
||||||
;;; Copyright © 2025 jgart <jgart@dismail.de>
|
;;; Copyright © 2025 jgart <jgart@dismail.de>
|
||||||
;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -3054,10 +3053,10 @@ useful with system integration.")
|
|||||||
"0zs4z7l9b57jldwz0ban77f3c2zq43ambd0dssf5qg9i216f9lmj"))))
|
"0zs4z7l9b57jldwz0ban77f3c2zq43ambd0dssf5qg9i216f9lmj"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list dbus-test-runner
|
`(("dbus-test-runner" ,dbus-test-runner)
|
||||||
(list glib "bin")
|
("glib:bin" ,glib "bin")
|
||||||
pkg-config
|
("pkg-config" ,pkg-config)
|
||||||
xorg-server-for-tests))
|
("xvfb" ,xorg-server-for-tests)))
|
||||||
(inputs
|
(inputs
|
||||||
(list gtk+ glib))
|
(list gtk+ glib))
|
||||||
(arguments
|
(arguments
|
||||||
@@ -3418,50 +3417,50 @@ interfaces.")
|
|||||||
(define-public xdg-desktop-portal-wlr
|
(define-public xdg-desktop-portal-wlr
|
||||||
(package
|
(package
|
||||||
(name "xdg-desktop-portal-wlr")
|
(name "xdg-desktop-portal-wlr")
|
||||||
(version "0.8.2")
|
(version "0.7.1")
|
||||||
(source
|
(source (origin
|
||||||
(origin
|
(method git-fetch)
|
||||||
(method git-fetch)
|
(uri (git-reference
|
||||||
(uri (git-reference
|
(url "https://github.com/emersion/xdg-desktop-portal-wlr")
|
||||||
(url "https://github.com/emersion/xdg-desktop-portal-wlr")
|
(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
|
||||||
(base32 "1jj0a9s3h3i04qsxkhcpxjzbb17hs9ngdy7wkypja09233zdz10w"))
|
"1mbq3czka9swwmfaasnaj89y2m254p3qa522ayclh688jdwh70hq"))
|
||||||
(patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
|
(patches (search-patches "xdg-desktop-portal-wlr-harcoded-length.patch"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
`(#:configure-flags
|
||||||
#:configure-flags
|
'("-Dsystemd=disabled"
|
||||||
#~(list "-Dsystemd=disabled"
|
"-Dsd-bus-provider=libelogind")
|
||||||
"-Dsd-bus-provider=libelogind")
|
#:phases
|
||||||
#:phases
|
(modify-phases %standard-phases
|
||||||
#~(modify-phases %standard-phases
|
(add-after 'unpack 'hardcode-binaries
|
||||||
(add-after 'unpack 'hardcode-binaries
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(let ((sh (search-input-file inputs "/bin/sh"))
|
||||||
(let ((sh (search-input-file inputs "/bin/sh"))
|
(grim (search-input-file inputs "/bin/grim"))
|
||||||
(grim (search-input-file inputs "/bin/grim"))
|
(slurp (search-input-file inputs "/bin/slurp")))
|
||||||
(slurp (search-input-file inputs "/bin/slurp")))
|
(substitute* "src/screenshot/screenshot.c"
|
||||||
(substitute* '("src/screencast/chooser.c"
|
(("grim") grim)
|
||||||
"src/screenshot/screenshot.c")
|
(("slurp") slurp)
|
||||||
(("grim") grim)
|
(("execl\\(\"/bin/sh\", \"/bin/sh\"")
|
||||||
(("slurp") slurp)
|
(string-append "execl(\"" sh "\", \"" sh "\"")))
|
||||||
(("/bin/sh") sh))
|
(substitute* "src/screencast/screencast.c"
|
||||||
(substitute* "src/screencast/screencast.c"
|
(("execvp\\(\"sh")
|
||||||
(("execvp\\(\"sh")
|
(string-append "execvp(\"" sh))))))
|
||||||
(format #f "execvp(\"~a" sh))))))
|
(add-after 'install 'install-documentation
|
||||||
(add-after 'install 'install-documentation
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(lambda _
|
(install-file "../source/README.md"
|
||||||
(install-file "../source/README.md"
|
(string-append (assoc-ref outputs "out")
|
||||||
(string-append #$output "/share/doc/"
|
"/share/doc/" ,name)))))))
|
||||||
#$name)))))))
|
(native-inputs
|
||||||
(native-inputs (list cmake-minimal pkg-config scdoc))
|
(list cmake-minimal pkg-config))
|
||||||
(inputs (list bash-minimal
|
(inputs (list elogind
|
||||||
elogind
|
bash-minimal
|
||||||
grim
|
grim
|
||||||
iniparser
|
iniparser
|
||||||
libinih
|
|
||||||
mesa
|
mesa
|
||||||
|
libinih
|
||||||
pipewire
|
pipewire
|
||||||
slurp
|
slurp
|
||||||
wayland
|
wayland
|
||||||
|
|||||||
+82
-202
@@ -97,7 +97,6 @@
|
|||||||
;;; 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.
|
||||||
;;;
|
;;;
|
||||||
@@ -115,32 +114,40 @@
|
|||||||
;;; 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)
|
||||||
#:autoload (gnu packages pascal) (fpc)
|
#:use-module (ice-9 match)
|
||||||
|
#: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 admin)
|
#:use-module (gnu packages adns)
|
||||||
#: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 code)
|
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
|
#:use-module (gnu packages code)
|
||||||
#:use-module (gnu packages cpp)
|
#:use-module (gnu packages cpp)
|
||||||
#:use-module (gnu packages crypto)
|
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages curl)
|
||||||
|
#:use-module (gnu packages crypto)
|
||||||
#:use-module (gnu packages cyrus-sasl)
|
#:use-module (gnu packages cyrus-sasl)
|
||||||
#:use-module (gnu packages dns)
|
|
||||||
#:use-module (gnu packages docbook)
|
|
||||||
#:use-module (gnu packages documentation)
|
#:use-module (gnu packages documentation)
|
||||||
|
#:use-module (gnu packages docbook)
|
||||||
#: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)
|
||||||
@@ -195,8 +202,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 multiprecision)
|
|
||||||
#:use-module (gnu packages music)
|
#:use-module (gnu packages music)
|
||||||
|
#:use-module (gnu packages multiprecision)
|
||||||
#: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)
|
||||||
@@ -205,6 +212,7 @@
|
|||||||
#: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)
|
||||||
@@ -222,9 +230,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)
|
||||||
@@ -241,31 +249,22 @@
|
|||||||
#: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 (gnu packages xorg)
|
|
||||||
#:use-module (gnu packages)
|
|
||||||
#:use-module (guix build-system cmake)
|
|
||||||
#:use-module (guix build-system copy)
|
#:use-module (guix build-system copy)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
#: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 pyproject)
|
|
||||||
#:use-module (guix build-system python)
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
#: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))
|
||||||
|
|
||||||
@@ -484,7 +483,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://gitlab.com/drummyfish/anarch")
|
(url "https://git.sr.ht/~drummyfish/Anarch")
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
@@ -552,14 +551,14 @@ use with @code{udev-service-type}.")
|
|||||||
(define-public armagetronad
|
(define-public armagetronad
|
||||||
(package
|
(package
|
||||||
(name "armagetronad")
|
(name "armagetronad")
|
||||||
(version "0.2.9.3.0")
|
(version "0.2.9.2.3")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/armagetronad/stable/"
|
(uri (string-append "mirror://sourceforge/armagetronad/stable/"
|
||||||
version "/armagetronad-" version ".tbz"))
|
version "/armagetronad-" version ".tbz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1q1zlbhbcimr6bw0ms1pr8hz4q850ivi3hvxn3467jfgiq22f3cy"))))
|
"0a6rlp2lj5bp7pg1yf8brjyb3mw7nqp3amj19wvz3xni21bbc31k"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:configure-flags
|
(list #:configure-flags
|
||||||
@@ -576,7 +575,6 @@ use with @code{udev-service-type}.")
|
|||||||
(("^install_link .*BINDIR.*") "")))))))
|
(("^install_link .*BINDIR.*") "")))))))
|
||||||
(native-inputs (list pkg-config))
|
(native-inputs (list pkg-config))
|
||||||
(inputs (list libxml2
|
(inputs (list libxml2
|
||||||
curl
|
|
||||||
(sdl-union (list sdl sdl-image sdl-mixer))
|
(sdl-union (list sdl sdl-image sdl-mixer))
|
||||||
freeglut
|
freeglut
|
||||||
libpng
|
libpng
|
||||||
@@ -3408,8 +3406,7 @@ and defeat them with your bubbles!")
|
|||||||
"SamTSE/Sources/Engine/Engine.cpp")
|
"SamTSE/Sources/Engine/Engine.cpp")
|
||||||
(("@OUTPUT_DIR@") #$output)))))))
|
(("@OUTPUT_DIR@") #$output)))))))
|
||||||
(inputs (list sdl2 libvorbis))
|
(inputs (list sdl2 libvorbis))
|
||||||
(native-inputs (cons* flex bison imagemagick
|
(native-inputs (list flex bison nasm imagemagick))
|
||||||
(maybe-nasm)))
|
|
||||||
(home-page "https://github.com/tx00100xt/SeriousSamClassic")
|
(home-page "https://github.com/tx00100xt/SeriousSamClassic")
|
||||||
(synopsis "SeriousSam engine and Serious Sam: TFE and TSE")
|
(synopsis "SeriousSam engine and Serious Sam: TFE and TSE")
|
||||||
(description
|
(description
|
||||||
@@ -4130,7 +4127,7 @@ a C library, so they can easily be integrated into other programs.")
|
|||||||
(define-public taisei
|
(define-public taisei
|
||||||
(package
|
(package
|
||||||
(name "taisei")
|
(name "taisei")
|
||||||
(version "1.4.4")
|
(version "1.4.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
@@ -4138,7 +4135,7 @@ a C library, so they can easily be integrated into other programs.")
|
|||||||
"taisei/releases/download/v" version
|
"taisei/releases/download/v" version
|
||||||
"/taisei-" version ".tar.xz"))
|
"/taisei-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "13b2ha8nsdzbydirvc7hw1q46jzhn6cx9b9spgk777swjlgx2vph"))))
|
(base32 "19sgm175clkvpcv0b9p4jkjpfxqw0kyl2i5p8w63kwzqcjp9m1jx"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -4147,8 +4144,7 @@ a C library, so they can easily be integrated into other programs.")
|
|||||||
"-Dr_gles30=enabled"
|
"-Dr_gles30=enabled"
|
||||||
"-Dshader_transpiler=enabled")))
|
"-Dshader_transpiler=enabled")))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list cmake-minimal
|
(list pkg-config
|
||||||
pkg-config
|
|
||||||
python
|
python
|
||||||
python-docutils
|
python-docutils
|
||||||
python-pygments
|
python-pygments
|
||||||
@@ -4156,29 +4152,24 @@ a C library, so they can easily be integrated into other programs.")
|
|||||||
(inputs
|
(inputs
|
||||||
(list cglm
|
(list cglm
|
||||||
freetype
|
freetype
|
||||||
glslang
|
|
||||||
libdecor ; XXX: for sdl3
|
|
||||||
libpng
|
libpng
|
||||||
libwebp
|
libwebp
|
||||||
libzip
|
libzip
|
||||||
mesa
|
mesa
|
||||||
openssl
|
openssl
|
||||||
opusfile
|
opusfile
|
||||||
sdl3
|
sdl2
|
||||||
|
sdl2-mixer
|
||||||
shaderc
|
shaderc
|
||||||
spirv-cross
|
spirv-cross
|
||||||
spirv-tools ; for glslang
|
|
||||||
vulkan-loader ; XXX: for sdl3?
|
|
||||||
zlib
|
zlib
|
||||||
(list zstd "lib")))
|
(list zstd "lib")))
|
||||||
(home-page "https://taisei-project.org/")
|
(home-page "https://taisei-project.org/")
|
||||||
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
|
(synopsis "Shoot'em up fangame and libre clone of Touhou Project")
|
||||||
(description
|
(description
|
||||||
"Taisei is a vertical shoot'em up game, in which the player controls
|
"The player controls a character (one of three: Good, Bad, and Dead),
|
||||||
one of three characters. While moving through stages, a large number of
|
dodges the missiles (lots of it cover the screen, but the character's hitbox
|
||||||
enemies and even larger amounts of bullets appear that require careful
|
is very small), and shoot at the adversaries that keep appear on the screen.")
|
||||||
maneuvers to dodge. By shooting the enemies, players receive powerups
|
|
||||||
for their characters, allowing them to shoot even more.")
|
|
||||||
(license (list
|
(license (list
|
||||||
;; game
|
;; game
|
||||||
license:expat
|
license:expat
|
||||||
@@ -4285,11 +4276,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)
|
||||||
@@ -4619,105 +4610,6 @@ 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")
|
||||||
@@ -4731,10 +4623,6 @@ for common mesh file formats, and collision detection.")
|
|||||||
(url "https://github.com/thelaui/M.A.R.S.")
|
(url "https://github.com/thelaui/M.A.R.S.")
|
||||||
(commit commit)))
|
(commit commit)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(modules '((guix build utils)))
|
|
||||||
(snippet
|
|
||||||
#~(begin
|
|
||||||
(delete-file-recursively "ext_libs_for_windows")))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0bdi4ja39rark742qvqixm8khai5k8qd84z5kzim9jcjdvvwyqj9"))))
|
"0bdi4ja39rark742qvqixm8khai5k8qd84z5kzim9jcjdvvwyqj9"))))
|
||||||
@@ -4761,8 +4649,7 @@ for common mesh file formats, and collision detection.")
|
|||||||
attractive physics. Players can battle each other or computer controlled
|
attractive physics. Players can battle each other or computer controlled
|
||||||
enemies in different game modes such as space ball, death match, team death
|
enemies in different game modes such as space ball, death match, team death
|
||||||
match, cannon keep, and grave-itation pit.")
|
match, cannon keep, and grave-itation pit.")
|
||||||
(license (list license:gpl3+
|
(license license:gpl3+))))
|
||||||
license:cc-by-sa3.0))))) ;/data/audio/music
|
|
||||||
|
|
||||||
(define-public alienblaster
|
(define-public alienblaster
|
||||||
(package
|
(package
|
||||||
@@ -5357,9 +5244,7 @@ also available.")
|
|||||||
(with-directory-excursion "src"
|
(with-directory-excursion "src"
|
||||||
(substitute* "CMakeLists.txt"
|
(substitute* "CMakeLists.txt"
|
||||||
(("glm::glm")
|
(("glm::glm")
|
||||||
"glm")))
|
"glm")))))))
|
||||||
;; Rename the icon to match with the executable file.
|
|
||||||
(rename-file "srb2.png" "ringracers.png")))))
|
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -5369,30 +5254,15 @@ also available.")
|
|||||||
"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO='-O3 -g -DNDEBUG'")
|
"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO='-O3 -g -DNDEBUG'")
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(replace 'install
|
(add-after 'install 'move-and-wrap-binary
|
||||||
(lambda _
|
|
||||||
(install-file "bin/ringracers" (string-append #$output "/bin"))
|
|
||||||
(install-file "../source/ringracers.png"
|
|
||||||
(string-append #$output "/share/pixmaps"))))
|
|
||||||
(add-after 'install 'wrap-program
|
|
||||||
;; Install executable to $out/bin.
|
;; Install executable to $out/bin.
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(wrap-program "bin/ringracers"
|
(with-directory-excursion #$output
|
||||||
`("RINGRACERSWADDIR" =
|
(mkdir "bin")
|
||||||
(,(assoc-ref inputs "ring-racers-data"))))))
|
(rename-file "ringracers" "bin/ringracers")
|
||||||
(add-after 'wrap-program 'create-desktop-entry
|
(wrap-program "bin/ringracers"
|
||||||
(lambda _
|
`("RINGRACERSWADDIR" =
|
||||||
(let* ((datadir (string-append #$output "/share"))
|
(,(assoc-ref inputs "ring-racers-data"))))))))))
|
||||||
(appdir (string-append datadir "/applications")))
|
|
||||||
(mkdir-p appdir)
|
|
||||||
(make-desktop-entry-file (string-append appdir
|
|
||||||
"/ringracers.desktop")
|
|
||||||
#:name "Dr. Robotnik's Ring Racers"
|
|
||||||
#:comment "Technical kart racing game"
|
|
||||||
#:icon "ringracers"
|
|
||||||
#:exec (string-append #$output "/bin/ringracers")
|
|
||||||
#:startup-notify #f
|
|
||||||
#:categories '("Application" "Game"))))))))
|
|
||||||
(native-inputs (list pkg-config))
|
(native-inputs (list pkg-config))
|
||||||
(inputs (list glm
|
(inputs (list glm
|
||||||
libogg
|
libogg
|
||||||
@@ -5551,7 +5421,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.7")
|
(version "1.18.6")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -5560,17 +5430,27 @@ 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
|
||||||
"0hdrp4xm9d8kj8id2g5q0wwdwykx4a0f1cs8a7fghmv0czryfv7f"))))
|
"0cdlczxczqgzdaqwydb9gfgi7d9jc39li72p2rb5nk1rlgfff79s"))))
|
||||||
(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-for-c++
|
lua-5.4
|
||||||
openssl
|
openssl
|
||||||
pango
|
pango
|
||||||
sdl2
|
sdl2
|
||||||
@@ -5957,7 +5837,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_soundfonts\\[\\] = \\{" all)
|
(("default_sf\\[\\] = \\{" 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") "\",
|
||||||
@@ -5984,7 +5864,7 @@ Transport Tycoon Deluxe.")
|
|||||||
(package
|
(package
|
||||||
(inherit openttd)
|
(inherit openttd)
|
||||||
(name "openttd-jgrpp")
|
(name "openttd-jgrpp")
|
||||||
(version "0.71.2")
|
(version "0.70.2")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -5993,7 +5873,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 "1gb5gickmf1d1wkzqny5ryapvw32a2g94f77iq0102xhyyw8g8s0"))))
|
(base32 "1jzzvribf2cqvjl9cympyx9qpplljvmhqrrlw7aq4ckzl92d87z3"))))
|
||||||
(inputs (modify-inputs inputs
|
(inputs (modify-inputs inputs
|
||||||
(append zstd harfbuzz)))
|
(append zstd harfbuzz)))
|
||||||
(arguments
|
(arguments
|
||||||
@@ -6769,7 +6649,7 @@ in-window at 640x480 resolution or fullscreen.")
|
|||||||
(define-public warzone2100
|
(define-public warzone2100
|
||||||
(package
|
(package
|
||||||
(name "warzone2100")
|
(name "warzone2100")
|
||||||
(version "4.6.3")
|
(version "4.6.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://sourceforge/warzone2100/releases/"
|
(uri (string-append "mirror://sourceforge/warzone2100/releases/"
|
||||||
@@ -6785,7 +6665,7 @@ in-window at 640x480 resolution or fullscreen.")
|
|||||||
"inih" "re2" "utf8proc" "utfcpp")))))
|
"inih" "re2" "utf8proc" "utfcpp")))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0fmiy0pm56yy69c0nhynjdiaslwlfg8cdvfl5s78g5pzdi1y47s3"))))
|
"02x5ihkpfkpjxwvh00d8yqzd796af7d684nk96hzhhq28qw5bb16"))))
|
||||||
(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"
|
||||||
@@ -6822,7 +6702,7 @@ in-window at 640x480 resolution or fullscreen.")
|
|||||||
opusfile
|
opusfile
|
||||||
physfs
|
physfs
|
||||||
re2
|
re2
|
||||||
sdl3
|
sdl2
|
||||||
sqlite
|
sqlite
|
||||||
utf8proc
|
utf8proc
|
||||||
utfcpp
|
utfcpp
|
||||||
@@ -9263,7 +9143,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.5.394")
|
(version "99.3.384")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -9272,7 +9152,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 "0wd0sg3lpl9xafyj76syvpdjh574cxjmxaf9kssfjjxs20y3hjn8"))
|
(base32 "0l067j0bbzvr0i2prxrgb0af4xdpl648x741jgnyp4bjzdbm61x7"))
|
||||||
(snippet
|
(snippet
|
||||||
#~(begin (use-modules (guix build utils))
|
#~(begin (use-modules (guix build utils))
|
||||||
(substitute* "meson.build"
|
(substitute* "meson.build"
|
||||||
@@ -10263,7 +10143,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
|
||||||
@@ -11247,7 +11127,7 @@ levels to unlock.")
|
|||||||
(define-public simgear
|
(define-public simgear
|
||||||
(package
|
(package
|
||||||
(name "simgear")
|
(name "simgear")
|
||||||
(version "2024.1.5")
|
(version "2024.1.4")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -11259,7 +11139,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 "1ygdc8xkrj7qzm9zklibb1v5w3jp718707zmiwl8fn63sxanbqsq"))
|
(base32 "1k855yxq06gv42f83c3k9hrsz05xxj6vi1c60227zm0dx3jkb4jq"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
@@ -11311,7 +11191,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 "0hpfvacnba2kcyjwm01lkrqkz0gccvljjil8b0ai42l38hxn5r5h"))
|
(base32 "0xlpry1g5xci4qmj37rjk4sdhg9zada0vw6a047gsm7cq5p7pkxk"))
|
||||||
(modules '((guix build utils)))
|
(modules '((guix build utils)))
|
||||||
(snippet
|
(snippet
|
||||||
'(begin
|
'(begin
|
||||||
@@ -11395,12 +11275,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 "https://mirrors.ibiblio.org/flightgear/ftp/release-"
|
(uri (string-append "mirror://sourceforge/flightgear/release-"
|
||||||
(version-major+minor version) "/"
|
(version-major+minor version) "/"
|
||||||
"FlightGear-" version "-data.txz"))
|
"FlightGear-" version "-data.txz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0d81yz9jqmg2jzw5rm769pl1j18pvh2mjkx61l13kw76ja8p6159"))))))
|
"0pgwxpm5cdm0y6klrmpqspmhmqsfxshz4jljw2kd4wy18fqzd1s6"))))))
|
||||||
(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
|
||||||
@@ -12304,7 +12184,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")
|
||||||
@@ -13528,8 +13408,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 "7dde9ecb3c386363ecd9bd0a3b77e4756d200704")
|
(let ((commit "13443480a64fe8f10676606bd57da6de89f8ccb1")
|
||||||
(revision "2"))
|
(revision "1"))
|
||||||
(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))
|
||||||
@@ -13541,7 +13421,7 @@ rules to solve permissions issues.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0w0xkgi9fpvdbpl57f8fy2nwy2icm6iag39b8ifpkijlxgclx1p3"))))
|
"0i086gmnk93q76sw1laa9br6b7zj2r6nrrw7d64y4q9wcrlxw2bi"))))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:install-plan '(("./" "lib/udev/rules.d"
|
'(#:install-plan '(("./" "lib/udev/rules.d"
|
||||||
|
|||||||
+16
-84
@@ -425,29 +425,14 @@ hierarchical hexagonal geospatial indexing system")
|
|||||||
(base32
|
(base32
|
||||||
"00qdk9a4048pzfj2rhzkfw3lvm642znf6kr4x29i3d94494pxsnn"))))
|
"00qdk9a4048pzfj2rhzkfw3lvm642znf6kr4x29i3d94494pxsnn"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments `(#:phases
|
||||||
`(#:phases
|
(modify-phases %standard-phases
|
||||||
(modify-phases %standard-phases
|
(add-after
|
||||||
,@(if (or (target-x86-32?) (target-arm32?))
|
'unpack 'patch-test-shebangs
|
||||||
'((add-after 'unpack 'disable-broken-tests
|
(lambda _
|
||||||
(lambda _
|
(substitute* '("tests/xmltester/testrunner.sh"
|
||||||
;; This test fails due to limited accuracy.
|
"tests/xmltester/safe_to_xml.sh")
|
||||||
(delete-file "tests/xmltester/tests/general/TestCentroid.xml")
|
(("/bin/sh") (which "sh"))))))))
|
||||||
(with-directory-excursion "tests/unit"
|
|
||||||
;; These also fail due to limited accuracy.
|
|
||||||
(delete-file "algorithm/MinimumAreaRectangleTest.cpp")
|
|
||||||
(delete-file "capi/GEOSMinimumRotatedRectangleTest.cpp")
|
|
||||||
;; It is unclear why these fail, but I'm guessing:
|
|
||||||
;; limited accuracy.
|
|
||||||
(delete-file "linearref/LengthIndexedLineTest.cpp")
|
|
||||||
(delete-file "math/DDTest.cpp")))))
|
|
||||||
'())
|
|
||||||
(add-after
|
|
||||||
'unpack 'patch-test-shebangs
|
|
||||||
(lambda _
|
|
||||||
(substitute* '("tests/xmltester/testrunner.sh"
|
|
||||||
"tests/xmltester/safe_to_xml.sh")
|
|
||||||
(("/bin/sh") (which "sh"))))))))
|
|
||||||
(inputs
|
(inputs
|
||||||
(list glib))
|
(list glib))
|
||||||
(home-page "https://libgeos.org/")
|
(home-page "https://libgeos.org/")
|
||||||
@@ -970,29 +955,6 @@ hydrology and waste deposition.")
|
|||||||
(base32
|
(base32
|
||||||
"03r6mspfv22fs4x4jcgv25v9gsj5k6zy8incvyf94qf50g47s2bc"))))
|
"03r6mspfv22fs4x4jcgv25v9gsj5k6zy8incvyf94qf50g47s2bc"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
|
||||||
(if (target-32bit?)
|
|
||||||
(list
|
|
||||||
#:phases
|
|
||||||
'(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'patch-tests
|
|
||||||
(lambda _
|
|
||||||
;; These regression tests fail due to accuracy problems.
|
|
||||||
(substitute* "test/unit/test_factory.cpp"
|
|
||||||
(("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
|
|
||||||
(string-append m "\nGTEST_SKIP();\n")))
|
|
||||||
(substitute* "test/unit/test_grids.cpp"
|
|
||||||
(("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
|
|
||||||
(string-append m "\nGTEST_SKIP();\n")))
|
|
||||||
(substitute* "test/unit/test_defmodel.cpp"
|
|
||||||
(("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
|
|
||||||
(string-append m "\nGTEST_SKIP();\n")))
|
|
||||||
;; These regression tests fail due to accuracy problems.
|
|
||||||
(substitute* "test/CMakeLists.txt"
|
|
||||||
(("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
|
|
||||||
(("proj_add_gie_test\\(\"Builtins\".+") "")
|
|
||||||
(("proj_add_gie_test\\(\"peirce_q\".+") ""))))))
|
|
||||||
'()))
|
|
||||||
(native-inputs (list googletest pkg-config))
|
(native-inputs (list googletest pkg-config))
|
||||||
(propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc
|
(propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc
|
||||||
(home-page "https://proj.org/")
|
(home-page "https://proj.org/")
|
||||||
@@ -1022,34 +984,7 @@ lets developers use the functionality of Proj in their own software.")
|
|||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))
|
"1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh"))))))
|
||||||
(arguments
|
|
||||||
(if (target-32bit?)
|
|
||||||
(list
|
|
||||||
#:phases
|
|
||||||
'(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'patch-tests
|
|
||||||
(lambda _
|
|
||||||
;; These regression tests fail due to accuracy problems.
|
|
||||||
(substitute* "test/unit/test_factory.cpp"
|
|
||||||
(("^TEST\\(factory, AuthorityFactory_createUnitOfMeasure_linear_us_survey_foot\\) \\{" m)
|
|
||||||
(string-append m "\nGTEST_SKIP();\n")))
|
|
||||||
(substitute* "test/unit/test_grids.cpp"
|
|
||||||
(("^TEST_F\\(GridTest, VerticalShiftGridSet_gtx\\) \\{" m)
|
|
||||||
(string-append m "\nGTEST_SKIP();\n")))
|
|
||||||
(substitute* "test/unit/test_defmodel.cpp"
|
|
||||||
(("^TEST\\(defmodel, evaluator_horizontal_unit_metre\\) \\{" m)
|
|
||||||
(string-append m "\nGTEST_SKIP();\n")))
|
|
||||||
;; These regression tests fail due to accuracy problems.
|
|
||||||
(substitute* "test/CMakeLists.txt"
|
|
||||||
(("proj_add_gie_test\\(\"4D-API-cs2cs-style\".+") "")
|
|
||||||
(("proj_add_gie_test\\(\"Builtins\".+") "")
|
|
||||||
(("proj_add_gie_test\\(\"peirce_q\".+") "")
|
|
||||||
(("proj_add_gie_test\\(\"adams_ws2\".+") ""))
|
|
||||||
(substitute* "test/cli/CMakeLists.txt"
|
|
||||||
(("proj_add_test_script_sh\\(\"testvarious\" CS2CS_BIN\\)") ""))))))
|
|
||||||
'()))))
|
|
||||||
|
|
||||||
|
|
||||||
(define-public python-obspy
|
(define-public python-obspy
|
||||||
(package
|
(package
|
||||||
@@ -1284,23 +1219,20 @@ readily with other Python GIS packages such as pyproj, Rtree, and Shapely.")
|
|||||||
(define-public python-geopack
|
(define-public python-geopack
|
||||||
(package
|
(package
|
||||||
(name "python-geopack")
|
(name "python-geopack")
|
||||||
(version "1.0.12")
|
(version "1.0.10")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method url-fetch)
|
||||||
(uri (git-reference
|
(uri (pypi-uri "geopack" version))
|
||||||
(url "https://github.com/tsssss/geopack")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0ap5j4359xxjkbz06y097yq5d37sxcwlnlsfwrv6dvza7ydmgcgg"))))
|
(base32 "0mryjp7m4h99qlpvnn40s81sygr73qcv8rkmjp9pcli1gz829kjf"))))
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
;; XXX Reported upstream <https://github.com/tsssss/geopack/issues/21>.
|
;; XXX Reported upstream <https://github.com/tsssss/geopack/issues/21>.
|
||||||
#:tests? #f))
|
#:tests? #f))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list python-setuptools))
|
(list python-pytest python-setuptools python-wheel))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list python-numpy python-scipy))
|
(list python-numpy python-scipy))
|
||||||
(home-page "https://github.com/tsssss/geopack")
|
(home-page "https://github.com/tsssss/geopack")
|
||||||
@@ -3004,7 +2936,7 @@ to the OSM opening hours specification.")
|
|||||||
(define-public josm
|
(define-public josm
|
||||||
(package
|
(package
|
||||||
(name "josm")
|
(name "josm")
|
||||||
(version "19555")
|
(version "19539")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method svn-fetch)
|
(method svn-fetch)
|
||||||
(uri (svn-reference
|
(uri (svn-reference
|
||||||
@@ -3013,7 +2945,7 @@ to the OSM opening hours specification.")
|
|||||||
(recursive? #f)))
|
(recursive? #f)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0kpshdj8kf9ag7h1qqrh9jqc6c9iv8v369mk60a8g7cbzf0xpblw"))
|
"05kslpvdwl4fldjzl6m2kmqvbmjv5yvipfavg01l30ywhw2c7v7v"))
|
||||||
(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,4 +1,7 @@
|
|||||||
;;; 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.
|
||||||
;;;
|
;;;
|
||||||
@@ -16,8 +19,47 @@
|
|||||||
;;; 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 (gnu packages monitoring)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix deprecation))
|
#:use-module (guix packages)
|
||||||
|
#: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-deprecated/public-alias gkrellm
|
(define-public gkrellm
|
||||||
(@ (guix packages monitoring) gkrellm))
|
(package
|
||||||
|
(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,7 +39,6 @@
|
|||||||
#: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)
|
||||||
@@ -682,7 +681,7 @@ and a high score table.")
|
|||||||
(define-public komikku
|
(define-public komikku
|
||||||
(package
|
(package
|
||||||
(name "komikku")
|
(name "komikku")
|
||||||
(version "50.1.0")
|
(version "1.99.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -692,7 +691,7 @@ and a high score table.")
|
|||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
|
"1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -741,10 +740,8 @@ 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
|
||||||
@@ -780,7 +777,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 "50.1.0")
|
(version "1.99.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -790,7 +787,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
|
||||||
"0q858zvpqy32nb2lxdfy1k6fgal46kp634534fg983192fyk1pqp"))))
|
"1did8rh3aw6d3g1myavsma986rwashw09g3m442lv8fzmdiw18r4"))))
|
||||||
(build-system copy-build-system)
|
(build-system copy-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
@@ -1335,74 +1335,6 @@ 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"))
|
||||||
|
|||||||
+37
-126
@@ -2598,92 +2598,6 @@ 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")
|
||||||
@@ -10628,6 +10542,7 @@ 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
|
||||||
@@ -10647,7 +10562,6 @@ 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
|
||||||
@@ -10674,7 +10588,6 @@ playing media, scanning, and much more.")
|
|||||||
system-config-printer
|
system-config-printer
|
||||||
xdg-desktop-portal
|
xdg-desktop-portal
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
xdg-user-dirs-gtk
|
|
||||||
yelp
|
yelp
|
||||||
zenity))
|
zenity))
|
||||||
(description "This package provides a list of packages required for
|
(description "This package provides a list of packages required for
|
||||||
@@ -11345,20 +11258,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"
|
||||||
"05fbpc7miqpv7yic5xkm74ybzxkaf5r58ww21a1iwxqr3apyzvf0")
|
"041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1")
|
||||||
("DerivedAge.txt"
|
("DerivedAge.txt"
|
||||||
"160r7wwidj3c2jl4cw3am0c5d0l7qndis9xx38h0y8fwidvdzv7q")
|
"04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6")
|
||||||
("NamesList.txt"
|
("NamesList.txt"
|
||||||
"1x1smmn2kmy8clf6ny2njln75i888lidckc6ssyp2gdhgasdrkhd")
|
"0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61")
|
||||||
("Scripts.txt"
|
("Scripts.txt"
|
||||||
"1grmn3bd4m0rcmz544h94kimlj3gf1f343s8177ddrxfmg9m0plz")
|
"18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx")
|
||||||
("UnicodeData.txt"
|
("UnicodeData.txt"
|
||||||
"0327jqfw2hyq8x986cfhwrp717r2jl7ydjjwvzp7biarrcfzq7if")
|
"07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap")
|
||||||
("Unihan.zip"
|
("Unihan.zip"
|
||||||
"0pjbyf77lbaxdhwidvpgp81cw13lfhlaw1ynn9vsmkssahmqp97p"))))
|
"1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"))))
|
||||||
(package
|
(package
|
||||||
(name "gucharmap")
|
(name "gucharmap")
|
||||||
(version "17.0.1")
|
(version "12.0.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
@@ -11367,19 +11280,16 @@ basically a text box in which notes can be written.")
|
|||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0sfixlmk7qajcvls6kv2hfczmjafjcr54aczwcdfmp5jjll4m17r"))))
|
"0m915hm2b2d6r3vs1l80rqpssvg78pv8j6nv54yg62kzknnqmpir"))))
|
||||||
(build-system meson-build-system)
|
(build-system glib-or-gtk-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:modules ((ice-9 match)
|
`(#:modules ((ice-9 match)
|
||||||
(guix build meson-build-system)
|
(guix build glib-or-gtk-build-system)
|
||||||
(guix build utils))
|
(guix build utils))
|
||||||
#:glib-or-gtk? #t
|
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
(list
|
(list
|
||||||
"-Ducd_path=../unicode-data"
|
"CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
|
||||||
"-Dvapi=false"
|
"--with-unicode-data=../unicode-data")
|
||||||
;; 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
|
||||||
@@ -11392,26 +11302,26 @@ basically a text box in which notes can be written.")
|
|||||||
',unicode-files))
|
',unicode-files))
|
||||||
#t)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(cons* desktop-file-utils
|
`(("desktop-file-utils" ,desktop-file-utils)
|
||||||
(list glib "bin")
|
("glib:bin" ,glib "bin") ; for glib-compile-resources.
|
||||||
gobject-introspection
|
("gobject-introspection" ,gobject-introspection)
|
||||||
intltool
|
("intltool" ,intltool)
|
||||||
itstool
|
("itstool" ,itstool)
|
||||||
pkg-config
|
("pkg-config" ,pkg-config)
|
||||||
python
|
,@(map (match-lambda
|
||||||
unzip
|
((file hash)
|
||||||
(map (match-lambda
|
`(,file
|
||||||
((file hash)
|
,(origin
|
||||||
(origin
|
(method url-fetch)
|
||||||
(method url-fetch)
|
(uri (string-append
|
||||||
(uri (string-append
|
"http://www.unicode.org/Public/12.0.0/ucd/"
|
||||||
"https://www.unicode.org/Public/17.0.0/ucd/"
|
file))
|
||||||
file))
|
(sha256 (base32 hash))))))
|
||||||
(sha256 (base32 hash)))))
|
unicode-files)
|
||||||
unicode-files)))
|
("unzip" ,unzip)))
|
||||||
(inputs
|
(inputs
|
||||||
(list gtk+
|
`(("gtk+" ,gtk+)
|
||||||
libxml2))
|
("xmllint" ,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
|
||||||
@@ -11576,8 +11486,7 @@ accessibility infrastructure.")
|
|||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0sfs06f66dsibvnp87jshhs7n3f8shkn9x7j3ygpk8409za2n2xy"))
|
"0sfs06f66dsibvnp87jshhs7n3f8shkn9x7j3ygpk8409za2n2xy"))))
|
||||||
(patches (search-patches "orca-fix-gst-init-check-call.patch"))))
|
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:glib-or-gtk? #t
|
'(#:glib-or-gtk? #t
|
||||||
@@ -11595,7 +11504,10 @@ accessibility infrastructure.")
|
|||||||
(pgrep (string-append
|
(pgrep (string-append
|
||||||
(assoc-ref inputs "procps") "/bin/pgrep")))
|
(assoc-ref inputs "procps") "/bin/pgrep")))
|
||||||
(substitute* "src/orca/orca_modifier_manager.py"
|
(substitute* "src/orca/orca_modifier_manager.py"
|
||||||
(("\"xkbcomp\"") (format #f "'~a'" xkbcomp)))
|
(("'xkbcomp'") (format #f "'~a'" xkbcomp)))
|
||||||
|
(substitute* "src/orca/debug.py"
|
||||||
|
(("'pgrep %s'")
|
||||||
|
(format #f "'~a %s'" pgrep)))
|
||||||
(substitute* "src/orca/orca_bin.py.in"
|
(substitute* "src/orca/orca_bin.py.in"
|
||||||
(("'pgrep -u %s -x orca'")
|
(("'pgrep -u %s -x orca'")
|
||||||
(format #f "'~a -u %s -x orca'" pgrep))))))
|
(format #f "'~a -u %s -x orca'" pgrep))))))
|
||||||
@@ -11626,7 +11538,6 @@ accessibility infrastructure.")
|
|||||||
`(,liblouis "python")
|
`(,liblouis "python")
|
||||||
procps ; for pgrep
|
procps ; for pgrep
|
||||||
python
|
python
|
||||||
python-dbus
|
|
||||||
python-pygobject-3.50
|
python-pygobject-3.50
|
||||||
python-pyatspi
|
python-pyatspi
|
||||||
speech-dispatcher
|
speech-dispatcher
|
||||||
|
|||||||
@@ -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.3")
|
(version "1.0.2")
|
||||||
(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
|
||||||
"0shj6kk4xp3k45vv696bzgx4s2jzpvhp11syck1zb70rmrxba5kq"))))
|
"1ix843yqhcl8d5gh5652pw2scx4p5n836ca80ymms5rl136lycnz"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:configure-flags
|
(list #:configure-flags
|
||||||
|
|||||||
+25
-24
@@ -26,7 +26,6 @@
|
|||||||
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
|
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
|
||||||
;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
|
;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
|
||||||
;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
|
;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
|
||||||
;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -44,33 +43,34 @@
|
|||||||
;;; 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 base)
|
|
||||||
#:use-module (gnu packages bash)
|
#:use-module (gnu packages bash)
|
||||||
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages check)
|
#:use-module (gnu packages check)
|
||||||
#:use-module (gnu packages compression)
|
|
||||||
#:use-module (gnu packages crypto)
|
|
||||||
#:use-module (gnu packages curl)
|
#:use-module (gnu packages curl)
|
||||||
#:use-module (gnu packages dns)
|
#:use-module (gnu packages crypto)
|
||||||
#: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,24 +78,23 @@
|
|||||||
#: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 xdisorg)
|
|
||||||
#:use-module (gnu packages xml)
|
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages xml)
|
||||||
|
#:use-module (gnu packages popt)
|
||||||
|
#:use-module (gnu packages xdisorg)
|
||||||
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix download)
|
||||||
|
#: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 meson)
|
|
||||||
#:use-module (guix build-system perl)
|
#:use-module (guix build-system perl)
|
||||||
#:use-module (guix build-system pyproject)
|
|
||||||
#:use-module (guix build-system python)
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system pyproject)
|
||||||
#:use-module (guix build-system qt)
|
#: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 (ice-9 match)
|
||||||
|
#:use-module (guix build-system meson)
|
||||||
#:use-module (srfi srfi-1))
|
#:use-module (srfi srfi-1))
|
||||||
|
|
||||||
(define-public libgpg-error
|
(define-public libgpg-error
|
||||||
@@ -972,8 +971,10 @@ passphrase when @code{gpg} is run and needs it.")))
|
|||||||
(lambda _
|
(lambda _
|
||||||
(invoke "sh" "autogen.sh"))))))
|
(invoke "sh" "autogen.sh"))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(modify-inputs native-inputs
|
`(("autoconf" ,autoconf)
|
||||||
(prepend autoconf automake gettext-minimal)))
|
("automake" ,automake)
|
||||||
|
("gettext" ,gettext-minimal)
|
||||||
|
,@(package-native-inputs pinentry-tty)))
|
||||||
(inputs
|
(inputs
|
||||||
(modify-inputs inputs
|
(modify-inputs inputs
|
||||||
(prepend efl)))
|
(prepend efl)))
|
||||||
|
|||||||
@@ -48,34 +48,6 @@
|
|||||||
#: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")
|
||||||
|
|||||||
+10
-170
@@ -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.10.1")
|
(define %icecat-base-version "140.9.0")
|
||||||
(define %icecat-version (string-append %icecat-base-version "-gnu1"))
|
(define %icecat-version (string-append %icecat-base-version "-gnu1"))
|
||||||
(define %icecat-build-id "20260428000000") ;must be of the form YYYYMMDDhhmmss
|
(define %icecat-build-id "20260324000000") ;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
|
||||||
"1fx52y52c3dmgr5gm64x40r2n6zq5ckqiqsd6vlhsly5wb1w0xaf"))))
|
"0b79x61w51fjf12p5sr9pipg4b3fjdnbsg0j20fdai3jq6jb4wmr"))))
|
||||||
|
|
||||||
(gnuzilla-commit "5162cbc74c483c361ad5709c767c5cb2395ff4f9")
|
(gnuzilla-commit "10a8be3fcf725ed01ffb7279ec27c2fba55dd2d2")
|
||||||
(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
|
||||||
"06qyirgjjgy7fwn7mbrz23wsdv9a88w70pz8qm1yszln74xxdsp0"))))
|
"076s3zpq0cj24a2pjarb57k1xv9z45xazps8rgypzw8yc4pxi9rj"))))
|
||||||
|
|
||||||
;; '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,173 +1249,13 @@ testing.")
|
|||||||
(cpe-name . "firefox_esr")
|
(cpe-name . "firefox_esr")
|
||||||
(cpe-version . ,(first (string-split version #\-)))))))
|
(cpe-version . ,(first (string-split version #\-)))))))
|
||||||
|
|
||||||
;;; TEMPORARY old version of icecat-source for use by icedove until it is updated.
|
(define %icedove-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
|
||||||
(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.1")
|
(define %icedove-version "140.9.0")
|
||||||
|
|
||||||
;; 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
|
||||||
@@ -1427,11 +1267,11 @@ preferences/advanced-scripts.dtd"
|
|||||||
(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 "427d792f23672fc4adbe9436ce7dddbb2bfb287a")))
|
(changeset "8be9f2d3072c225a1e5f153745a18984c2babf8f")))
|
||||||
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
|
(file-name (string-append "thunderbird-" %icedove-version "-checkout"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"09fj375a0zb5kgvw94f13997zhcj67a4g5ylpdbjzfql0chh572p"))
|
"04j35957x03m5x7mhh8zxa86mwjy0is2vb614sr4inkvvz4rs2hg"))
|
||||||
(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.
|
||||||
@@ -1543,7 +1383,7 @@ preferences/advanced-scripts.dtd"
|
|||||||
;; 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-140.9.1-source)
|
"-xf" #$icecat-source)
|
||||||
(chdir #$name)
|
(chdir #$name)
|
||||||
|
|
||||||
;; Merge the Thunderdbird localization data.
|
;; Merge the Thunderdbird localization data.
|
||||||
|
|||||||
@@ -245,55 +245,6 @@ go-fuzz-headers.")
|
|||||||
@end itemize")
|
@end itemize")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public go-github-com-alexkohler-prealloc
|
|
||||||
(package
|
|
||||||
(name "go-github-com-alexkohler-prealloc")
|
|
||||||
(version "1.0.0")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/alexkohler/prealloc")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "011i8yqzyjgwj17k44xvvg4bxfv8z20s0416r2d3yf4s3wqqygpq"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:import-path "github.com/alexkohler/prealloc"))
|
|
||||||
(home-page "https://github.com/alexkohler/prealloc")
|
|
||||||
(synopsis "Find slice declarations that could be preallocated")
|
|
||||||
(description
|
|
||||||
"This package is a Go static analysis tool to find slice declarations
|
|
||||||
that could potentially be preallocated.")
|
|
||||||
(license license:expat)))
|
|
||||||
|
|
||||||
(define-public go-github-com-alingse-asasalint
|
|
||||||
(package
|
|
||||||
(name "go-github-com-alingse-asasalint")
|
|
||||||
(version "0.0.11")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/alingse/asasalint")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "1avz33cx3gcpps26rxijv7ic0njfmsdkbcp2mqg5yxhdcpq57s0q"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:import-path "github.com/alingse/asasalint"))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-golang-org-x-tools))
|
|
||||||
(home-page "https://github.com/alingse/asasalint")
|
|
||||||
(synopsis "Lint pass any slice as any in variadic function")
|
|
||||||
(description
|
|
||||||
"Golang linter, lint that pass any slice as any in variadic function.")
|
|
||||||
(license license:expat)))
|
|
||||||
|
|
||||||
(define-public go-github-com-andreyvit-diff
|
(define-public go-github-com-andreyvit-diff
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-andreyvit-diff")
|
(name "go-github-com-andreyvit-diff")
|
||||||
@@ -652,42 +603,6 @@ time functions.")
|
|||||||
strings which may be used in mock tests.")
|
strings which may be used in mock tests.")
|
||||||
(license license:unlicense)))
|
(license license:unlicense)))
|
||||||
|
|
||||||
(define-public go-github-com-daixiang0-gci
|
|
||||||
(package
|
|
||||||
(name "go-github-com-daixiang0-gci")
|
|
||||||
(version "0.13.7")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/daixiang0/gci")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "1vhnqisf6d706qvswccb0d7bkbl53lyi84f5sl3zyaf6yk8ml9dx"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:skip-build? #t
|
|
||||||
#:import-path "github.com/daixiang0/gci"))
|
|
||||||
(native-inputs
|
|
||||||
(list go-github-com-stretchr-testify
|
|
||||||
go-github-com-spf13-cobra))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-gopkg-in-yaml-v3
|
|
||||||
go-golang-org-x-tools
|
|
||||||
go-golang-org-x-sync
|
|
||||||
go-golang-org-x-mod
|
|
||||||
go-go-uber-org-zap
|
|
||||||
go-github-com-pmezard-go-difflib
|
|
||||||
go-github-com-hexops-gotextdiff))
|
|
||||||
(home-page "https://github.com/daixiang0/gci")
|
|
||||||
(synopsis "Tool to make Go import order deterministic")
|
|
||||||
(description
|
|
||||||
"This package provides a tool that controls Go package import order and
|
|
||||||
makes it always deterministic.")
|
|
||||||
(license license:bsd-3)))
|
|
||||||
|
|
||||||
(define-public go-github-com-data-dog-go-sqlmock
|
(define-public go-github-com-data-dog-go-sqlmock
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-data-dog-go-sqlmock")
|
(name "go-github-com-data-dog-go-sqlmock")
|
||||||
@@ -761,34 +676,6 @@ style).
|
|||||||
@end itemize")
|
@end itemize")
|
||||||
(license license:isc)))
|
(license license:isc)))
|
||||||
|
|
||||||
(define-public go-github-com-denis-tingaikin-go-header
|
|
||||||
(package
|
|
||||||
(name "go-github-com-denis-tingaikin-go-header")
|
|
||||||
(version "1.0.0")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/denis-tingaikin/go-header")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "0qzy2ps59dzsdn4ny8x48k9d1kscpddjilkxra1w16npsvix6mcm"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:import-path "github.com/denis-tingaikin/go-header"))
|
|
||||||
(native-inputs
|
|
||||||
(list go-github-com-stretchr-testify))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-golang-org-x-tools
|
|
||||||
go-gopkg-in-yaml-v3))
|
|
||||||
(home-page "https://github.com/denis-tingaikin/go-header")
|
|
||||||
(synopsis "Go linter for copyright headers")
|
|
||||||
(description
|
|
||||||
"Simple Go source code linter providing checks for copyright headers.")
|
|
||||||
(license license:gpl3)))
|
|
||||||
|
|
||||||
(define-public go-github-com-dgryski-go-ddmin
|
(define-public go-github-com-dgryski-go-ddmin
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-dgryski-go-ddmin")
|
(name "go-github-com-dgryski-go-ddmin")
|
||||||
@@ -998,31 +885,6 @@ can use the mock clock. This is a maintained fork of benbjohnson's
|
|||||||
@url{https://github.com/benbjohnson/clock, clock} package.")
|
@url{https://github.com/benbjohnson/clock, clock} package.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public go-github-com-firefart-nonamedreturns
|
|
||||||
(package
|
|
||||||
(name "go-github-com-firefart-nonamedreturns")
|
|
||||||
(version "1.0.6")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/firefart/nonamedreturns")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "1y9dz8rkd55p1rkib4y3b0czs44c2bb1pmlr4k53ms1k8d9bjgwk"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:import-path "github.com/firefart/nonamedreturns"))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-golang-org-x-tools))
|
|
||||||
(home-page "https://github.com/firefart/nonamedreturns")
|
|
||||||
(synopsis "Go linter to catch named returns")
|
|
||||||
(description
|
|
||||||
"This package provides a linter to find named returns in Go code.")
|
|
||||||
(license license:gpl3)))
|
|
||||||
|
|
||||||
;; XXX: The project looks like abandoned, see
|
;; XXX: The project looks like abandoned, see
|
||||||
;; <https://github.com/frankban/quicktest/issues/172>, remove when nothing
|
;; <https://github.com/frankban/quicktest/issues/172>, remove when nothing
|
||||||
;; depends on it.
|
;; depends on it.
|
||||||
@@ -1061,30 +923,6 @@ can use the mock clock. This is a maintained fork of benbjohnson's
|
|||||||
tests.")
|
tests.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public go-github-com-fzipp-gocyclo
|
|
||||||
(package
|
|
||||||
(name "go-github-com-fzipp-gocyclo")
|
|
||||||
(version "0.6.0")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/fzipp/gocyclo")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "1w2h8qlifrskn8g8zcwb6banr9si0vck9y8irg1r51mc98cjv36l"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:import-path "github.com/fzipp/gocyclo"))
|
|
||||||
(home-page "https://github.com/fzipp/gocyclo")
|
|
||||||
(synopsis "Calculate cyclomatic complexity in Go")
|
|
||||||
(description
|
|
||||||
"This package calculates the cyclomatic complexities of functions and
|
|
||||||
methods in Go source code.")
|
|
||||||
(license license:bsd-3)))
|
|
||||||
|
|
||||||
(define-public go-github-com-gdey-tbltest
|
(define-public go-github-com-gdey-tbltest
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-gdey-tbltest")
|
(name "go-github-com-gdey-tbltest")
|
||||||
@@ -1109,45 +947,6 @@ methods in Go source code.")
|
|||||||
tests.")
|
tests.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public go-github-com-ghostiam-protogetter
|
|
||||||
(package
|
|
||||||
(name "go-github-com-ghostiam-protogetter")
|
|
||||||
(version "0.3.20")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/ghostiam/protogetter")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "1hap2ykmlnan5vz8sczdpiv93iidbgl13mlcdx468nhfprg2hbbm"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:tests? #f ;"module lookup disabled by GOPROXY=off"
|
|
||||||
#:import-path "github.com/ghostiam/protogetter"))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-golang-org-x-tools
|
|
||||||
go-github-com-gobwas-glob))
|
|
||||||
(home-page "https://github.com/ghostiam/protogetter")
|
|
||||||
(synopsis "Protobuf Golang linter")
|
|
||||||
(description
|
|
||||||
"This package is a linter developed specifically for Go programmers
|
|
||||||
working with nested @code{protobuf} types. It's designed to aid developers in
|
|
||||||
preventing invalid memory address or nil pointer dereference errors arising
|
|
||||||
from direct access of nested protobuf fields.
|
|
||||||
|
|
||||||
When working with protobuf, it's quite common to have complex structures where
|
|
||||||
a message field is contained within another message, which itself can be part
|
|
||||||
of another message, and so on. If these fields are accessed directly and some
|
|
||||||
field in the call chain will not be initialized, it can result in application
|
|
||||||
panic.
|
|
||||||
|
|
||||||
Protogetter addresses this issue by suggesting use of getter methods for field
|
|
||||||
access.")
|
|
||||||
(license license:expat)))
|
|
||||||
|
|
||||||
(define-public go-github-com-gkampitakis-ciinfo
|
(define-public go-github-com-gkampitakis-ciinfo
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-gkampitakis-ciinfo")
|
(name "go-github-com-gkampitakis-ciinfo")
|
||||||
@@ -1403,29 +1202,6 @@ kept in fixtures files. Before the execution of every test, the test database
|
|||||||
is cleaned and the fixture data is loaded into the database.")
|
is cleaned and the fixture data is loaded into the database.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public go-github-com-go-xmlfmt-xmlfmt
|
|
||||||
(package
|
|
||||||
(name "go-github-com-go-xmlfmt-xmlfmt")
|
|
||||||
(version "1.1.3")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/go-xmlfmt/xmlfmt")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "1cglrwmpg0lb7cnyvdz8js52h07rcvka7y9abksk9p5ajxj5rp1s"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:import-path "github.com/go-xmlfmt/xmlfmt"))
|
|
||||||
(home-page "https://github.com/go-xmlfmt/xmlfmt")
|
|
||||||
(synopsis "Go XML Formatter")
|
|
||||||
(description
|
|
||||||
"The Go XML Formatter, xmlfmt, will format the XML string in a readable way.")
|
|
||||||
(license license:expat)))
|
|
||||||
|
|
||||||
;; XXX: This repository has been archived by the owner
|
;; XXX: This repository has been archived by the owner
|
||||||
;; on May 9, 2021. It is now read-only. It's only used
|
;; on May 9, 2021. It is now read-only. It's only used
|
||||||
;; by go-github-com-golang-gddo. Consider to remove when nothing
|
;; by go-github-com-golang-gddo. Consider to remove when nothing
|
||||||
@@ -4191,20 +3967,6 @@ thoroughly
|
|||||||
" This package provides an command line interface (CLI)
|
" This package provides an command line interface (CLI)
|
||||||
tool."))))
|
tool."))))
|
||||||
|
|
||||||
(define-public go-gci
|
|
||||||
(package/inherit go-github-com-daixiang0-gci
|
|
||||||
(name "go-gci")
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments arguments
|
|
||||||
((#:tests? _ #t) #f)
|
|
||||||
((#:install-source? _ #t) #f)
|
|
||||||
((#:skip-build? _ #t) #f)))
|
|
||||||
(native-inputs
|
|
||||||
(append (package-native-inputs go-github-com-daixiang0-gci)
|
|
||||||
(package-propagated-inputs go-github-com-daixiang0-gci)))
|
|
||||||
(propagated-inputs '())
|
|
||||||
(inputs '())))
|
|
||||||
|
|
||||||
(define-public go-pgmockproxy
|
(define-public go-pgmockproxy
|
||||||
(package/inherit go-github-com-jackc-pgmock
|
(package/inherit go-github-com-jackc-pgmock
|
||||||
(name "go-pgmockproxy")
|
(name "go-pgmockproxy")
|
||||||
@@ -4328,21 +4090,6 @@ prints an ASCII fraphic representing the memory layout.")))
|
|||||||
" This package provides an command line interface (CLI)
|
" This package provides an command line interface (CLI)
|
||||||
tool."))))
|
tool."))))
|
||||||
|
|
||||||
(define-public protogetter
|
|
||||||
(package/inherit go-github-com-ghostiam-protogetter
|
|
||||||
(name "protogetter")
|
|
||||||
(arguments
|
|
||||||
(substitute-keyword-arguments arguments
|
|
||||||
((#:tests? _ #f) #f)
|
|
||||||
((#:skip-build? _ #t) #f)
|
|
||||||
((#:install-source? _ #t) #f)
|
|
||||||
((#:import-path _) "github.com/ghostiam/protogetter/cmd/protogetter")
|
|
||||||
((#:unpack-path _ "") "github.com/ghostiam/protogetter")))
|
|
||||||
(native-inputs
|
|
||||||
(package-propagated-inputs go-github-com-ghostiam-protogetter))
|
|
||||||
(propagated-inputs '())
|
|
||||||
(inputs '())))
|
|
||||||
|
|
||||||
(define-public unparam
|
(define-public unparam
|
||||||
(package
|
(package
|
||||||
(inherit go-mvdan-cc-unparam)
|
(inherit go-mvdan-cc-unparam)
|
||||||
|
|||||||
@@ -31,7 +31,6 @@
|
|||||||
;;; 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.
|
||||||
;;;
|
;;;
|
||||||
@@ -1600,7 +1599,7 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
|
|||||||
(define-public go-github-com-google-go-tpm
|
(define-public go-github-com-google-go-tpm
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-google-go-tpm")
|
(name "go-github-com-google-go-tpm")
|
||||||
(version "0.9.4")
|
(version "0.9.1")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -1609,7 +1608,7 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.")
|
|||||||
(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 "1sp1mbr6vz36zy9w36iksirbsj5p2jslsl8zs1cdj8s4ig4lkd9d"))))
|
(base32 "1c5j5cvwl45ka93nknmv454ivd7kp9n8yql19gr6z01z0s1ph7sg"))))
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
@@ -2874,7 +2873,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.8.2")
|
(version "1.6.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -2883,7 +2882,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 "03kgwxdm2lg28fn2w5q7ql2szsiwj2xjdf477h1g3a4a9y9j6zk0"))))
|
(base32 "1iywar5vqsml4b177k2nkcxmjm8mw92g3p112yjsrpmikiwpwpyw"))))
|
||||||
(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"
|
||||||
@@ -3286,37 +3285,6 @@ to support the streaming mode required by Go's standard Hash interface.")
|
|||||||
@url{https://www.rfc-editor.org/errata/rfc7512, errata} specifications.")
|
@url{https://www.rfc-editor.org/errata/rfc7512, errata} specifications.")
|
||||||
(license license:asl2.0)))
|
(license license:asl2.0)))
|
||||||
|
|
||||||
(define-public go-github-com-tailscale-golang-x-crypto
|
|
||||||
(package
|
|
||||||
(name "go-github-com-tailscale-golang-x-crypto")
|
|
||||||
(version "0.91.0")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/tailscale/golang-x-crypto")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "0m9qkk48mihrkmfh1fzfhc39l8957qkpfx8qbw4xdjws7dy4vzbz"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:skip-build? #t
|
|
||||||
#:tests? #f ;Tests have broken package imports (expected as per readme)
|
|
||||||
#:import-path "github.com/tailscale/golang-x-crypto"))
|
|
||||||
(propagated-inputs
|
|
||||||
(list go-golang-org-x-crypto
|
|
||||||
go-golang-org-x-term
|
|
||||||
go-golang-org-x-sys
|
|
||||||
go-golang-org-x-net))
|
|
||||||
(home-page "https://github.com/tailscale/golang-x-crypto")
|
|
||||||
(synopsis "Supplementary Go crypto libraries")
|
|
||||||
(description
|
|
||||||
"This package holds supplementary Go cryptography libraries, it's a fork
|
|
||||||
of @code{golang.org/x/crypto} maintained by Tailscale.")
|
|
||||||
(license license:bsd-3)))
|
|
||||||
|
|
||||||
(define-public go-github-com-tink-crypto-tink-go-v2
|
(define-public go-github-com-tink-crypto-tink-go-v2
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-tink-crypto-tink-go-v2")
|
(name "go-github-com-tink-crypto-tink-go-v2")
|
||||||
@@ -3672,39 +3640,6 @@ 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")
|
||||||
|
|||||||
@@ -456,29 +456,6 @@ penalization.")
|
|||||||
FFT (Schonhage-Strassen method for multiplying integers).")
|
FFT (Schonhage-Strassen method for multiplying integers).")
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public go-github-com-robinus2-golang-moving-average
|
|
||||||
(package
|
|
||||||
(name "go-github-com-robinus2-golang-moving-average")
|
|
||||||
(version "1.0.0")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://github.com/RobinUS2/golang-moving-average")
|
|
||||||
(commit (string-append "v" version))))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32 "02z3ad29653fz7whxkjjpq820ig9j8m68xj4kay14jyazkr5in1f"))))
|
|
||||||
(build-system go-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:import-path "github.com/RobinUS2/golang-moving-average"))
|
|
||||||
(home-page "https://github.com/RobinUS2/golang-moving-average")
|
|
||||||
(synopsis "Moving average implementation for Go")
|
|
||||||
(description
|
|
||||||
"This package provides a moving average implementation for Go.")
|
|
||||||
(license license:asl2.0)))
|
|
||||||
|
|
||||||
(define-public go-github-com-shopspring-decimal
|
(define-public go-github-com-shopspring-decimal
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-shopspring-decimal")
|
(name "go-github-com-shopspring-decimal")
|
||||||
|
|||||||
+48
-1811
File diff suppressed because it is too large
Load Diff
+144
-694
File diff suppressed because it is too large
Load Diff
@@ -1022,6 +1022,56 @@ 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)
|
||||||
@@ -1189,6 +1239,7 @@ 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))
|
v4l-utils-minimal))
|
||||||
(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
|
v4l-utils-minimal
|
||||||
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
|
v4l-utils-minimal
|
||||||
vo-aacenc
|
vo-aacenc
|
||||||
vo-amrwbenc
|
vo-amrwbenc
|
||||||
vulkan-headers
|
vulkan-headers
|
||||||
|
|||||||
+25
-55
@@ -517,19 +517,22 @@ functions which were removed.")
|
|||||||
"0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
|
"0pik2d3995z0rjcjhb4hsj5fsph3m8khg6j10k6mx4j2j727aq6l"))))
|
||||||
(build-system waf-build-system)
|
(build-system waf-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
`(#:phases
|
||||||
#:tests? #f ; no check target
|
(modify-phases %standard-phases
|
||||||
#:phases
|
(add-before 'configure 'set-flags
|
||||||
#~(modify-phases %standard-phases
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(add-before 'configure 'set-flags
|
;; Allow 'bin/ganv_bench' to find libganv-1.so.
|
||||||
(lambda _
|
(setenv "LDFLAGS"
|
||||||
;; Allow 'bin/ganv_bench' to find libganv-1.so.
|
(string-append "-Wl,-rpath="
|
||||||
(setenv "LDFLAGS"
|
(assoc-ref outputs "out") "/lib"))
|
||||||
(string-append "-Wl,-rpath=" #$output "/lib")))))))
|
#t)))
|
||||||
|
#: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
|
||||||
@@ -1457,9 +1460,10 @@ exceptions, macros, and a dynamic programming environment.")
|
|||||||
(inherit guile-cairo)
|
(inherit guile-cairo)
|
||||||
(name "guile2.2-cairo")
|
(name "guile2.2-cairo")
|
||||||
(inputs
|
(inputs
|
||||||
(modify-inputs inputs
|
`(("guile" ,guile-2.2)
|
||||||
(delete "guile" "guile-lib")
|
("guile-lib" ,guile2.2-lib)
|
||||||
(append guile-2.2 guile2.2-lib)))))
|
,@(fold alist-delete (package-inputs guile-cairo)
|
||||||
|
'("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
|
||||||
@@ -1575,10 +1579,11 @@ images onto Cairo surfaces.")
|
|||||||
(inherit guile-rsvg)
|
(inherit guile-rsvg)
|
||||||
(name "guile2.2-rsvg")
|
(name "guile2.2-rsvg")
|
||||||
(inputs
|
(inputs
|
||||||
(modify-inputs inputs
|
`(("guile" ,guile-2.2)
|
||||||
(delete "guile" "guile-lib")
|
("guile-lib" ,guile2.2-lib)
|
||||||
(append guile-2.2 guile2.2-lib)))
|
,@(fold alist-delete (package-inputs guile-rsvg)
|
||||||
(propagated-inputs (list guile2.2-cairo))))
|
'("guile" "guile-lib"))))
|
||||||
|
(propagated-inputs `(("guile-cairo" ,guile2.2-cairo)))))
|
||||||
|
|
||||||
(define-public guile-present
|
(define-public guile-present
|
||||||
(package
|
(package
|
||||||
@@ -1644,7 +1649,9 @@ documents.")
|
|||||||
(name "guile2.2-present")
|
(name "guile2.2-present")
|
||||||
(inputs (list guile-2.2))
|
(inputs (list guile-2.2))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list guile2.2-lib guile2.2-cairo guile2.2-rsvg))))
|
`(("guile-lib" ,guile2.2-lib)
|
||||||
|
("guile-cairo" ,guile2.2-cairo)
|
||||||
|
("guile-rsvg" ,guile2.2-rsvg)))))
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
;;; C++ bindings.
|
;;; C++ bindings.
|
||||||
@@ -2763,43 +2770,6 @@ entire output. It supports all Layer Shell features including popups and
|
|||||||
popovers.")
|
popovers.")
|
||||||
(license license:expat)))
|
(license license:expat)))
|
||||||
|
|
||||||
(define-public xdg-user-dirs-gtk
|
|
||||||
(package
|
|
||||||
(name "xdg-user-dirs-gtk")
|
|
||||||
(version "0.16")
|
|
||||||
(source (origin
|
|
||||||
(method git-fetch)
|
|
||||||
(uri (git-reference
|
|
||||||
(url "https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk.git")
|
|
||||||
(commit version)))
|
|
||||||
(file-name (git-file-name name version))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"11h1164mkajpfrp6mkky2gvx3xd7dw0c9f2785jf4lys4jmmj4c3"))))
|
|
||||||
(build-system meson-build-system)
|
|
||||||
(arguments
|
|
||||||
(list
|
|
||||||
#:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(add-after 'unpack 'fix-exec-path
|
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
|
||||||
(substitute* "update.c"
|
|
||||||
(("xdg-user-dirs-update")
|
|
||||||
(search-input-file inputs "/bin/xdg-user-dirs-update"))))))))
|
|
||||||
(native-inputs
|
|
||||||
(list gettext-minimal
|
|
||||||
pkg-config))
|
|
||||||
(inputs
|
|
||||||
(list gtk+
|
|
||||||
xdg-user-dirs))
|
|
||||||
(home-page "https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk")
|
|
||||||
(synopsis "Integration of xdg-user-dirs with GTK")
|
|
||||||
(description "This package is a companion to @code{xdg-user-dirs} to
|
|
||||||
integrate it with the GNOME desktop and GTK applications. It gets run during
|
|
||||||
login to create default GTK bookmarks files containing the user directories, and
|
|
||||||
to rename these directories if the locale changes.")
|
|
||||||
(license license:gpl2+)))
|
|
||||||
|
|
||||||
(define-public goocanvas
|
(define-public goocanvas
|
||||||
(package
|
(package
|
||||||
(name "goocanvas")
|
(name "goocanvas")
|
||||||
|
|||||||
+85
-197
@@ -60,7 +60,6 @@
|
|||||||
;;; 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.
|
||||||
;;;
|
;;;
|
||||||
@@ -1168,7 +1167,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.3")
|
(version "1.4.2")
|
||||||
(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))
|
||||||
@@ -1177,7 +1176,7 @@ is not available for Guile 2.0.")
|
|||||||
(commit (string-append "v" version))))
|
(commit (string-append "v" version))))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1q0a9y0cc8rld1z7mcj61fkldhd0kn9n4yq25izxslbgg4g5h9j6"))
|
"0qh0czz5qvk5mmrc8x2gmvl5psdfd22q2rhzj4jrpan6k3d55bl8"))
|
||||||
(patches '())))
|
(patches '())))
|
||||||
(arguments
|
(arguments
|
||||||
(if (target-aarch64?)
|
(if (target-aarch64?)
|
||||||
@@ -1257,8 +1256,30 @@ 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)))))
|
||||||
|
|
||||||
;; Deprecated on 2026-04-23
|
(define-public guile-fibers-next
|
||||||
(define-deprecated-package guile-fibers-next guile-fibers)
|
(let ((commit "297359f0ad655378bcc3ff0d4e96101965ef39b4")
|
||||||
|
(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
|
||||||
@@ -1516,7 +1537,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.7")
|
(version "0.9.6")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
@@ -1526,42 +1547,35 @@ 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
|
||||||
"1xbznh5zjswfydgqg53g50ya7zm0hidin74g2glk849l9j45szw3"))))
|
"1vkww3vc0lsh5f8yh6fnh402rx3rsm0ss69rdkmplhzp4c7c4z1d"))))
|
||||||
(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-scripts
|
(add-after 'build 'install-script
|
||||||
(lambda _
|
(lambda _
|
||||||
(define bin (string-append #$output "/bin"))
|
(let* ((bin (string-append #$output "/bin"))
|
||||||
(define site (string-append #$output "/share/guile/site/3.0"))
|
(oldpath (string-append
|
||||||
(define ccache
|
#$output
|
||||||
(string-append #$output "/lib/guile/3.0/site-ccache"))
|
;; This file will be named ares-nrepl.scm for
|
||||||
|
;; the next version.
|
||||||
(define (install-script name)
|
"/share/guile/site/3.0/ares/scripts/ares.scm"))
|
||||||
(let ((oldpath
|
(newpath (string-append bin "/ares-nrepl")))
|
||||||
(string-append site "/ares/scripts/" name ".scm"))
|
(mkdir bin)
|
||||||
(newpath
|
(symlink oldpath newpath)
|
||||||
(string-append bin "/" name)))
|
(wrap-program newpath
|
||||||
(symlink oldpath newpath)
|
`("GUILE_LOAD_PATH" ":" =
|
||||||
(wrap-program newpath
|
,(list (string-append #$output "/share/guile/site/3.0")
|
||||||
`("GUILE_LOAD_PATH" ":" =
|
(getenv "GUILE_LOAD_PATH")))
|
||||||
,(list "$GUILE_LOAD_PATH"
|
`("GUILE_LOAD_COMPILED_PATH" ":" =
|
||||||
site
|
,(list (string-append #$output "/lib/guile/3.0/site-ccache")
|
||||||
(getenv "GUILE_LOAD_PATH")))
|
(getenv "GUILE_LOAD_COMPILED_PATH"))))
|
||||||
`("GUILE_LOAD_COMPILED_PATH" ":" =
|
;; Not needed since the wrapper followed the symlink.
|
||||||
,(list "$GUILE_LOAD_COMPILED_PATH"
|
(delete-file (string-append bin "/.ares-nrepl-real"))))))))
|
||||||
ccache
|
(inputs (list bash-minimal guile-3.0))
|
||||||
(getenv "GUILE_LOAD_COMPILED_PATH"))))
|
(propagated-inputs (list guile-fibers guile-custom-ports))
|
||||||
;; 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
|
||||||
@@ -5693,32 +5707,27 @@ perform geometrical transforms on JPEG images.")
|
|||||||
(license license:gpl3+))))
|
(license license:gpl3+))))
|
||||||
|
|
||||||
(define-public guile-jtd
|
(define-public guile-jtd
|
||||||
;; There are a few unreleased commits that include niceties such as warning
|
(package
|
||||||
;; that the debug VM must be used; use the latest commit until the next
|
(name "guile-jtd")
|
||||||
;; release comes.
|
(version "220323a")
|
||||||
(let ((commit "425f86ae954d6445aaedacfd4ecd50aa0022e59d")
|
(source (origin
|
||||||
(revision "0"))
|
(method git-fetch)
|
||||||
(package
|
(uri (git-reference
|
||||||
(name "guile-jtd")
|
(url "https://github.com/mwette/guile-jtd")
|
||||||
(version (git-version "220323a" revision commit))
|
(commit (string-append "v" version))))
|
||||||
(source (origin
|
(file-name (git-file-name name version))
|
||||||
(method git-fetch)
|
(sha256
|
||||||
(uri (git-reference
|
(base32
|
||||||
(url "https://github.com/mwette/guile-jtd")
|
"1l8fyqhvksarvpbr903i3ss3432jzvyvhgcqa15j922ngqh4ds6f"))))
|
||||||
(commit commit)))
|
(build-system guile-build-system)
|
||||||
(file-name (git-file-name name version))
|
(native-inputs (list guile-3.0))
|
||||||
(sha256
|
(home-page "https://github.com/mwette/guile-jtd")
|
||||||
(base32
|
(synopsis "Python's @code{pdb.set_trace()} but for Guile")
|
||||||
"1l8fyqhvksarvpbr903i3ss3432jzvyvhgcqa15j922ngqh4ds6f"))))
|
(description
|
||||||
(build-system guile-build-system)
|
"The @code{(jtd)} module for Guile provides a procedure
|
||||||
(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
|
||||||
@@ -5778,43 +5787,6 @@ 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")
|
||||||
@@ -6390,88 +6362,6 @@ 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")
|
||||||
@@ -7764,11 +7654,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 "49996c432a4616e03ecaf01cb42afc5fd78eafd5")
|
(let ((commit "cb5ec50b341f603e9d129152b45e47cf008ea126")
|
||||||
(revision "35"))
|
(revision "31"))
|
||||||
(package
|
(package
|
||||||
(name "guile-knots")
|
(name "guile-knots")
|
||||||
(version (git-version "0.1" revision commit))
|
(version (git-version "0" revision commit))
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -7776,7 +7666,7 @@ is an attempt to combine both into something useful.")
|
|||||||
(commit commit)))
|
(commit commit)))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0i6vk432shy7qmsq1hli71a9kmgf8yy9hx3bck0r9qzsldv1m3m9"))
|
"08gcbyw7kvhk568a30kimhn37m9mygpxhswb294n1141ddmhjchh"))
|
||||||
(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
|
||||||
@@ -7789,13 +7679,13 @@ is an attempt to combine both into something useful.")
|
|||||||
(list pkg-config
|
(list pkg-config
|
||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
guile-3.0-latest
|
guile-next
|
||||||
guile-lib
|
guile-lib
|
||||||
guile-fibers))
|
guile-fibers-next))
|
||||||
(inputs
|
(inputs
|
||||||
(list guile-3.0-latest))
|
(list guile-next))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list guile-fibers))
|
(list guile-fibers-next))
|
||||||
(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
|
||||||
@@ -8011,16 +7901,14 @@ 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.2.0")
|
(version "0.1.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method url-fetch)
|
||||||
(uri (git-reference
|
(uri (string-append "https://files.dthompson.us/releases"
|
||||||
(url "https://git.dthompson.us/guile-bstructs.git")
|
"/guile-bstructs/guile-bstructs-" version ".tar.gz"))
|
||||||
(commit (string-append "v" version))))
|
(sha256
|
||||||
(file-name (git-file-name name version))
|
(base32 "0f847aiyzhrlvd2jmckyqrkrvi7i9mg8rmyhbh7fs1vzykcf67wb"))))
|
||||||
(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))
|
||||||
@@ -8091,14 +7979,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.18.0")
|
(version "0.17.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 "0gj5018wmq97ln1z7x03a13z3p35xc8762id9bl9fgkxwm01df1a"))))
|
(base32 "16jkmfspsnza2fdk5jr05a5pfh7x856gpg031i21s1yvy43l8mi0"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list
|
(list
|
||||||
|
|||||||
+20
-10
@@ -653,10 +653,7 @@ 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 (and (string-prefix? "guile-" name)
|
(if (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-")))
|
||||||
@@ -903,8 +900,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.1")
|
(version "0.11.0")
|
||||||
(home-page "https://codeberg.org/guile-git/guile-git.git")
|
(home-page "https://gitlab.com/guile-git/guile-git.git")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
@@ -913,11 +910,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
|
||||||
"0xpzchnglddphi3chv53xqaz2x6rpq3l4s023w7r4mmndb6lgz0b"))))
|
"1yjyil6z4k80pjdps8v6h6lxikwxmjxvrslf2jrmq2rrfnajschz"))))
|
||||||
(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://codeberg.org/guile-git/guile-git/issues/20
|
;; https://gitlab.com/guile-git/guile-git/-/issues/20
|
||||||
,@(if (target-ppc32?)
|
,@(if (target-ppc32?)
|
||||||
`(#:phases
|
`(#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
@@ -925,7 +922,20 @@ 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
|
||||||
@@ -994,7 +1004,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
|
||||||
"1v1pfqp6hwl0rivs7swhqnfgznxlfnws9ldmn6avnhd10filfa3a"))
|
"1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7"))
|
||||||
(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)
|
||||||
|
|||||||
+11
-11
@@ -23,7 +23,6 @@
|
|||||||
;;; Copyright © 2025 Eric Bavier <bavier@posteo.net>
|
;;; Copyright © 2025 Eric Bavier <bavier@posteo.net>
|
||||||
;;; Copyright © 2025 Arun Isaac <arunisaac@systemreboot.net>
|
;;; Copyright © 2025 Arun Isaac <arunisaac@systemreboot.net>
|
||||||
;;; Copyright © 2025 James Smith <jsubuntuxp@disroot.org>
|
;;; Copyright © 2025 James Smith <jsubuntuxp@disroot.org>
|
||||||
;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
|
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
@@ -1001,21 +1000,22 @@ information can be viewed in real time and/or logged to a file.")
|
|||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri
|
||||||
(url "https://github.com/dell/libsmbios")
|
(git-reference
|
||||||
(commit (string-append "v" version))))
|
(url (string-append "https://github.com/dell/" name))
|
||||||
|
(commit (string-append "v" version))))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"))))
|
(base32 "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list autoconf
|
`(("autoconf" ,autoconf)
|
||||||
automake
|
("automake" ,automake)
|
||||||
gettext-minimal
|
("gettext" ,gettext-minimal)
|
||||||
libtool
|
("libtool" ,libtool)
|
||||||
pkg-config
|
("pkg-config" ,pkg-config)
|
||||||
perl
|
("perl" ,perl)
|
||||||
python))
|
("python" ,python)))
|
||||||
(inputs
|
(inputs
|
||||||
(list libxml2))
|
(list libxml2))
|
||||||
(arguments
|
(arguments
|
||||||
|
|||||||
@@ -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-3.0))
|
(inputs (list ghc-network openssl))
|
||||||
(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
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user