Merge remote-tracking branch 'savannah/master' into core-updates

Conflicts:
	gnu/local.mk
	gnu/packages/autotools.scm
	gnu/packages/cmake.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/haskell.scm
	gnu/packages/pdf.scm
	gnu/packages/python-xyz.scm
	gnu/packages/samba.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/wxwidgets.scm
This commit is contained in:
Christopher Baines 2023-03-02 10:37:28 +00:00
commit 7df09ee0ab
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
402 changed files with 27182 additions and 15696 deletions

View File

@ -61,7 +61,7 @@
(eval . (put 'eval-when 'scheme-indent-function 1)) (eval . (put 'eval-when 'scheme-indent-function 1))
(eval . (put 'call-with-prompt 'scheme-indent-function 1)) (eval . (put 'call-with-prompt 'scheme-indent-function 1))
(eval . (put 'test-assert 'scheme-indent-function 1)) (eval . (put 'test-assert 'scheme-indent-function 1))
(eval . (put 'test-assertm 'scheme-indent-function 1)) (eval . (put 'test-assertm 'scheme-indent-function 2))
(eval . (put 'test-equalm 'scheme-indent-function 1)) (eval . (put 'test-equalm 'scheme-indent-function 1))
(eval . (put 'test-equal 'scheme-indent-function 1)) (eval . (put 'test-equal 'scheme-indent-function 1))
(eval . (put 'test-eq 'scheme-indent-function 1)) (eval . (put 'test-eq 'scheme-indent-function 1))
@ -72,6 +72,9 @@
(eval . (put 'substitute* 'scheme-indent-function 1)) (eval . (put 'substitute* 'scheme-indent-function 1))
(eval . (put 'match-record 'scheme-indent-function 2)) (eval . (put 'match-record 'scheme-indent-function 2))
;; TODO: Contribute these to Emacs' scheme-mode.
(eval . (put 'let-keywords 'scheme-indent-function 3))
;; 'modify-inputs' and its keywords. ;; 'modify-inputs' and its keywords.
(eval . (put 'modify-inputs 'scheme-indent-function 1)) (eval . (put 'modify-inputs 'scheme-indent-function 1))
(eval . (put 'replace 'scheme-indent-function 1)) (eval . (put 'replace 'scheme-indent-function 1))
@ -94,6 +97,7 @@
(eval . (put 'origin 'scheme-indent-function 0)) (eval . (put 'origin 'scheme-indent-function 0))
(eval . (put 'build-system 'scheme-indent-function 0)) (eval . (put 'build-system 'scheme-indent-function 0))
(eval . (put 'bag 'scheme-indent-function 0)) (eval . (put 'bag 'scheme-indent-function 0))
(eval . (put 'computed-file 'scheme-indent-function 1))
(eval . (put 'gexp->derivation 'scheme-indent-function 1)) (eval . (put 'gexp->derivation 'scheme-indent-function 1))
(eval . (put 'graft 'scheme-indent-function 0)) (eval . (put 'graft 'scheme-indent-function 0))
(eval . (put 'operating-system 'scheme-indent-function 0)) (eval . (put 'operating-system 'scheme-indent-function 0))

View File

@ -8,3 +8,4 @@ add_signoff: False
get_maintainer_script: etc/teams.scm get-maintainer get_maintainer_script: etc/teams.scm get-maintainer
# TODO: enable check_patch # TODO: enable check_patch
check_patch: False check_patch: False
ignore_bad_tags: True

View File

@ -111,6 +111,7 @@ MODULES = \
guix/derivations.scm \ guix/derivations.scm \
guix/grafts.scm \ guix/grafts.scm \
guix/repl.scm \ guix/repl.scm \
guix/rpm.scm \
guix/transformations.scm \ guix/transformations.scm \
guix/inferior.scm \ guix/inferior.scm \
guix/describe.scm \ guix/describe.scm \
@ -179,6 +180,7 @@ MODULES = \
guix/build-system/ruby.scm \ guix/build-system/ruby.scm \
guix/build-system/scons.scm \ guix/build-system/scons.scm \
guix/build-system/texlive.scm \ guix/build-system/texlive.scm \
guix/build-system/tree-sitter.scm \
guix/build-system/trivial.scm \ guix/build-system/trivial.scm \
guix/ftp-client.scm \ guix/ftp-client.scm \
guix/http-client.scm \ guix/http-client.scm \
@ -235,6 +237,7 @@ MODULES = \
guix/build/ruby-build-system.scm \ guix/build/ruby-build-system.scm \
guix/build/scons-build-system.scm \ guix/build/scons-build-system.scm \
guix/build/texlive-build-system.scm \ guix/build/texlive-build-system.scm \
guix/build/tree-sitter-build-system.scm \
guix/build/waf-build-system.scm \ guix/build/waf-build-system.scm \
guix/build/haskell-build-system.scm \ guix/build/haskell-build-system.scm \
guix/build/julia-build-system.scm \ guix/build/julia-build-system.scm \
@ -534,6 +537,7 @@ SCM_TESTS = \
tests/pypi.scm \ tests/pypi.scm \
tests/read-print.scm \ tests/read-print.scm \
tests/records.scm \ tests/records.scm \
tests/rpm.scm \
tests/scripts.scm \ tests/scripts.scm \
tests/search-paths.scm \ tests/search-paths.scm \
tests/services.scm \ tests/services.scm \

View File

@ -30,7 +30,7 @@ Copyright @copyright{} 2015, 2016 Mathieu Lirzin@*
Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2014 Pierre-Antoine Rault@*
Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@*
Copyright @copyright{} 2015, 2016, 2017, 2019, 2020, 2021, 2023 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2019, 2020, 2021, 2023 Leo Famulari@*
Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Ricardo Wurmus@*
Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016 Ben Woodcroft@*
Copyright @copyright{} 2016, 2017, 2018, 2021 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2021 Chris Marusich@*
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner@*
@ -79,9 +79,9 @@ Copyright @copyright{} 2020 Jack Hill@*
Copyright @copyright{} 2020 Naga Malleswari@* Copyright @copyright{} 2020 Naga Malleswari@*
Copyright @copyright{} 2020, 2021 Brice Waegeneire@* Copyright @copyright{} 2020, 2021 Brice Waegeneire@*
Copyright @copyright{} 2020 R Veera Kumar@* Copyright @copyright{} 2020 R Veera Kumar@*
Copyright @copyright{} 2020, 2021 Pierre Langlois@* Copyright @copyright{} 2020, 2021, 2022 Pierre Langlois@*
Copyright @copyright{} 2020 pinoaffe@* Copyright @copyright{} 2020 pinoaffe@*
Copyright @copyright{} 2020 André Batista@* Copyright @copyright{} 2020, 2023 André Batista@*
Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@*
Copyright @copyright{} 2020 raingloom@* Copyright @copyright{} 2020 raingloom@*
Copyright @copyright{} 2020 Daniel Brooks@* Copyright @copyright{} 2020 Daniel Brooks@*
@ -109,6 +109,7 @@ Copyright @copyright{} 2022 Reily Siegel@*
Copyright @copyright{} 2022 Simon Streit@* Copyright @copyright{} 2022 Simon Streit@*
Copyright @copyright{} 2022 (@* Copyright @copyright{} 2022 (@*
Copyright @copyright{} 2022 John Kehayias@* Copyright @copyright{} 2022 John Kehayias@*
Copyright @copyright{} 20222023 Bruno Victal@*
Copyright @copyright{} 2022 Ivan Vilata-i-Balaguer@* Copyright @copyright{} 2022 Ivan Vilata-i-Balaguer@*
Copyright @copyright{} 2023 Giacomo Leidi@* Copyright @copyright{} 2023 Giacomo Leidi@*
Copyright @copyright{} 2022 Antero Mejr@* Copyright @copyright{} 2022 Antero Mejr@*
@ -5411,6 +5412,25 @@ From there on, @command{guix pull} will fetch code from the @code{super-hacks}
branch of the repository at @code{example.org}. The authentication concern is branch of the repository at @code{example.org}. The authentication concern is
addressed below (@pxref{Channel Authentication}). addressed below (@pxref{Channel Authentication}).
Note that you can specify a local directory on the @code{url} field above if
the channel that you intend to use resides on a local file system. However,
in this case @command{guix} checks said directory for ownership before any
further processing. This means that if the user is not the directory owner,
but wants to use it as their default, they will then need to set it as a safe
directory in their global git configuration file. Otherwise, @command{guix}
will refuse to even read it. Supposing your system-wide local directory is at
@code{/src/guix.git}, you would then create a git configuration file at
@code{~/.gitconfig} with the following contents:
@example
[safe]
directory = /src/guix.git
@end example
@noindent
This also applies to the root user unless when called with @command{sudo} by
the directory owner.
@node Replicating Guix @node Replicating Guix
@section Replicating Guix @section Replicating Guix
@ -6894,6 +6914,7 @@ such file or directory'' message.
@end quotation @end quotation
@item deb @item deb
@cindex Debian, build a .deb package with guix pack
This produces a Debian archive (a package with the @samp{.deb} file This produces a Debian archive (a package with the @samp{.deb} file
extension) containing all the specified binaries and symbolic links, extension) containing all the specified binaries and symbolic links,
that can be installed on top of any dpkg-based GNU(/Linux) distribution. that can be installed on top of any dpkg-based GNU(/Linux) distribution.
@ -6910,7 +6931,8 @@ guix pack -f deb -C xz -S /usr/bin/hello=bin/hello hello
Because archives produced with @command{guix pack} contain a collection Because archives produced with @command{guix pack} contain a collection
of store items and because each @command{dpkg} package must not have of store items and because each @command{dpkg} package must not have
conflicting files, in practice that means you likely won't be able to conflicting files, in practice that means you likely won't be able to
install more than one such archive on a given system. install more than one such archive on a given system. You can
nonetheless pack as many Guix packages as you want in one such archive.
@end quotation @end quotation
@quotation Warning @quotation Warning
@ -6921,6 +6943,48 @@ shared by other software, such as a Guix installation or other, non-deb
packs. packs.
@end quotation @end quotation
@item rpm
@cindex RPM, build an RPM archive with guix pack
This produces an RPM archive (a package with the @samp{.rpm} file
extension) containing all the specified binaries and symbolic links,
that can be installed on top of any RPM-based GNU/Linux distribution.
The RPM format embeds checksums for every file it contains, which the
@command{rpm} command uses to validate the integrity of the archive.
Advanced RPM-related options are revealed via the
@option{--help-rpm-format} option. These options allow embedding
maintainer scripts that can run before or after the installation of the
RPM archive, for example.
The RPM format supports relocatable packages via the @option{--prefix}
option of the @command{rpm} command, which can be handy to install an
RPM package to a specific prefix.
@example
guix pack -f rpm -R -C xz -S /usr/bin/hello=bin/hello hello
@end example
@example
sudo rpm --install --prefix=/opt /gnu/store/...-hello.rpm
@end example
@quotation Note
Contrary to Debian packages, conflicting but @emph{identical} files in
RPM packages can be installed simultaneously, which means multiple
@command{guix pack}-produced RPM packages can usually be installed side
by side without any problem.
@end quotation
@quotation Warning
@command{rpm} assumes ownership of any files contained in the pack,
which means it will remove @file{/gnu/store} upon uninstalling a
Guix-generated RPM package, unless the RPM package was installed with
the @option{--prefix} option of the @command{rpm} command. It is unwise
to install Guix-produced @samp{.rpm} packages on a system where
@file{/gnu/store} is shared by other software, such as a Guix
installation or other, non-rpm packs.
@end quotation
@end table @end table
@cindex relocatable binaries @cindex relocatable binaries
@ -9763,6 +9827,25 @@ be specified with the @code{#:node} parameter which defaults to
@code{node}. @code{node}.
@end defvar @end defvar
@defvr {Scheme Variable} tree-sitter-build-system
This variable is exported by @code{(guix build-system tree-sitter)}. It
implements procedures to compile grammars for the
@url{https://tree-sitter.github.io/tree-sitter/, Tree-sitter} parsing
library. It essentially runs @code{tree-sitter generate} to translate
@code{grammar.js} grammars to JSON and then to C. Which it then
compiles to native code.
Tree-sitter packages may support multiple grammars, so this build system
supports a @code{#:grammar-directories} keyword to specify a list of
locations where a @code{grammar.js} file may be found.
Grammars sometimes depend on each other, such as C++ depending on C and
TypeScript depending on JavaScript. You may use inputs to declare such
dependencies.
@end defvr
Lastly, for packages that do not need anything as sophisticated, a Lastly, for packages that do not need anything as sophisticated, a
``trivial'' build system is provided. It is trivial in the sense that ``trivial'' build system is provided. It is trivial in the sense that
it provides basically no support: it does not pull any implicit inputs, it provides basically no support: it does not pull any implicit inputs,
@ -16488,13 +16571,6 @@ supported hardware.
@item @code{host-name} @item @code{host-name}
The host name. The host name.
@item @code{hosts-file}
@cindex hosts file
A file-like object (@pxref{G-Expressions, file-like objects}) for use as
@file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library
Reference Manual}). The default is a file with entries for
@code{localhost} and @var{host-name}.
@item @code{mapped-devices} (default: @code{'()}) @item @code{mapped-devices} (default: @code{'()})
A list of mapped devices. @xref{Mapped Devices}. A list of mapped devices. @xref{Mapped Devices}.
@ -17972,6 +18048,64 @@ package or any valid argument to @command{setfont}, as in this example:
@end lisp @end lisp
@end defvar @end defvar
@defvar hosts-service-type
Type of the service that populates the entries for (@file{/etc/hosts}).
This service type can be @emph{extended} by passing it a list of
@code{host} records.
The example below shows how to add two entries to @file{/etc/hosts}:
@c TRANSLATORS: The domain names below SHOULD NOT be translated.
@c They're domains reserved for use in documentation. (RFC6761 Section 6.5)
@c The addresses used are explained in RFC3849 and RFC5737.
@lisp
(simple-service 'add-extra-hosts
hosts-service-type
(list (host "192.0.2.1" "example.com"
'("example.net" "example.org"))
(host "2001:db8::1" "example.com"
'("example.net" "example.org"))))
@end lisp
@quotation Note
@cindex @file{/etc/hosts} default entries
By default @file{/etc/hosts} comes with the following entries:
@example
127.0.0.1 localhost @var{host-name}
::1 localhost @var{host-name}
@end example
For most setups this is what you want though if you find yourself in
the situation where you want to change the default entries, you can
do so in @code{operating-system} via @code{modify-services}
(@pxref{Service Reference,@code{modify-services}}).
The following example shows how to unset @var{host-name} from being an
alias of @code{localhost}.
@lisp
(operating-system
;; @dots{}
(essential-services
(modify-services
(operating-system-default-essential-services this-operating-system)
(hosts-service-type config => (list
(host "127.0.0.1" "localhost")
(host "::1" "localhost"))))))
@end lisp
@end quotation
@end defvar
@defun host @var{address} @var{canonical-name} [@var{aliases}]
Return a new record for the host at @var{address} with the given
@var{canonical-name} and possibly @var{aliases}.
@var{address} must be a string denoting a valid IPv4 or IPv6 address, and
@var{canonical-name} and the strings listed in @var{aliases} must be valid
host names.
@end defun
@deffn {Scheme Procedure} login-service @var{config} @deffn {Scheme Procedure} login-service @var{config}
Return a service to run login according to @var{config}, a Return a service to run login according to @var{config}, a
@code{<login-configuration>} object, which specifies the message of the day, @code{<login-configuration>} object, which specifies the message of the day,
@ -21012,31 +21146,14 @@ Logging level.
@end table @end table
@end deftp @end deftp
@defvar %facebook-host-aliases @defvar block-facebook-hosts-service-type
This variable contains a string for use in @file{/etc/hosts} This service type adds a list of known Facebook hosts to the
(@pxref{Host Names,,, libc, The GNU C Library Reference Manual}). Each @file{/etc/hosts} file.
line contains a entry that maps a known server name of the Facebook (@pxref{Host Names,,, libc, The GNU C Library Reference Manual})
Each line contains a entry that maps a known server name of the Facebook
on-line service---e.g., @code{www.facebook.com}---to the local on-line service---e.g., @code{www.facebook.com}---to the local
host---@code{127.0.0.1} or its IPv6 equivalent, @code{::1}. host---@code{127.0.0.1} or its IPv6 equivalent, @code{::1}.
This variable is typically used in the @code{hosts-file} field of an
@code{operating-system} declaration (@pxref{operating-system Reference,
@file{/etc/hosts}}):
@lisp
(use-modules (gnu) (guix))
(operating-system
(host-name "mymachine")
;; ...
(hosts-file
;; Create a /etc/hosts file with aliases for "localhost"
;; and "mymachine", as well as for Facebook servers.
(plain-file "hosts"
(string-append (local-host-aliases host-name)
%facebook-host-aliases))))
@end lisp
This mechanism can prevent programs running locally, such as Web This mechanism can prevent programs running locally, such as Web
browsers, from accessing Facebook. browsers, from accessing Facebook.
@end defvar @end defvar
@ -21875,7 +21992,7 @@ disable security:
@end lisp @end lisp
Or to set a PasswordFile for the classic (unsecure) VncAuth Or to set a PasswordFile for the classic (unsecure) VncAuth
mecanism: mechanism:
@lisp @lisp
(vnc-server-command (file-append tigervnc-server "/bin/Xvnc" (vnc-server-command (file-append tigervnc-server "/bin/Xvnc"
@ -21911,9 +22028,7 @@ Available @code{lightdm-gtk-greeter-configuration} fields are:
@item @code{lightdm-gtk-greeter} (default: @code{lightdm-gtk-greeter}) (type: file-like) @item @code{lightdm-gtk-greeter} (default: @code{lightdm-gtk-greeter}) (type: file-like)
The lightdm-gtk-greeter package to use. The lightdm-gtk-greeter package to use.
@item @code{assets} @ @item @code{assets} (default: @code{(adwaita-icon-theme gnome-themes-extra hicolor-icon-theme)}) (type: list-of-file-likes)
(default: @code{(adwaita-icon-theme gnome-themes-extrahicolor-icon-theme)}) @
(type: list-of-file-likes)
The list of packages complementing the greeter, such as package The list of packages complementing the greeter, such as package
providing icon themes. providing icon themes.
@ -21939,8 +22054,7 @@ The background image to use.
Enable accessibility support through the Assistive Technology Service Enable accessibility support through the Assistive Technology Service
Provider Interface (AT-SPI). Provider Interface (AT-SPI).
@item @code{a11y-states} @ @item @code{a11y-states} (default: @code{(contrast font keyboard reader)}) (type: list-of-a11y-states)
(default: @code{(contrast font keyboard reader)}) (type: list-of-a11y-states)
The accessibility features to enable, given as list of symbols. The accessibility features to enable, given as list of symbols.
@item @code{reader} (type: maybe-file-like) @item @code{reader} (type: maybe-file-like)
@ -21974,8 +22088,7 @@ The type of the seat, either the @code{local} or @code{xremote} symbol.
@item @code{autologin-user} (type: maybe-string) @item @code{autologin-user} (type: maybe-string)
The username to automatically log in with by default. The username to automatically log in with by default.
@item @code{greeter-session} @ @item @code{greeter-session} (default: @code{lightdm-gtk-greeter}) (type: greeter-session)
(default: @code{lightdm-gtk-greeter}) (type: greeter-session)
The greeter session to use, specified as a symbol. Currently, only The greeter session to use, specified as a symbol. Currently, only
@code{lightdm-gtk-greeter} is supported. @code{lightdm-gtk-greeter} is supported.
@ -23043,6 +23156,49 @@ The LXQT package to use.
@end table @end table
@end deftp @end deftp
@defvar sugar-desktop-service-type
This is the type of the service that runs the
@uref{https://www.sugarlabs.org, Sugar desktop environment}. Its value
is a @code{sugar-desktop-configuration} object (see below).
This service adds the @code{sugar} package to the system profile, as
well as any selected Sugar activities. By default it only includes a
minimal set of activities.
@end defvar
@deftp {Data Type} sugar-desktop-configuration
Configuration record for the Sugar desktop environment.
@table @asis
@item @code{sugar} (default: @code{sugar})
The Sugar package to use.
@item @code{gobject-introspection} (default: @code{gobject-introspection})
The @code{gobject-introspection} package to use. This package is used
to access libraries installed as dependencies of Sugar activities.
@item @code{activities} (default: @code{(list sugar-help-activity)})
A list of Sugar activities to install.
@end table
@end deftp
The following example configures the Sugar desktop environment with a
number of useful activities:
@lisp
(use-modules (gnu))
(use-package-modules sugar)
(use-service-modules desktop)
(operating-system
...
(services (cons* (service sugar-desktop-service-type
(sugar-desktop-configuration
(activities (list sugar-browse-activity
sugar-help-activity
sugar-jukebox-activity
sugar-typing-turtle-activity))))
%desktop-services))
...)
@end lisp
@defvar enlightenment-desktop-service-type @defvar enlightenment-desktop-service-type
Return a service that adds the @code{enlightenment} package to the system Return a service that adds the @code{enlightenment} package to the system
profile, and extends dbus with actions from @code{efl}. profile, and extends dbus with actions from @code{efl}.
@ -33161,79 +33317,190 @@ The service type for @command{mpd}
Data type representing the configuration of @command{mpd}. Data type representing the configuration of @command{mpd}.
@table @asis @table @asis
@item @code{user} (default: @code{"mpd"}) @item @code{package} (default: @code{mpd}) (type: file-like)
The MPD package.
@item @code{user} (default: @code{"mpd"}) (type: string)
The user to run mpd as. The user to run mpd as.
@item @code{music-dir} (default: @code{"~/Music"}) @item @code{group} (default: @code{"mpd"}) (type: string)
The group to run mpd as.
@item @code{shepherd-requirement} (default: @code{()}) (type: list-of-symbol)
This is a list of symbols naming Shepherd services that this service
will depend on.
@item @code{environment-variables} (default: @code{()}) (type: list-of-string)
A list of strings specifying environment variables.
@item @code{log-file} (default: @code{"/var/log/mpd/log"}) (type: maybe-string)
The location of the log file. Set to @code{syslog} to use the local
syslog daemon or @code{%unset-value} to omit this directive from the
configuration file.
@item @code{log-level} (type: maybe-string)
Supress any messages below this threshold. Available values:
@code{notice}, @code{info}, @code{verbose}, @code{warning} and
@code{error}.
@item @code{music-directory} (type: maybe-string)
The directory to scan for music files. The directory to scan for music files.
@item @code{playlist-dir} (default: @code{"~/.mpd/playlists"}) @item @code{playlist-directory} (type: maybe-string)
The directory to store playlists. The directory to store playlists.
@item @code{db-file} (default: @code{"~/.mpd/tag_cache"}) @item @code{db-file} (type: maybe-string)
The location of the music database. The location of the music database.
@item @code{state-file} (default: @code{"~/.mpd/state"}) @item @code{state-file} (type: maybe-string)
The location of the file that stores current MPD's state. The location of the file that stores current MPD's state.
@item @code{sticker-file} (default: @code{"~/.mpd/sticker.sql"}) @item @code{sticker-file} (type: maybe-string)
The location of the sticker database. The location of the sticker database.
@item @code{port} (default: @code{"6600"}) @item @code{default-port} (default: @code{6600}) (type: maybe-integer)
The port to run mpd on. The default port to run mpd on.
@item @code{address} (default: @code{"any"}) @item @code{endpoints} (type: maybe-list-of-string)
The address that mpd will bind to. To use a Unix domain socket, The addresses that mpd will bind to. A port different from @var{default-port}
an absolute path can be specified here. may be specified, e.g. @code{localhost:6602} and IPv6 addresses must be
enclosed in square brackets when a different port is used.
To use a Unix domain socket, an absolute path or a path starting with @code{~}
can be specified here.
@item @code{outputs} (default: @code{"(list (mpd-output))"}) @item @code{database} (type: maybe-mpd-plugin)
The audio outputs that MPD can use. By default this is a single output using pulseaudio. MPD database plugin configuration.
@item @code{partitions} (default: @code{()}) (type: list-of-mpd-partition)
List of MPD "partitions".
@item @code{neighbors} (default: @code{()}) (type: list-of-mpd-plugin)
List of MPD neighbor plugin configurations.
@item @code{inputs} (default: @code{()}) (type: list-of-mpd-plugin)
List of MPD input plugin configurations.
@item @code{archive-plugins} (default: @code{()}) (type: list-of-mpd-plugin)
List of MPD archive plugin configurations.
@item @code{input-cache-size} (type: maybe-string)
MPD input cache size.
@item @code{decoders} (default: @code{()}) (type: list-of-mpd-plugin)
List of MPD decoder plugin configurations.
@item @code{resampler} (type: maybe-mpd-plugin)
MPD resampler plugin configuration.
@item @code{filters} (default: @code{()}) (type: list-of-mpd-plugin)
List of MPD filter plugin configurations.
@item @code{outputs} (type: list-of-mpd-plugin-or-output)
The audio outputs that MPD can use. By default this is a single output
using pulseaudio.
@item @code{playlist-plugins} (default: @code{()}) (type: list-of-mpd-plugin)
List of MPD playlist plugin configurations.
@item @code{extra-options} (default: @code{()}) (type: alist)
An association list of option symbols/strings to string values to be
appended to the configuration.
@end table
@end deftp
@deftp {Data Type} mpd-plugin
Data type representing a @command{mpd} plugin.
@table @asis
@item @code{plugin} (type: maybe-string)
Plugin name.
@item @code{name} (type: maybe-string)
Name.
@item @code{enabled?} (type: maybe-boolean)
Whether the plugin is enabled/disabled.
@item @code{extra-options} (default: @code{()}) (type: alist)
An association list of option symbols/strings to string values to be
appended to the plugin configuration. See
@uref{https://mpd.readthedocs.io/en/latest/plugins.html,MPD plugin
reference} for available options.
@end table
@end deftp
@deftp {Data Type} mpd-partition
Data type representing a @command{mpd} partition.
@table @asis
@item @code{name} (type: string)
Partition name.
@item @code{extra-options} (default: @code{()}) (type: alist)
An association list of option symbols/strings to string values to be
appended to the partition configuration. See
@uref{https://mpd.readthedocs.io/en/latest/user.html#configuring-partitions,Configuring
Partitions} for available options.
@end table @end table
@end deftp @end deftp
@deftp {Data Type} mpd-output @deftp {Data Type} mpd-output
Data type representing an @command{mpd} audio output. Data type representing a @command{mpd} audio output.
@table @asis @table @asis
@item @code{name} (default: @code{"MPD"}) @item @code{name} (default: @code{"MPD"}) (type: string)
The name of the audio output. The name of the audio output.
@item @code{type} (default: @code{"pulse"}) @item @code{type} (default: @code{"pulse"}) (type: string)
The type of audio output. The type of audio output.
@item @code{enabled?} (default: @code{#t}) @item @code{enabled?} (default: @code{#t}) (type: boolean)
Specifies whether this audio output is enabled when MPD is started. By Specifies whether this audio output is enabled when MPD is started. By
default, all audio outputs are enabled. This is just the default default, all audio outputs are enabled. This is just the default
setting when there is no state file; with a state file, the previous setting when there is no state file; with a state file, the previous
state is restored. state is restored.
@item @code{tags?} (default: @code{#t}) @item @code{format} (type: maybe-string)
Force a specific audio format on output. See
@uref{https://mpd.readthedocs.io/en/latest/user.html#audio-output-format,Global
Audio Format} for a more detailed description.
@item @code{tags?} (default: @code{#t}) (type: boolean)
If set to @code{#f}, then MPD will not send tags to this output. This If set to @code{#f}, then MPD will not send tags to this output. This
is only useful for output plugins that can receive tags, for example the is only useful for output plugins that can receive tags, for example the
@code{httpd} output plugin. @code{httpd} output plugin.
@item @code{always-on?} (default: @code{#f}) @item @code{always-on?} (default: @code{#f}) (type: boolean)
If set to @code{#t}, then MPD attempts to keep this audio output always If set to @code{#t}, then MPD attempts to keep this audio output always
open. This may be useful for streaming servers, when you dont want to open. This may be useful for streaming servers, when you don?t want to
disconnect all listeners even when playback is accidentally stopped. disconnect all listeners even when playback is accidentally stopped.
@item @code{mixer-type} @item @code{mixer-type} (default: @code{"none"}) (type: string)
This field accepts a symbol that specifies which mixer should be used This field accepts a string that specifies which mixer should be used
for this audio output: the @code{hardware} mixer, the @code{software} for this audio output: the @code{hardware} mixer, the @code{software}
mixer, the @code{null} mixer (allows setting the volume, but with no mixer, the @code{null} mixer (allows setting the volume, but with no
effect; this can be used as a trick to implement an external mixer effect; this can be used as a trick to implement an external mixer
External Mixer) or no mixer (@code{none}). External Mixer) or no mixer (@code{none}).
@item @code{extra-options} (default: @code{'()}) @item @code{replay-gain-handler} (type: maybe-string)
An association list of option symbols to string values to be appended to This field accepts a string that specifies how
the audio output configuration. @uref{https://mpd.readthedocs.io/en/latest/user.html#replay-gain,Replay
Gain} is to be applied. @code{software} uses an internal software
volume control, @code{mixer} uses the configured (hardware) mixer
control and @code{none} disables replay gain on this audio output.
@item @code{extra-options} (default: @code{()}) (type: alist)
An association list of option symbols/strings to string values to be
appended to the audio output configuration.
@end table @end table
@end deftp @end deftp
The following example shows a configuration of @code{mpd} that provides The following example shows a configuration of @command{mpd} that
an HTTP audio streaming output. configures some of its plugins and provides a HTTP audio streaming output.
@lisp @lisp
(service mpd-service-type (service mpd-service-type
@ -33245,9 +33512,140 @@ an HTTP audio streaming output.
(mixer-type 'null) (mixer-type 'null)
(extra-options (extra-options
`((encoder . "vorbis") `((encoder . "vorbis")
(port . "8080")))))))) (port . "8080"))))))
(decoders
(list (mpd-plugin
(plugin "mikmod")
(enabled? #f))
(mpd-plugin
(plugin "openmpt")
(enabled? #t)
(extra-options `((repeat-count . -1)
(interpolation-filter . 1))))))
(resampler (mpd-plugin
(plugin "libsamplerate")
(extra-options `((type . 0)))))))
@end lisp @end lisp
@subsubheading myMPD
@cindex MPD, web interface
@cindex myMPD service
@uref{https://jcorporation.github.io/myMPD/, myMPD} is a web server
frontend for MPD that provides a mobile friendly web client for MPD.
The following example shows a myMPD instance listening on port 80,
with album cover caching disabled.
@lisp
(service mympd-service-type
(mympd-configuration
(port 80)
(covercache-ttl 0)))
@end lisp
@defvar mympd-service-type
The service type for @command{mympd}.
@end defvar
@c %start of fragment
@deftp {Data Type} mympd-configuration
Available @code{mympd-configuration} fields are:
@table @asis
@item @code{package} (default: @code{mympd}) (type: file-like)
The package object of the myMPD server.
@item @code{shepherd-requirement} (default: @code{()}) (type: list-of-symbol)
This is a list of symbols naming Shepherd services that this service
will depend on.
@item @code{user} (default: @code{"mympd"}) (type: string)
Owner of the @command{mympd} process.
@item @code{group} (default: @code{"nogroup"}) (type: string)
Owner group of the @command{mympd} process.
@item @code{work-directory} (default: @code{"/var/lib/mympd"}) (type: string)
Where myMPD will store its data.
@item @code{cache-directory} (default: @code{"/var/cache/mympd"}) (type: string)
Where myMPD will store its cache.
@item @code{acl} (type: maybe-mympd-ip-acl)
ACL to access the myMPD webserver.
@item @code{covercache-ttl} (default: @code{31}) (type: maybe-integer)
How long to keep cached covers, @code{0} disables cover caching.
@item @code{http?} (default: @code{#t}) (type: boolean)
HTTP support.
@item @code{host} (default: @code{"[::]"}) (type: string)
Host name to listen on.
@item @code{port} (default: @code{80}) (type: maybe-port)
HTTP port to listen on.
@item @code{log-level} (default: @code{5}) (type: integer)
How much detail to include in logs, possible values: @code{0} to
@code{7}.
@item @code{log-to} (default: @code{"/var/log/mympd/log"}) (type: string-or-symbol)
Where to send logs. By default, the service logs to
@file{/var/log/mympd.log}. The alternative is @code{'syslog}, which
sends output to the running syslog service under the @samp{daemon}
facility.
@item @code{lualibs} (default: @code{"all"}) (type: maybe-string)
See
@uref{https://jcorporation.github.io/myMPD/scripting/#lua-standard-libraries}.
@item @code{uri} (type: maybe-string)
Override URI to myMPD. See
@uref{https://github.com/jcorporation/myMPD/issues/950}.
@item @code{script-acl} (default: @code{(mympd-ip-acl (allow '("127.0.0.1")))}) (type: maybe-mympd-ip-acl)
ACL to access the myMPD script backend.
@item @code{ssl?} (default: @code{#f}) (type: boolean)
SSL/TLS support.
@item @code{ssl-port} (default: @code{443}) (type: maybe-port)
Port to listen for HTTPS.
@item @code{ssl-cert} (type: maybe-string)
Path to PEM encoded X.509 SSL/TLS certificate (public key).
@item @code{ssl-key} (type: maybe-string)
Path to PEM encoded SSL/TLS private key.
@item @code{pin-hash} (type: maybe-string)
SHA-256 hashed pin used by myMPD to control settings access by prompting
a pin from the user.
@item @code{save-caches?} (type: maybe-boolean)
Whether to preserve caches between service restarts.
@end table
@end deftp
@c %end of fragment
@c %start of fragment
@deftp {Data Type} mympd-ip-acl
Available @code{mympd-ip-acl} fields are:
@table @asis
@item @code{allow} (default: @code{()}) (type: list-of-string)
Allowed IP addresses.
@item @code{deny} (default: @code{()}) (type: list-of-string)
Disallowed IP addresses.
@end table
@end deftp
@c %end of fragment
@node Virtualization Services @node Virtualization Services
@subsection Virtualization Services @subsection Virtualization Services
@ -34287,7 +34685,7 @@ and to make maintenance and recovery tasks easy. It consists of multiple
services which are described later in this section. In addition to the Ganeti services which are described later in this section. In addition to the Ganeti
service, you will need the OpenSSH service (@pxref{Networking Services, service, you will need the OpenSSH service (@pxref{Networking Services,
@code{openssh-service-type}}), and update the @file{/etc/hosts} file @code{openssh-service-type}}), and update the @file{/etc/hosts} file
(@pxref{operating-system Reference, @code{hosts-file}}) with the cluster name (@pxref{Service Reference, @code{hosts-service-type}}) with the cluster name
and address (or use a DNS server). and address (or use a DNS server).
All nodes participating in a Ganeti cluster should have the same Ganeti and All nodes participating in a Ganeti cluster should have the same Ganeti and
@ -34301,14 +34699,6 @@ cluster node that supports multiple storage backends, and installs the
(operating-system (operating-system
;; @dots{} ;; @dots{}
(host-name "node1") (host-name "node1")
(hosts-file (plain-file "hosts" (format #f "
127.0.0.1 localhost
::1 localhost
192.168.1.200 ganeti.example.com
192.168.1.201 node1.example.com node1
192.168.1.202 node2.example.com node2
")))
;; Install QEMU so we can use KVM-based instances, and LVM, DRBD and Ceph ;; Install QEMU so we can use KVM-based instances, and LVM, DRBD and Ceph
;; in order to use the "plain", "drbd" and "rbd" storage backends. ;; in order to use the "plain", "drbd" and "rbd" storage backends.
@ -34336,6 +34726,14 @@ cluster node that supports multiple storage backends, and installs the
(openssh-configuration (openssh-configuration
(permit-root-login 'prohibit-password))) (permit-root-login 'prohibit-password)))
(simple-service 'ganeti-hosts-entries hosts-service-type
(list
(host "192.168.1.200" "ganeti.example.com")
(host "192.168.1.201" "node1.example.com"
'("node1"))
(host "192.168.1.202" "node2.example.com"
'("node2"))))
(service ganeti-service-type (service ganeti-service-type
(ganeti-configuration (ganeti-configuration
;; This list specifies allowed file system paths ;; This list specifies allowed file system paths
@ -36812,6 +37210,42 @@ advertised.
Log level to use, specify a log level like @code{'INFO} to stop logging Log level to use, specify a log level like @code{'INFO} to stop logging
individual requests. individual requests.
@item @code{cached-compressions} (default: @code{'()})
Activate generating cached nars with different compression details from
the stored nars. This is a list of
nar-herder-cached-compression-configuration records.
@item @code{min-uses} (default: @code{3})
When cached-compressions are enabled, generate cached nars when at least
this number of requests are made for a nar.
@item @code{workers} (default: @code{2})
Number of cached nars to generate at a time.
@item @code{nar-source} (default: @code{#f})
Location to fetch nars from when computing cached compressions. By
default, the storage location will be used.
@end table
@end deftp
@deftp {Data Type} nar-herder-cached-compression-configuration
Data type representing the cached compression configuration.
@table @asis
@item @code{type}
Type of compression to use, e.g. @code{'zstd}.
@item @code{workers} (default: @code{#f})
Level of the compression to use.
@item @code{directory} (default: @code{#f})
Location to store the cached nars. If unspecified, they will be stored
in /var/cache/nar-herder/nar/TYPE.
@item @code{directory-max-size} (default: @code{#f})
Maximum size in bytes of the directory.
@end table @end table
@end deftp @end deftp
@ -41106,6 +41540,7 @@ services)}.
* SSH: Secure Shell. Setting up the secure shell client. * SSH: Secure Shell. Setting up the secure shell client.
* Desktop: Desktop Home Services. Services for graphical environments. * Desktop: Desktop Home Services. Services for graphical environments.
* Guix: Guix Home Services. Services for Guix. * Guix: Guix Home Services. Services for Guix.
* Fonts: Fonts Home Services. Services for managing User's fonts.
@end menu @end menu
@c In addition to that Home Services can provide @c In addition to that Home Services can provide
@ -41990,6 +42425,35 @@ A typical extension for adding a channel might look like this:
@end lisp @end lisp
@end defvar @end defvar
@node Fonts Home Services
@subsection Fonts Home Services
The @code{(gnu home services fontutils)} module provides services for
user-specific Fontconfig setup. The
@uref{https://www.freedesktop.org/wiki/Software/fontconfig,Fontconfig}
library is used by many applications to access fonts on the system.
@defvar home-fontconfig-service-type
This is the service type for generating configurations for Fontconfig.
Its associated value is a list of strings (or gexps) pointing to fonts
locations.
Generally, it is better to extend this service than to directly
configure it, as its default value is the default Guix Home's profile
font installation path (@file{~/.guix-home/profile/share/fonts}). If
you configure this service directly, be sure to include the above
directory.
A typical extension for adding an additional font directory might look
like this:
@lisp
(simple-service 'additional-fonts-service
home-fontconfig-service-type
(list "~/.nix-profile/share/fonts"))
@end lisp
@end defvar
@node Invoking guix home @node Invoking guix home
@section Invoking @command{guix home} @section Invoking @command{guix home}

View File

@ -29,6 +29,22 @@
# We require Bash but for portability we'd rather not use /bin/bash or # We require Bash but for portability we'd rather not use /bin/bash or
# /usr/bin/env in the shebang, hence this hack. # /usr/bin/env in the shebang, hence this hack.
# Environment variables
#
# GUIX_BINARY_FILE_NAME
#
# Can be used to override the automatic download mechanism and point
# to a local Guix binary archive filename like
# "/tmp/guix-binary-1.4.0rc2.armhf-linux.tar.xz"
#
# GUIX_ALLOW_OVERWRITE
#
# Instead of aborting to avoid overwriting a previous installations,
# allow copying over /var/guix or /gnu. This can be useful when the
# installation required the user to extract Guix packs under /gnu to
# satisfy its dependencies.
if [ "x$BASH_VERSION" = "x" ] if [ "x$BASH_VERSION" = "x" ]
then then
exec bash "$0" "$@" exec bash "$0" "$@"
@ -336,16 +352,15 @@ sys_create_store()
_debug "--- [ ${FUNCNAME[0]} ] ---" _debug "--- [ ${FUNCNAME[0]} ] ---"
if [[ -e "/var/guix" || -e "/gnu" ]]; then if [[ -z $GUIX_ALLOW_OVERWRITE && (-e /var/guix || -e /gnu) ]]; then
die "A previous Guix installation was found. Refusing to overwrite." die "A previous Guix installation was found. Refusing to overwrite."
else
_msg "${WAR}Overwriting existing installation!"
fi fi
cd "$tmp_path" cd "$tmp_path"
tar --extract --file "$pkg" && _msg "${PAS}unpacked archive"
_msg "${INF}Installing /var/guix and /gnu..." _msg "${INF}Installing /var/guix and /gnu..."
mv "${tmp_path}/var/guix" /var/ tar --extract --file "$pkg" -C /
mv "${tmp_path}/gnu" /
_msg "${INF}Linking the root user's profile" _msg "${INF}Linking the root user's profile"
mkdir -p ~root/.config/guix mkdir -p ~root/.config/guix

View File

@ -4,12 +4,12 @@
;; Copyright © 20192021 Tobias Geerinckx-Rice <me@tobias.gr> ;; Copyright © 20192021 Tobias Geerinckx-Rice <me@tobias.gr>
;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com> ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net> ;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
;; Copyright © 2019, 2020, 2021 Julien Lepiller <julien@lepiller.eu> ;; Copyright © 2019, 2020, 2021, 2023 Julien Lepiller <julien@lepiller.eu>
;; Copyright © 20192023 Florian Pelz <pelzflorian@pelzflorian.de> ;; Copyright © 20192023 Florian Pelz <pelzflorian@pelzflorian.de>
;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;; Copyright © 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com> ;; Copyright © 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;; Copyright © 2021 Zhu Zihao <all_but_last@163.com> ;; Copyright © 2021 Zhu Zihao <all_but_last@163.com>
;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> ;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
@ -26,6 +26,47 @@
(channel-news (channel-news
(version 0) (version 0)
(entry (commit "598f4c509bbfec2b983a8ee246cce0a0fe45ec7f")
(title
(de "Neues Format @samp{rpm} für den Befehl @command{guix pack}")
(en "New @samp{rpm} format for the @command{guix pack} command")
(fr "Nouveau format @samp{rpm} pour la commande @command{guix pack}"))
(body
(de "Sie können jetzt auch RPM-Archive (mit der Dateinamenserweiterung
.rpm) erzeugen mit dem Befehl @command{guix pack --format=rpm}. Damit
haben Sie einen alternativen Distributionsweg für mit Guix erstellte
Software. Hier sehen Sie ein einfaches Beispiel, wie Sie ein
RPM-Archiv für das Paket @code{hello} erzeugen:
@example
guix pack --format=rpm --symlink=/usr/bin/hello=bin/hello hello
@end example
Siehe @command{info \"(guix.de) Aufruf von guix pack\"} für mehr
Informationen.")
(en "RPM archives (with the .rpm file extension) can now be produced
via the @command{guix pack --format=rpm} command, providing an alternative
distribution path for software built with Guix. Here is a simple example that
generates an RPM archive for the @code{hello} package:
@example
guix pack --format=rpm --symlink=/usr/bin/hello=bin/hello hello
@end example
See @command{info \"(guix) Invoking guix pack\"} for more information.")
(fr "Vous pouvez désormais produire une archive RPM (avec l'extension
.rpm) avec la commande @command{guix pack --format=rpm} qui propose
donc une nouvelle manière de distribuer les logiciels construits avec
Guix. Voici un exemple permettant de générer une archive RPM pour le
paquet @code{hello} :
@example
guix pack --format=rpm --symlink=/usr/bin/hello=bin/hello hello
@end example
Consultez @command{info \"(guix.fr) Invoquer guix pack\"} pour plus
d'informations.")))
(entry (commit "137b91f03bbb7f1df71cf10c4f79ae57fbcea400") (entry (commit "137b91f03bbb7f1df71cf10c4f79ae57fbcea400")
(title (title
(en "New @option{--with-version} package transformation option") (en "New @option{--with-version} package transformation option")

View File

@ -82,7 +82,7 @@ TARGET."
;; Packages that must be cross-buildable from x86_64-linux. ;; Packages that must be cross-buildable from x86_64-linux.
;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463> ;; FIXME: Add (@ (gnu packages gcc) gcc) when <https://bugs.gnu.org/40463>
;; is fixed. ;; is fixed.
(append (list (@ (gnu packages guile) guile-3.0/fixed)) (append (list (@ (gnu packages guile) guile-3.0/pinned))
(map specification->package (map specification->package
'("coreutils" "grep" "sed" "findutils" "diffutils" "patch" '("coreutils" "grep" "sed" "findutils" "diffutils" "patch"
"gawk" "gettext" "gzip" "xz" "gawk" "gettext" "gzip" "xz"

View File

@ -0,0 +1,9 @@
# -*- mode: snippet -*-
# name: guix-news-entry
# key: entry...
# --
(entry (commit "$1")
(title
(en "$2"))
(body
(en "$3")))

View File

@ -3,7 +3,7 @@
!# !#
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
@ -142,6 +142,19 @@ and the r-build-system."
"guix/scripts/import/cran.scm" "guix/scripts/import/cran.scm"
"tests/cran.scm"))) "tests/cran.scm")))
(define-team tex
(team 'tex
#:name "TeX team"
#:description
"TeX, LaTeX, XeLaTeX, LuaTeX, TeXLive, the texlive-build-system, and
the \"texlive\" importer."
#:scope (list "gnu/packages/tex.scm"
"guix/build/texlive-build-system.scm"
"guix/build-system/texlive.scm"
"guix/import/texlive.scm"
"guix/scripts/import/texlive.scm"
"tests/texlive.scm")))
(define-team julia (define-team julia
(team 'julia (team 'julia
#:name "Julia team" #:name "Julia team"
@ -490,7 +503,7 @@ importer."
(define-member (person "Ricardo Wurmus" (define-member (person "Ricardo Wurmus"
"rekado@elephly.net") "rekado@elephly.net")
r core mentors) r core mentors tex)
(define-member (person "Christopher Baines" (define-member (person "Christopher Baines"
"mail@cbaines.net") "mail@cbaines.net")

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2017-2019, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017-2019, 2022, 2023 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -404,7 +404,7 @@ load path must be adjusted as needed."
(define (container-excursion pid thunk) (define (container-excursion pid thunk)
"Run THUNK as a child process within the namespaces of process PID and "Run THUNK as a child process within the namespaces of process PID and
return the exit status." return the exit status, an integer as returned by 'waitpid'."
(define (namespace-file pid namespace) (define (namespace-file pid namespace)
(string-append "/proc/" (number->string pid) "/ns/" namespace)) (string-append "/proc/" (number->string pid) "/ns/" namespace))
@ -432,11 +432,20 @@ return the exit status."
'("user" "ipc" "uts" "net" "pid" "mnt")) '("user" "ipc" "uts" "net" "pid" "mnt"))
(purify-environment) (purify-environment)
(chdir "/") (chdir "/")
(thunk))))
;; Per setns(2), changing the PID namespace only applies to child
;; processes, not to the process itself. Thus fork so that THUNK runs
;; in the right PID namespace, which also gives it access to /proc.
(match (primitive-fork)
(0 (call-with-clean-exit thunk))
(pid (primitive-exit
(match (waitpid pid)
((_ . status)
(or (status:exit-val status) 127)))))))))
(pid (pid
(match (waitpid pid) (match (waitpid pid)
((_ . status) ((_ . status)
(status:exit-val status)))))) status)))))
(define (container-excursion* pid thunk) (define (container-excursion* pid thunk)
"Like 'container-excursion', but return the return value of THUNK." "Like 'container-excursion', but return the return value of THUNK."

View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -21,6 +22,7 @@
#:use-module (gnu home services) #:use-module (gnu home services)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (srfi srfi-1)
#:export (home-fontconfig-service-type)) #:export (home-fontconfig-service-type))
@ -33,15 +35,17 @@
;;; ;;;
;;; Code: ;;; Code:
(define (add-fontconfig-config-file he-symlink-path) (define (add-fontconfig-config-file directories)
`(("fontconfig/fonts.conf" `(("fontconfig/fonts.conf"
,(mixed-text-file ,(mixed-text-file
"fonts.conf" "fonts.conf"
"<?xml version='1.0'?> (apply string-append
`("<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<fontconfig> <fontconfig>\n" ,@(map (lambda (directory)
<dir>~/.guix-home/profile/share/fonts</dir> (string-append " <dir>" directory "</dir>\n"))
</fontconfig>")))) directories)
"</fontconfig>\n"))))))
(define (regenerate-font-cache-gexp _) (define (regenerate-font-cache-gexp _)
`(("profile/share/fonts" `(("profile/share/fonts"
@ -59,7 +63,9 @@
(service-extension (service-extension
home-profile-service-type home-profile-service-type
(const (list fontconfig))))) (const (list fontconfig)))))
(default-value #f) (compose concatenate)
(extend append)
(default-value '("~/.guix-home/profile/share/fonts"))
(description (description
"Provides configuration file for fontconfig and make "Provides configuration file for fontconfig and make
fc-* utilities aware of font packages installed in Guix Home's profile."))) fc-* utilities aware of font packages installed in Guix Home's profile.")))

View File

@ -38,10 +38,10 @@
# Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> # Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
# Copyright © 2020 Martin Becze <mjbecze@riseup.net> # Copyright © 2020 Martin Becze <mjbecze@riseup.net>
# Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com> # Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
# Copyright © 2020 Vinicius Monego <monego@posteo.net> # Copyright © 2020, 2023 Vinicius Monego <monego@posteo.net>
# Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> # Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
# Copyright © 2021 Greg Hogan <code@greghogan.com> # Copyright © 2021 Greg Hogan <code@greghogan.com>
# Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com> # Copyright © 2021, 2022, 2023 Philip McGrath <philip@philipmcgrath.com>
# Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> # Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
# Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com> # Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
# Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz> # Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
@ -361,7 +361,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/kde-systemtools.scm \ %D%/packages/kde-systemtools.scm \
%D%/packages/kde-utils.scm \ %D%/packages/kde-utils.scm \
%D%/packages/kerberos.scm \ %D%/packages/kerberos.scm \
%D%/packages/key-mon.scm \
%D%/packages/kodi.scm \ %D%/packages/kodi.scm \
%D%/packages/language.scm \ %D%/packages/language.scm \
%D%/packages/lean.scm \ %D%/packages/lean.scm \
@ -425,6 +424,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/mingw.scm \ %D%/packages/mingw.scm \
%D%/packages/microcom.scm \ %D%/packages/microcom.scm \
%D%/packages/moe.scm \ %D%/packages/moe.scm \
%D%/packages/mold.scm \
%D%/packages/motti.scm \ %D%/packages/motti.scm \
%D%/packages/monitoring.scm \ %D%/packages/monitoring.scm \
%D%/packages/moreutils.scm \ %D%/packages/moreutils.scm \
@ -606,6 +606,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/tmux.scm \ %D%/packages/tmux.scm \
%D%/packages/toolkits.scm \ %D%/packages/toolkits.scm \
%D%/packages/tor.scm \ %D%/packages/tor.scm \
%D%/packages/tree-sitter.scm \
%D%/packages/tv.scm \ %D%/packages/tv.scm \
%D%/packages/uglifyjs.scm \ %D%/packages/uglifyjs.scm \
%D%/packages/uml.scm \ %D%/packages/uml.scm \
@ -916,6 +917,7 @@ dist_patch_DATA = \
%D%/packages/patches/awesome-4.3-fno-common.patch \ %D%/packages/patches/awesome-4.3-fno-common.patch \
%D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \
%D%/packages/patches/azr3.patch \ %D%/packages/patches/azr3.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/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 \
@ -937,7 +939,6 @@ dist_patch_DATA = \
%D%/packages/patches/bsd-games-prevent-name-collisions.patch \ %D%/packages/patches/bsd-games-prevent-name-collisions.patch \
%D%/packages/patches/bsd-games-stdio.h.patch \ %D%/packages/patches/bsd-games-stdio.h.patch \
%D%/packages/patches/beancount-disable-googleapis-fonts.patch \ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \
%D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \
%D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/bidiv-update-fribidi.patch \
%D%/packages/patches/binutils-boot-2.20.1a.patch \ %D%/packages/patches/binutils-boot-2.20.1a.patch \
@ -950,8 +951,6 @@ dist_patch_DATA = \
%D%/packages/patches/breezy-fix-gio.patch \ %D%/packages/patches/breezy-fix-gio.patch \
%D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \
%D%/packages/patches/cabal-install-base16-bytestring1.0.patch \
%D%/packages/patches/cabal-install-ghc8.10.patch \
%D%/packages/patches/cairo-CVE-2018-19876.patch \ %D%/packages/patches/cairo-CVE-2018-19876.patch \
%D%/packages/patches/cairo-CVE-2020-35492.patch \ %D%/packages/patches/cairo-CVE-2020-35492.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \
@ -1024,6 +1023,7 @@ dist_patch_DATA = \
%D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \
%D%/packages/patches/dbxfs-remove-sentry-sdk.patch \ %D%/packages/patches/dbxfs-remove-sentry-sdk.patch \
%D%/packages/patches/ddclient-skip-test.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/dee-vapi.patch \ %D%/packages/patches/dee-vapi.patch \
@ -1047,6 +1047,7 @@ dist_patch_DATA = \
%D%/packages/patches/einstein-build.patch \ %D%/packages/patches/einstein-build.patch \
%D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \
%D%/packages/patches/elixir-path-length.patch \ %D%/packages/patches/elixir-path-length.patch \
%D%/packages/patches/elm-ghc9.2.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/elogind-revert-polkit-detection.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \
@ -1060,6 +1061,7 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
%D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \
%D%/packages/patches/emacs-native-comp-driver-options.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \
%D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \
%D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \
@ -1071,6 +1073,8 @@ dist_patch_DATA = \
%D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enjarify-setup-py.patch \
%D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \
%D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/erlang-man-path.patch \
%D%/packages/patches/esmini-no-clutter-log.patch \
%D%/packages/patches/esmini-use-pkgconfig.patch \
%D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \
%D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/eudev-rules-directory.patch \
%D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/exercism-disable-self-update.patch \
@ -1188,8 +1192,11 @@ dist_patch_DATA = \
%D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/gettext-libunicode-update.patch \ %D%/packages/patches/gettext-libunicode-update.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
%D%/packages/patches/ghc-testsuite-grep-compat.patch \ %D%/packages/patches/ghc-testsuite-grep-compat.patch \
%D%/packages/patches/ghc-bloomfilter-ghc9.2.patch \
%D%/packages/patches/ghc-bytestring-handle-ghc9.patch \
%D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \ %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \
@ -1560,7 +1567,6 @@ dist_patch_DATA = \
%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/ngircd-handle-zombies.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/ngless-unliftio.patch \
%D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/network-manager-plugin-path.patch \
%D%/packages/patches/network-manager-meson.patch \ %D%/packages/patches/network-manager-meson.patch \
%D%/packages/patches/nginx-socket-cloexec.patch \ %D%/packages/patches/nginx-socket-cloexec.patch \
@ -1585,6 +1591,7 @@ dist_patch_DATA = \
%D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \
%D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \
%D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \
%D%/packages/patches/onionshare-cli-async-mode.patch \
%D%/packages/patches/onnx-optimizer-system-library.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \
%D%/packages/patches/onnx-use-system-googletest.patch \ %D%/packages/patches/onnx-use-system-googletest.patch \
%D%/packages/patches/onnx-shared-libraries.patch \ %D%/packages/patches/onnx-shared-libraries.patch \
@ -1592,7 +1599,6 @@ dist_patch_DATA = \
%D%/packages/patches/openboardview-use-system-imgui.patch \ %D%/packages/patches/openboardview-use-system-imgui.patch \
%D%/packages/patches/openboardview-use-system-utf8.patch \ %D%/packages/patches/openboardview-use-system-utf8.patch \
%D%/packages/patches/openbox-python3.patch \ %D%/packages/patches/openbox-python3.patch \
%D%/packages/patches/opencascade-oce-glibc-2.26.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjdk-9-hotspot-pointer-comparison.patch \ %D%/packages/patches/openjdk-9-hotspot-pointer-comparison.patch \
%D%/packages/patches/openjdk-9-hotspot-stack-size.patch \ %D%/packages/patches/openjdk-9-hotspot-stack-size.patch \
@ -1608,6 +1614,7 @@ dist_patch_DATA = \
%D%/packages/patches/opensles-add-license-file.patch \ %D%/packages/patches/opensles-add-license-file.patch \
%D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \
%D%/packages/patches/openssl-3.0-c-rehash-in.patch \ %D%/packages/patches/openssl-3.0-c-rehash-in.patch \
%D%/packages/patches/opentaxsolver-file-browser-fix.patch \
%D%/packages/patches/open-zwave-hidapi.patch \ %D%/packages/patches/open-zwave-hidapi.patch \
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \
%D%/packages/patches/osip-CVE-2017-7853.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \
@ -1619,6 +1626,8 @@ dist_patch_DATA = \
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/password-store-tree-compat.patch \ %D%/packages/patches/password-store-tree-compat.patch \
%D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \
%D%/packages/patches/php-fix-streams-copy-length.patch \
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
%D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \
%D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/pokerth-boost.patch \
@ -1660,8 +1669,6 @@ dist_patch_DATA = \
%D%/packages/patches/perl-www-curl-fix-struct-void.patch \ %D%/packages/patches/perl-www-curl-fix-struct-void.patch \
%D%/packages/patches/perl-www-curl-remove-symbol.patch \ %D%/packages/patches/perl-www-curl-remove-symbol.patch \
%D%/packages/patches/phoronix-test-suite-fsdg.patch \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \
%D%/packages/patches/php-bug-74093-test.patch \
%D%/packages/patches/php-curl-compat.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 \
@ -1758,7 +1765,6 @@ dist_patch_DATA = \
%D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \
%D%/packages/patches/qemu-fix-agent-paths.patch \ %D%/packages/patches/qemu-fix-agent-paths.patch \
%D%/packages/patches/qpdfview-qt515-compat.patch \
%D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \
%D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \
%D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \
@ -1769,11 +1775,6 @@ dist_patch_DATA = \
%D%/packages/patches/qtwayland-gcc-11.patch \ %D%/packages/patches/qtwayland-gcc-11.patch \
%D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \ %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \
%D%/packages/patches/qtwayland-cleanup-callbacks.patch \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \
%D%/packages/patches/qtwebkit-pbutils-include.patch \
%D%/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch \
%D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch \
%D%/packages/patches/qtwebkit-fix-building-with-icu-68.patch \
%D%/packages/patches/qtwebkit-fix-building-with-glib-2.68.patch \
%D%/packages/patches/ragel-char-signedness.patch \ %D%/packages/patches/ragel-char-signedness.patch \
%D%/packages/patches/randomjungle-disable-static-build.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \
%D%/packages/patches/range-v3-build-with-gcc10.patch \ %D%/packages/patches/range-v3-build-with-gcc10.patch \
@ -1791,7 +1792,6 @@ dist_patch_DATA = \
%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/rtags-separate-rct.patch \ %D%/packages/patches/rtags-separate-rct.patch \
%D%/packages/patches/racket-backport-8.7-pkg-strip.patch \
%D%/packages/patches/racket-chez-scheme-bin-sh.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \
%D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \
%D%/packages/patches/racket-zuo-bin-sh.patch \ %D%/packages/patches/racket-zuo-bin-sh.patch \
@ -1833,6 +1833,7 @@ dist_patch_DATA = \
%D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scons-test-environment.patch \ %D%/packages/patches/scons-test-environment.patch \
%D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/screen-hurd-path-max.patch \
%D%/packages/patches/scsh-nonstring-search-path.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \
%D%/packages/patches/seed-webkit.patch \ %D%/packages/patches/seed-webkit.patch \
%D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch \ %D%/packages/patches/sendgmail-accept-ignored-gsuite-flag.patch \
@ -1858,7 +1859,6 @@ dist_patch_DATA = \
%D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \ %D%/packages/patches/spectre-meltdown-checker-externalize-fwdb.patch \
%D%/packages/patches/spectre-meltdown-checker-find-kernel.patch \ %D%/packages/patches/spectre-meltdown-checker-find-kernel.patch \
%D%/packages/patches/sphinxbase-fix-doxygen.patch \ %D%/packages/patches/sphinxbase-fix-doxygen.patch \
%D%/packages/patches/spice-vdagent-glib-2.68.patch \
%D%/packages/patches/sssd-system-directories.patch \ %D%/packages/patches/sssd-system-directories.patch \
%D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/steghide-fixes.patch \
%D%/packages/patches/suitesparse-mongoose-cmake.patch \ %D%/packages/patches/suitesparse-mongoose-cmake.patch \
@ -1975,7 +1975,6 @@ dist_patch_DATA = \
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
%D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \
%D%/packages/patches/virglrenderer-CVE-2017-6386.patch \
%D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \
%D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
@ -2002,16 +2001,12 @@ dist_patch_DATA = \
%D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\ %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \ %D%/packages/patches/xf86-video-nouveau-fixup-ABI.patch \
%D%/packages/patches/xf86-video-qxl-fix-build.patch \
%D%/packages/patches/xf86-video-savage-xorg-compat.patch \ %D%/packages/patches/xf86-video-savage-xorg-compat.patch \
%D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \ %D%/packages/patches/xf86-video-siliconmotion-fix-ftbfs.patch \
%D%/packages/patches/xf86-video-tga-remove-mibstore.patch \
%D%/packages/patches/xf86-video-voodoo-pcitag.patch \
%D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \
%D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \
%D%/packages/patches/xgboost-use-system-dmlc-core.patch \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \
%D%/packages/patches/xmonad-dynamic-linking.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \
%D%/packages/patches/xmonad-next-dynamic-linking.patch \
%D%/packages/patches/xnnpack-system-libraries.patch \ %D%/packages/patches/xnnpack-system-libraries.patch \
%D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \
%D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \

View File

@ -25,7 +25,6 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)

View File

@ -23,6 +23,7 @@
(define-module (gnu packages accessibility) (define-module (gnu packages accessibility)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -229,7 +230,7 @@ incorporated.")
libnotify)) libnotify))
(native-inputs (native-inputs
(list gettext-minimal intltool pkg-config)) (list gettext-minimal intltool pkg-config))
(home-page "http://florence.sourceforge.net/") (home-page "https://florence.sourceforge.net/")
(synopsis "Extensible, scalable virtual keyboard for X11") (synopsis "Extensible, scalable virtual keyboard for X11")
(description (description
"Florence is an extensible scalable virtual keyboard for X11. "Florence is an extensible scalable virtual keyboard for X11.
@ -245,11 +246,11 @@ available to help to click.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public footswitch (define-public footswitch
(let ((commit "ca43d53fc2002520cc825d119702afc124303e73") (let ((commit "e455d6752221b9e9c3818cc304c873b9c2792490")
(revision "2")) (revision "0"))
(package (package
(name "footswitch") (name "footswitch")
(version (git-version "0.1" revision commit)) (version (git-version "1.0" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -258,32 +259,32 @@ available to help to click.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"14pyzc4ws1mj859xs9n4x83wzxxvd3bh5bdxzr6nv267xwx1mq68")))) "0xkk60sg3szpgbl3z8djlpagglsldv9viqibsih6wcnbhikzlc6j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
(list
#:tests? #f ; no tests
#:make-flags #~(list (string-append "CC=" #$(cc-for-target)))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
;; Install target in the Makefile does not work for Guix.
(replace 'install
(lambda _
(let ((bin (string-append #$output "/bin")))
(install-file "footswitch" bin)
(install-file "scythe" bin)))))))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list hidapi)) (list hidapi))
(arguments
`(#:tests? #f ; no tests
#:make-flags (list (string-append "CC=" ,(cc-for-target)))
#:phases (modify-phases %standard-phases
(delete 'configure)
;; Install target in the Makefile does not work for Guix
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out")
"/bin")))
(install-file "footswitch" bin)
(install-file "scythe" bin)
#t))))))
(home-page "https://github.com/rgerganov/footswitch") (home-page "https://github.com/rgerganov/footswitch")
(synopsis "Command line utility for PCsensor foot switch") (synopsis "Command line utilities for PCsensor and Scythe foot switches")
(description (description
"Command line utility for programming foot switches sold by PCsensor. "This package provides command line utilities for programming PCsensor
It works for both single pedal devices and three pedal devices. All supported and Scythe foot switches. It works for both single pedal and three pedal
devices have vendorId:productId = 0c45:7403 or 0c45:7404.") devices.")
(license license:expat)))) (license license:expat))))
(define-public xmagnify (define-public xmagnify
(package (package

View File

@ -21,16 +21,10 @@
(define-module (gnu packages ada) (define-module (gnu packages ada)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (ice-9 match)) #:use-module (ice-9 match))
(define-public ada/ed (define-public ada/ed

View File

@ -53,8 +53,10 @@
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Andreas Rammhold <andreas@rammhold.de> ;;; Copyright © 2022 Andreas Rammhold <andreas@rammhold.de>
;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2022, 2023 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2022 jgart <jgart@dismail.de> ;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Juliana Sims <jtsims@protonmail.com>
;;; Copyright © 2023 Lu Hui <luhux76@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -767,7 +769,7 @@ on memory usage on GNU/Linux systems.")
(define-public htop (define-public htop
(package (package
(name "htop") (name "htop")
(version "3.2.1") (version "3.2.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -775,7 +777,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 "0yfmkw3y4qyd42svhpiijif7krvmnb8z88y6h9g4fwf7sfynq2rk")) (base32 "0cyaprgnhfrc7rqq053903bjylaplvxkb65b04bsxmiva09lvf9s"))
(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
@ -1151,7 +1153,7 @@ ONC RPC numbers.")
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
(list (string-append "--mandir=" out "/share/man") (list (string-append "--mandir=" out "/share/man")
(string-append "--infodir=" out "/share/info"))))) (string-append "--infodir=" out "/share/info")))))
(home-page "http://netcat.sourceforge.net") (home-page "https://netcat.sourceforge.net")
(synopsis "Read and write data over TCP/IP") (synopsis "Read and write data over TCP/IP")
(description (description
"Netcat is a featured networking utility which reads and writes data "Netcat is a featured networking utility which reads and writes data
@ -1268,7 +1270,7 @@ IPv6, proxies, and Unix sockets.")
"1gpvd2kjyhs18sh6sga5bk9wj8s78blfd4c0m38r0wl92jx2yv1b")))))) "1gpvd2kjyhs18sh6sga5bk9wj8s78blfd4c0m38r0wl92jx2yv1b"))))))
(inputs (inputs
(list ncurses)) (list ncurses))
(home-page "http://nmon.sourceforge.net/") (home-page "https://nmon.sourceforge.net/")
(synopsis (synopsis
"Monitor system performance in a terminal or to a @file{.csv} log file") "Monitor system performance in a terminal or to a @file{.csv} log file")
(description (description
@ -1958,7 +1960,7 @@ system administrator.")
(define-public sudo (define-public sudo
(package (package
(name "sudo") (name "sudo")
(version "1.9.12p2") (version "1.9.13p2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1968,7 +1970,7 @@ system administrator.")
version ".tar.gz"))) version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0fc55axh2hfd8hn66dpmyrrgb0gf0nz71zpaygkrpp8x1ypb385r")) "0kapjhgyzaqk2nfzzz04ss9x6cy61s79afd3vhgkn0y1wkyh886z"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -2211,6 +2213,10 @@ command.")
(name "wpa-supplicant") (name "wpa-supplicant")
(inputs (modify-inputs (package-inputs wpa-supplicant-minimal) (inputs (modify-inputs (package-inputs wpa-supplicant-minimal)
(prepend dbus))) (prepend dbus)))
(source (origin
(inherit (package-source wpa-supplicant-minimal))
(patches (search-patches
"wpa-supplicant-dbus-group-policy.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal)
((#:phases phases) ((#:phases phases)
@ -2756,7 +2762,7 @@ degradation and failure.")
(define-public fdupes (define-public fdupes
(package (package
(name "fdupes") (name "fdupes")
(version "2.1.2") (version "2.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -2764,7 +2770,7 @@ degradation and failure.")
"releases/download/v" version "/" "releases/download/v" version "/"
"fdupes-" version ".tar.gz")) "fdupes-" version ".tar.gz"))
(sha256 (sha256
(base32 "1g9p50xhi2sp0hqxml4w2k0kq9jv988q2yxm347z5349dlxvap6d")))) (base32 "13b9qph8nmxwns9n28im3f7bdzhpjas51vckm9b7h5ghlffbfsw4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list ncurses pcre2)) (list ncurses pcre2))
@ -3297,14 +3303,14 @@ rules is done with the @code{auditctl} utility.")
(define-public nmap (define-public nmap
(package (package
(name "nmap") (name "nmap")
(version "7.92") (version "7.93")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://nmap.org/dist/nmap-" version (uri (string-append "https://nmap.org/dist/nmap-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"18bifn67kz2wxkbnfwcrin2xrhc6qf4p2bvxfqb2a2vbi8pryix5")) "0lb6s4nmmicfnc221mzgx2w51dcd4b2dhx22pabcqnp2jd3zxg2m"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -3317,18 +3323,7 @@ rules is done with the @code{auditctl} utility.")
;; Remove pre-compiled binares. ;; Remove pre-compiled binares.
"mswin32")))))) "mswin32"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (outputs '("out" "ndiff")) ; TODO Add zenmap output
`(("openssl" ,openssl)
("libpcap" ,libpcap)
("pcre" ,pcre)
("lua" ,lua)
("zlib" ,zlib) ;for NSE compression support
;; For 'ndiff'.
("python" ,python-2)))
;; TODO Add zenmap output.
(outputs '("out" "ndiff"))
(arguments (arguments
`(#:configure-flags '("--without-zenmap") `(#:configure-flags '("--without-zenmap")
#:phases #:phases
@ -3371,6 +3366,13 @@ rules is done with the @code{auditctl} utility.")
"check-dns"))))) "check-dns")))))
;; Nmap can't cope with out-of-source building. ;; Nmap can't cope with out-of-source building.
#:out-of-source? #f)) #:out-of-source? #f))
(inputs
(list libpcap
lua
openssl-3.0
pcre
zlib ; for NSE compression
python-2)) ; for ndiff
(home-page "https://nmap.org/") (home-page "https://nmap.org/")
(synopsis "Network discovery and security auditing tool") (synopsis "Network discovery and security auditing tool")
(description (description
@ -3379,7 +3381,7 @@ tool. It is also useful for tasks such as network inventory, managing service
upgrade schedules, and monitoring host or service uptime. It also provides an upgrade schedules, and monitoring host or service uptime. It also provides an
advanced netcat implementation (ncat), a utility for comparing scan advanced netcat implementation (ncat), a utility for comparing scan
results (ndiff), and a packet generation and response analysis tool (nping).") results (ndiff), and a packet generation and response analysis tool (nping).")
;; See <https://github.com/nmap/nmap/issues/2199#issuecomment-894812634>. ;; See <https://github.com/nmap/nmap/issues/2199#issuecomment-1380592744>.
;; This package uses nmap's bundled versions of libdnet and liblinear, which ;; This package uses nmap's bundled versions of libdnet and liblinear, which
;; both use a 3-clause BSD license. ;; both use a 3-clause BSD license.
(license (list license:nmap license:bsd-3)))) (license (list license:nmap license:bsd-3))))
@ -3729,7 +3731,7 @@ in order to be able to find it.
(define-public xfel (define-public xfel
(package (package
(name "xfel") (name "xfel")
(version "1.2.4") (version "1.2.9")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3737,7 +3739,7 @@ in order to be able to find it.
(url "https://github.com/xboot/xfel.git") (url "https://github.com/xboot/xfel.git")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 "0r4j63vh6279fj1yh71h08d1av3nc0majlad5yh6admsxiig101m")) (base32 "0gs37w5zjfmyadm49hdalq6vr6gidc683agz3shncgj93x2hxx02"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -3755,12 +3757,14 @@ in order to be able to find it.
(("/usr/local") out) (("/usr/local") out)
(("/usr") out) (("/usr") out)
(("/etc/udev/rules.d") (("/etc/udev/rules.d")
(string-append out "/lib/udev/rules.d")))))) (string-append out "/lib/udev/rules.d"))
(("udevadm control --reload") ; next version will remove this
"")))))
(delete 'configure)))) (delete 'configure))))
(home-page "https://github.com/xboot/xfel") (home-page "https://github.com/xboot/xfel")
(synopsis "Remote debugging tool for Allwinner D1 computers") (synopsis "Remote debugging tool for Allwinner devices")
(description "This package contains a debugging tool for Allwinner D1 (description "This package contains a debugging tool for Allwinner devices
devices (connects via USB OTG).") (connects via USB OTG).")
(license license:expat))) (license license:expat)))
(define-public sedsed (define-public sedsed
@ -3828,17 +3832,16 @@ buffers.")
(define-public igt-gpu-tools (define-public igt-gpu-tools
(package (package
(name "igt-gpu-tools") (name "igt-gpu-tools")
;; You should very likely remove the 'fix-meson.build phase when upgrading. (version "1.27.1")
(version "1.26")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.freedesktop.org/drm/igt-gpu-tools.git") (url "https://gitlab.freedesktop.org/drm/igt-gpu-tools.git")
(commit (string-append "igt-gpu-tools-" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0m124pqv7zna25jnvk566c4kk628jr0w8mgnp8mr5xqz9cprgczm")))) (base32 "0d6jsj77qddccv0vfmqmbw3k2prvxzvmgc8zdi83gdi3wpp5i7zd"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:tests? #f ; many of the tests try to load kernel modules `(#:tests? #f ; many of the tests try to load kernel modules
@ -3847,13 +3850,7 @@ buffers.")
(add-after 'unpack 'find-rst2man.py (add-after 'unpack 'find-rst2man.py
(lambda _ (lambda _
(substitute* "man/meson.build" (substitute* "man/meson.build"
(("'rst2man'") "'rst2man.py'")))) (("'rst2man'") "'rst2man.py'")))))))
(add-after 'unpack 'fix-meson.build
;; Fix ERROR: Function does not take positional arguments.
(lambda _
(substitute* "lib/meson.build"
(("f\\.underscorify\\(f\\)")
"f.underscorify()")))))))
(inputs (inputs
(list cairo (list cairo
elfutils ; libdw elfutils ; libdw
@ -3911,19 +3908,19 @@ you are running, what theme or icon set you are using, etc.")
(define-public hyfetch (define-public hyfetch
(package (package
(name "hyfetch") (name "hyfetch")
(version "1.4.4") (version "1.4.7")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (pypi-uri "HyFetch" version)) (uri (git-reference
(sha256 (url "https://github.com/hykilpikonna/hyfetch")
(base32 "1k3pcl16y2czkk7wd79yk0w1kqpi4fp8h8szhjs5ywwy20nqmms8")))) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"1w0wzai73rr7iliii77f15ck5ki03xcvrhgzbp72nn7xcpix9wqd"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (list python-hypy-utils python-typing-extensions)) (inputs (list python-typing-extensions))
(arguments `(#:phases (modify-phases %standard-phases
(add-before 'build 'set-HOME
(lambda _ ;; Tries to set files in .config
(setenv "HOME" "/tmp"))))))
(home-page "https://github.com/hykilpikonna/HyFetch") (home-page "https://github.com/hykilpikonna/HyFetch")
(synopsis "@code{neofetch} with pride flags <3") (synopsis "@code{neofetch} with pride flags <3")
(description "HyFetch is a command-line system information tool fork of (description "HyFetch is a command-line system information tool fork of
@ -3934,6 +3931,48 @@ be used in screenshots to show other users what operating system or distribution
you are running, what theme or icon set you are using, etc.") you are running, what theme or icon set you are using, etc.")
(license license:expat))) (license license:expat)))
(define-public uwufetch
(package
(name "uwufetch")
(version "2.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/TheDarkBug/uwufetch")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0s4pzaqmlq6rn54kgmlpcrc0sy3q5zn6lxh4448k9iimshljsjfs"))))
(build-system gnu-build-system)
(arguments
(list
#:tests? #f ;no tests
#:make-flags
#~(list (string-append "DESTDIR=" #$output)
(string-append "ETC_DIR=" #$output "/etc")
(string-append "CC=" #$(cc-for-target)))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'path-source-paths
(lambda _
(substitute* "uwufetch.c"
(("(/usr(/local)?)(.*;)" all _ _ rest)
(string-append #$output rest))))))))
(inputs (list lshw
;; viu XXX not yet packaged in Guix
xwininfo))
(home-page "https://github.com/TheDarkBug/uwufetch")
(synopsis "Meme system info tool based on Nyan/UwU trend")
(description
"UwUFetch is a system information tool in the lineage of NeoFetch,
PFetch, HyFetch, and the like. It prints ASCII art of your system's logo as
well as a summary of system information. UwUFetch's unique contribution is the
uwu-ification of various words used in the description. For example, Guix
becomes gUwUix.")
(license license:gpl3+)))
(define-public screenfetch (define-public screenfetch
(package (package
(name "screenfetch") (name "screenfetch")
@ -4301,7 +4340,7 @@ Python loading in HPC environments.")
(let ((real-name "inxi")) (let ((real-name "inxi"))
(package (package
(name "inxi-minimal") (name "inxi-minimal")
(version "3.3.24-1") (version "3.3.25-1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -4310,7 +4349,7 @@ Python loading in HPC environments.")
(commit version))) (commit version)))
(file-name (git-file-name real-name version)) (file-name (git-file-name real-name version))
(sha256 (sha256
(base32 "1nai43251r791qvc1c4hhvcaa6hq7zcjlww7k3ip7br6zgxqjaxm")))) (base32 "0mak2f06xzalccgaij9fsi20600sg05v0pmg0blvy6hvq5kh97k3"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs (inputs
(list bash-minimal (list bash-minimal
@ -5189,7 +5228,7 @@ it won't take longer to install 15 machines than it would to install just 2.")
(define-public greetd (define-public greetd
(package (package
(name "greetd") (name "greetd")
(version "0.8.0") (version "0.9.0")
(home-page "https://git.sr.ht/~kennylevinsen/greetd") (home-page "https://git.sr.ht/~kennylevinsen/greetd")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -5198,11 +5237,11 @@ it won't take longer to install 15 machines than it would to install just 2.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0x5c3jkw09kvj2grcxm899y2n6ws8p990cyp9cs0fy6lm4fzlh6v")))) (base32 "1b79lb0vikh5vwpdlyga6zwzm11gpsd7ghp8zb0q2m6mlqlj5by3"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
(("rust-nix" ,rust-nix-0.19) (("rust-nix" ,rust-nix-0.26)
("rust-pam-sys" ,rust-pam-sys-0.5) ("rust-pam-sys" ,rust-pam-sys-0.5)
("rust-rpassword" ,rust-rpassword-5) ("rust-rpassword" ,rust-rpassword-5)
("rust-users" ,rust-users-0.11) ("rust-users" ,rust-users-0.11)
@ -5249,8 +5288,7 @@ it won't take longer to install 15 machines than it would to install just 2.")
(install-file "greetd-ipc.7" man7) (install-file "greetd-ipc.7" man7)
(install-file "agreety.1" man1)))))))) (install-file "agreety.1" man1))))))))
(native-inputs (native-inputs
`(("linux-pam" ,linux-pam) (list linux-pam scdoc))
("scdoc" ,scdoc)))
(synopsis "Minimal and flexible login manager daemon") (synopsis "Minimal and flexible login manager daemon")
(description (description
"greetd is a minimal and flexible login manager daemon "greetd is a minimal and flexible login manager daemon
@ -5665,7 +5703,7 @@ file or files to several hosts.")
(define-public doctl (define-public doctl
(package (package
(name "doctl") (name "doctl")
(version "1.92.0") (version "1.92.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -5674,7 +5712,7 @@ file or files to several hosts.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0n8xajr9s0y7a43is24q0f9nznmr2sjhlhgg9fpyx4s4nr3s5yqw")))) "1zb7vx7nqg8q9vdgb90cwmrr1cijv8gfryni8yrd99bb9vgg6pyv"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:import-path "github.com/digitalocean/doctl/cmd/doctl" (list #:import-path "github.com/digitalocean/doctl/cmd/doctl"

View File

@ -28,7 +28,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 haskell) #:use-module (guix build-system haskell)
#:use-module (guix build-system trivial)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -42,12 +41,11 @@
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (hackage-uri "Agda" version))
"https://hackage.haskell.org/package/Agda/Agda-"
version ".tar.gz"))
(sha256 (sha256
(base32 "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5")))) (base32 "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(properties '((upstream-name . "Agda")))
(inputs (inputs
(list ghc-aeson (list ghc-aeson
ghc-alex ghc-alex

View File

@ -103,7 +103,7 @@ implement the floating point approach to complex multiplication are
implemented. On the other hand, these comprise asymptotically fast implemented. On the other hand, these comprise asymptotically fast
multiplication routines such as ToomCook and the FFT.") multiplication routines such as ToomCook and the FFT.")
(license license:lgpl3+) (license license:lgpl3+)
(home-page "http://www.multiprecision.org/mpfrcx/"))) (home-page "https://www.multiprecision.org/mpfrcx/")))
(define-public gf2x (define-public gf2x
(package (package
@ -131,7 +131,7 @@ greatest common divisor operations.")
(define-public cm (define-public cm
(package (package
(name "cm") (name "cm")
(version "0.4.0") (version "0.4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -139,7 +139,7 @@ greatest common divisor operations.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04l3inafql40n0r5rq8rmp21zplgdrzblil2kgkpx5s0jbs9i8rr")))) "1avaw6a7lyc2833gr9b7zpk4blvrrrkz8r62sv1grh9xc9i4zg07"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
(list mpfrcx zlib)) ; Header files included from cm_common.h. (list mpfrcx zlib)) ; Header files included from cm_common.h.
@ -153,7 +153,7 @@ multiplication via floating point approximations. It consists of libraries
that can be called from within a C program and of executable command that can be called from within a C program and of executable command
line applications.") line applications.")
(license license:gpl3+) (license license:gpl3+)
(home-page "http://www.multiprecision.org/cm/"))) (home-page "https://www.multiprecision.org/cm/")))
(define-public fplll (define-public fplll
(package (package
@ -464,7 +464,7 @@ GCDs, factoring, solving linear systems, and evaluating special
functions. In addition, FLINT provides various low-level routines for functions. In addition, FLINT provides various low-level routines for
fast arithmetic.") fast arithmetic.")
(license license:lgpl2.1+) (license license:lgpl2.1+)
(home-page "http://flintlib.org/") (home-page "https://flintlib.org/")
(properties (properties
'((release-monitoring-url . "http://flintlib.org/downloads.html"))))) '((release-monitoring-url . "http://flintlib.org/downloads.html")))))
@ -768,7 +768,7 @@ a C program.")
;; different machine. ;; different machine.
"ax_cv_c_flags__mtune_native=no"))) "ax_cv_c_flags__mtune_native=no")))
(native-inputs (list perl)) (native-inputs (list perl))
(home-page "http://fftw.org") (home-page "https://fftw.org")
(synopsis "Computing the discrete Fourier transform") (synopsis "Computing the discrete Fourier transform")
(description (description
"FFTW is a C subroutine library for computing the discrete Fourier "FFTW is a C subroutine library for computing the discrete Fourier
@ -1776,7 +1776,7 @@ no more than about 20 bits long).")
"0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn")))) "0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"))))
(properties `((upstream-name . "dtt"))) (properties `((upstream-name . "dtt")))
(build-system r-build-system) (build-system r-build-system)
(home-page "http://www.r-project.org") (home-page "https://www.r-project.org")
(synopsis "Discrete Trigonometric Transforms") (synopsis "Discrete Trigonometric Transforms")
(description (description
"This package provides functions for 1D and 2D Discrete Cosine Transform "This package provides functions for 1D and 2D Discrete Cosine Transform

View File

@ -45,14 +45,14 @@
(define-public clamav (define-public clamav
(package (package
(name "clamav") (name "clamav")
(version "0.103.7") (version "0.103.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.clamav.net/downloads/production/" (uri (string-append "https://www.clamav.net/downloads/production/"
"clamav-" version ".tar.gz")) "clamav-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0l3yn4dl4zgpq2qmj29kkd0fksyy1icr0rpp3fyvbcqcc0gw6d0y")) "0gwcikzfdswrdh5vhh3x4lx8w92476fmb7im7phnv4r7x5pdljbg"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin

View File

@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com> ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -26,6 +27,8 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
@ -76,3 +79,44 @@
"GNU APL is a free interpreter for the programming language APL. It is "GNU APL is a free interpreter for the programming language APL. It is
an implementation of the ISO standard 13751.") an implementation of the ISO standard 13751.")
(license license:gpl3+)))) (license license:gpl3+))))
(define-public font-apl2741-unicode
(let ((commit "1e11efae38e5095bfe49a786b111d563e83dad03"))
(package
(name "font-apl2741-unicode")
(version "1668049300")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/abrudz/APL2741.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0i1yk1x99lr2swlbq9r7dny5w70zwiwi8lpfcw4n7k7pfbw0xh7y"))))
(build-system trivial-build-system)
(native-inputs (list fontforge))
(arguments
`(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
(let* ((source (assoc-ref %build-inputs "source"))
(out (assoc-ref %outputs "out"))
(dest (string-append out "/share/fonts/truetype"))
(fontforge (string-append
(assoc-ref %build-inputs "fontforge")
"/bin/fontforge")))
(mkdir-p dest)
(invoke fontforge "-lang=ff" "-c" "Open($1); Generate($2)"
(string-append source "/APL2741.sfd")
(string-append dest "/APL2741.ttf"))))))
(synopsis "APL2741 Unicode font")
(home-page "https://abrudz.github.io/APL2741/")
(description "APL font based on Adrian Smith's IBM Selectric APL2741
golf-ball font. It supports most special characters used by popular APL
implementations, some additional mathematical and typographical symbols,
single line drawing characters, as well as the full Unicode APL range,
including both uppercase and lowercase underscored alphabets, as-of-yet unused
symbols, and almost all Latin-1 accented letters.")
(license license:unlicense))))

View File

@ -49,7 +49,7 @@
'(#:parallel-build? #f '(#:parallel-build? #f
#:parallel-tests? #f)) #:parallel-tests? #f))
(inputs (list perl libltdl)) (inputs (list perl libltdl))
(home-page "http://apr.apache.org/") (home-page "https://apr.apache.org/")
(synopsis "The Apache Portable Runtime Library") (synopsis "The Apache Portable Runtime Library")
(description (description
"The mission of the Apache Portable Runtime (APR) project is to create and "The mission of the Apache Portable Runtime (APR) project is to create and
@ -96,7 +96,7 @@ around or take advantage of platform-specific deficiencies or features.")
;; to run it. See ;; to run it. See
;; <http://lists.gnu.org/archive/html/guix-devel/2014-03/msg00261.html>. ;; <http://lists.gnu.org/archive/html/guix-devel/2014-03/msg00261.html>.
#:parallel-tests? #f)) #:parallel-tests? #f))
(home-page "http://apr.apache.org/") (home-page "https://apr.apache.org/")
(synopsis "One of the Apache Portable Runtime Library companions") (synopsis "One of the Apache Portable Runtime Library companions")
(description (description
"APR-util provides a number of helpful abstractions on top of APR.") "APR-util provides a number of helpful abstractions on top of APR.")

View File

@ -13,6 +13,8 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Noah Landis <noahlandis@posteo.net> ;;; Copyright © 2020 Noah Landis <noahlandis@posteo.net>
;;; Copyright © 2021 Sergiu Ivanov <sivanov@colimite.fr> ;;; Copyright © 2021 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -74,7 +76,7 @@
(string-append "\"filter-path" middle (string-append "\"filter-path" middle
"\"" libdir "\""))) "\"" libdir "\"")))
#t)))))) #t))))))
(inputs (list perl)) (native-inputs (list perl))
(native-search-paths (native-search-paths
;; This is a Guix-specific environment variable that takes a single ;; This is a Guix-specific environment variable that takes a single
@ -161,6 +163,14 @@ dictionaries, including personal ones.")
(base32 (base32
"1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"))) "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm")))
(define-public aspell-dict-bg
(aspell-dictionary "bg" "Bulgarian"
#:version "4.1-0"
#:prefix "aspell6-"
#:sha256
(base32
"1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl")))
(define-public aspell-dict-bn (define-public aspell-dict-bn
(aspell-dictionary "bn" "Bengali" (aspell-dictionary "bn" "Bengali"
#:version "0.01.1-1" #:version "0.01.1-1"
@ -291,7 +301,7 @@ dictionaries, including personal ones.")
"aspell6-it-" version ".tar.bz2")) "aspell6-it-" version ".tar.bz2"))
(hash (content-hash sha256)))) (hash (content-hash sha256))))
(home-page (home-page
"http://linguistico.sourceforge.net/pages/dizionario_italiano.html")))) "https://linguistico.sourceforge.net/pages/dizionario_italiano.html"))))
(define-public aspell-dict-mi (define-public aspell-dict-mi
(aspell-dictionary "mi" "Maori" (aspell-dictionary "mi" "Maori"

View File

@ -133,14 +133,14 @@ debugging information in STABS, DWARF 2, and CodeView 8 formats.")
(define-public lightning (define-public lightning
(package (package
(name "lightning") (name "lightning")
(version "2.2.0") (version "2.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/lightning/lightning-" (uri (string-append "mirror://gnu/lightning/lightning-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"03kwvn00qggys203vpzb2kq2asy0ql7x84ajk05a62yg3kzq8faf")))) "1aiwx9cl9c7swqcgrsjnvd5laah3iwxzl1van3670iv8sn0icrwq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list zlib)) (native-inputs (list zlib))
(arguments (arguments

View File

@ -37,6 +37,7 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
@ -44,6 +45,8 @@
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gps)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages image-processing) #:use-module (gnu packages image-processing)
@ -51,6 +54,7 @@
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#: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 perl) #:use-module (gnu packages perl)
@ -70,6 +74,7 @@
#:use-module (gnu packages sphinx) #:use-module (gnu packages sphinx)
#:use-module (gnu packages textutils) #:use-module (gnu packages textutils)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages video) #:use-module (gnu packages video)
#:use-module (gnu packages wxwidgets) #:use-module (gnu packages wxwidgets)
@ -346,7 +351,7 @@ wide set of telescopes.")
python python
python-numpy python-numpy
wcslib)) wcslib))
(home-page "http://casacore.github.io/casacore/") (home-page "https://casacore.github.io/casacore/")
(synopsis "Suite of C++ libraries for radio astronomy data processing") (synopsis "Suite of C++ libraries for radio astronomy data processing")
(description (description
"The casacore package contains the core libraries of the old "The casacore package contains the core libraries of the old
@ -650,7 +655,7 @@ programs for the manipulation and analysis of astronomical data.")
(inputs (inputs
`(("openblas" ,openblas) `(("openblas" ,openblas)
("fftw" ,fftwf))) ("fftw" ,fftwf)))
(home-page "http://www.astromatic.net/software/sextractor") (home-page "https://www.astromatic.net/software/sextractor")
(synopsis "Extract catalogs of sources from astronomical images") (synopsis "Extract catalogs of sources from astronomical images")
(description (description
"SExtractor is a program that builds a catalogue of objects from an "SExtractor is a program that builds a catalogue of objects from an
@ -835,45 +840,66 @@ deconvolution). Such post-processing is not performed by Stackistry.")
(define-public stellarium (define-public stellarium
(package (package
(name "stellarium") (name "stellarium")
(version "0.21.1") (version "1.2")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (string-append "https://github.com/Stellarium/stellarium" (uri (git-reference
"/releases/download/v" version (url "https://github.com/Stellarium/stellarium")
"/stellarium-" version ".tar.gz")) (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "049jlc8vx06pad5h2syrmf7f1l346yr5iraai0wkn8s8pk30j8q7")))) (base32 "1655lz848k7m4vqs7n3vxjwn5n4pkykwl6x7nbanqcqzlixm5xnk"))))
(build-system cmake-build-system) (build-system cmake-build-system)
;; TODO: Complete documentation build and split into dedicated outputs.
(arguments
(list
;; FIXME: Tests keep failing on 100% when preparing test-suit for INDI.
#:tests? #f
#:test-target "test"
#:configure-flags
#~(list "-DENABLE_GPS=1"
;; TODO: Enable when all of the dependencies are availalbe for Qt6.
"-DENABLE_QT6=0"
;; TODO: Pack missing in Guix https://10110111.github.io/CalcMySky/
"-DENABLE_SHOWMYSKY=0"
"-DENABLE_TESTING=0"
(string-append "-DCMAKE_CXX_FLAGS=-isystem "
#$(this-package-input "qtserialport") "/include/qt5"))
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'set-offscreen-display
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "HOME" "/tmp"))))))
(inputs (inputs
(list qtbase-5 (list gpsd
indi
libnova
openssl
qtbase-5
qtcharts
qtlocation qtlocation
qtmultimedia-5 qtmultimedia-5
qtpositioning
qtscript qtscript
qtserialport qtserialport
qttranslations
qtwebengine-5
qxlsx
zlib)) zlib))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) ; xgettext is used at compile time (list doxygen
("perl" ,perl) ; for pod2man gettext-minimal
("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time graphviz
("qttools-5" ,qttools-5))) mesa
(arguments perl
`(#:test-target "test" python-wrapper
#:configure-flags (list "-DENABLE_TESTING=1" qttools-5))
(string-append
"-DCMAKE_CXX_FLAGS=-isystem "
(assoc-ref %build-inputs "qtserialport")
"/include/qt5"))
#:phases (modify-phases %standard-phases
(add-before 'check 'set-offscreen-display
(lambda _
;; Make Qt render "offscreen", required for tests.
(setenv "QT_QPA_PLATFORM" "offscreen")
(setenv "HOME" "/tmp")
#t)))))
(home-page "https://stellarium.org/") (home-page "https://stellarium.org/")
(synopsis "3D sky viewer") (synopsis "3D sky viewer")
(description "Stellarium is a planetarium. It shows a realistic sky in (description
"Stellarium is a planetarium. It shows a realistic sky in
3D, just like what you see with the naked eye, binoculars, or a telescope. It 3D, just like what you see with the naked eye, binoculars, or a telescope. It
can be used to control telescopes over a serial port for tracking celestial can be used to control telescopes over a serial port for tracking celestial
objects.") objects.")
@ -1655,6 +1681,54 @@ positions of the sun: dawn, sunrise, solar noon, sunset, dusk, solar
elevation, solar azimuth, rahukaalam, and the phases of the moon.") elevation, solar azimuth, rahukaalam, and the phases of the moon.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python-spherical-geometry
(package
(name "python-spherical-geometry")
(version "1.2.22")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/spacetelescope/spherical_geometry")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "0kzcncqir4v7nhk9lxj9gxr32p3krkaqa58y2i4kksgxxy24qw4z"))))
(build-system python-build-system)
(arguments
(list
;; NOTE: (Sharlatan-20220523T231348+0100): Tests depends on old Python2
;; libarry `sphere'
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'preparations
(lambda _
;; Fixing: setuptools-scm was unable to detect version for ...
(substitute* "setup.py"
(("use_scm_version=True")
(format #f "version=~s" #$version))
(("setup_requires=\\['setuptools_scm'\\],.*")
""))
;; Use our own libraries in place of bundles.
(setenv "USE_SYSTEM_QD" "1"))))))
(native-inputs
(list python-pytest
python-setuptools-scm))
(inputs
(list qd))
(propagated-inputs
(list python-astropy
python-numpy))
(home-page "https://github.com/spacetelescope/tweakwcs")
(synopsis "Python astronimical package for handling spherical polygons")
(description
"The @code{spherical_geometry} library is a Python package for handling
spherical polygons that represent arbitrary regions of the sky.")
;; LICENSE.rst Association of Universities for Research in Astronomy (AURA)
;; QD_LIBRARY_LICENSE.rst for bandeled QD source
(license license:bsd-3)))
(define-public libnova (define-public libnova
(package (package
(name "libnova") (name "libnova")
@ -1683,7 +1757,7 @@ elevation, solar azimuth, rahukaalam, and the phases of the moon.")
(synopsis "Celestial mechanics, astrometry and astrodynamics library") (synopsis "Celestial mechanics, astrometry and astrodynamics library")
(description "Libnova is a general purpose, double precision, Celestial (description "Libnova is a general purpose, double precision, Celestial
Mechanics, Astrometry and Astrodynamics library.") Mechanics, Astrometry and Astrodynamics library.")
(home-page "http://libnova.sourceforge.net/") (home-page "https://libnova.sourceforge.net/")
(license (list license:lgpl2.0+ (license (list license:lgpl2.0+
license:gpl2+)))) ; examples/transforms.c & lntest/*.c license:gpl2+)))) ; examples/transforms.c & lntest/*.c
@ -1889,7 +1963,7 @@ on FITS files:
(string-append "CPPFLAGS=-I" netpbm "/include/netpbm") (string-append "CPPFLAGS=-I" netpbm "/include/netpbm")
;; no nasa jpl cspice support ;; no nasa jpl cspice support
"--without-cspice" ))))) "--without-cspice" )))))
(home-page "http://xplanet.sourceforge.net/") (home-page "https://xplanet.sourceforge.net/")
(synopsis "Planetary body renderer") (synopsis "Planetary body renderer")
(description (description
"Xplanet renders an image of a planet into an X window or file. "Xplanet renders an image of a planet into an X window or file.

View File

@ -41,6 +41,7 @@
;;; Copyright © 2022 Simon Streit <simon@netpanic.org> ;;; Copyright © 2022 Simon Streit <simon@netpanic.org>
;;; Copyright © 2022 Andy Tai <atai@atai.org> ;;; Copyright © 2022 Andy Tai <atai@atai.org>
;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr> ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr>
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -501,7 +502,7 @@ by MusicIP.")
(description "LibTiMidity is a MIDI to WAVE converter library that uses (description "LibTiMidity is a MIDI to WAVE converter library that uses
Gravis Ultrasound-compatible patch files to generate digital audio data from Gravis Ultrasound-compatible patch files to generate digital audio data from
General MIDI files.") General MIDI files.")
(home-page "http://libtimidity.sourceforge.net/") (home-page "https://libtimidity.sourceforge.net/")
(license (license
;; This project is dual-licensed. ;; This project is dual-licensed.
;; Either of the following licenses can be exercised. ;; Either of the following licenses can be exercised.
@ -572,7 +573,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
qtbase-5)) qtbase-5))
(native-inputs (native-inputs
(list pkg-config qttools-5)) (list pkg-config qttools-5))
(home-page "http://alsamodular.sourceforge.net/") (home-page "https://alsamodular.sourceforge.net/")
(synopsis "Realtime modular synthesizer and effect processor") (synopsis "Realtime modular synthesizer and effect processor")
(description (description
"AlsaModularSynth is a digital implementation of a classical analog "AlsaModularSynth is a digital implementation of a classical analog
@ -855,7 +856,7 @@ engineers, musicians, soundtrack editors and composers.")
(define-public audacity (define-public audacity
(package (package
(name "audacity") (name "audacity")
(version "3.2.3") (version "3.2.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -864,7 +865,7 @@ engineers, musicians, soundtrack editors and composers.")
(commit (string-append "Audacity-" version)))) (commit (string-append "Audacity-" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0wg75fblxlnrn5kqvg0w1fi2pwdkn1nd6vgya3sad84l3ki7wpyh")) (base32 "06kfxbfvvhbhwfzkvar6hir351606g29ij8b4hksxpzq338shgc3"))
(patches (search-patches "audacity-ffmpeg-fallback.patch")) (patches (search-patches "audacity-ffmpeg-fallback.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -1090,45 +1091,56 @@ formant warp.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public azr3 (define-public azr3
(package (let ((commit "3391a0a509e7fa3fb46c7627fd5979b67e468038")
(name "azr3") (revision "1"))
(version "1.2.3") (package
(source (origin (name "azr3")
(method url-fetch) (version (git-version "1.2.3" revision commit))
(uri (string-append "mirror://savannah/ll-plugins/azr3-jack-" (source (origin
version (method git-fetch)
".tar.bz2")) (uri (git-reference
(sha256 (url "https://git.savannah.gnu.org/git/ll-plugins/azr3-jack.git")
(base32 (commit commit)))
"18mdw6nc0vgj6k9rsy0x8w64wvzld0frqshrxxbxfj9qi9843vlc")) (file-name (git-file-name name version))
(patches (search-patches "azr3.patch")))) (sha256
(build-system gnu-build-system) (base32
(arguments "09wy0z4kiid7mwf5b5j8rzzgxafi4mg88xs550n7864p0n351chx"))
`(#:tests? #f ; no check target (patches (search-patches "azr3.patch"
#:make-flags "azr3-remove-lash.patch"))))
(list "LV2PEG=ttl2c" (build-system gnu-build-system)
(string-append "prefix=" %output) (arguments
(string-append "pkgdatadir=" %output "/share/azr3-jack")) (list
#:phases #:tests? #f ; no check target
(modify-phases %standard-phases #:make-flags
(add-before 'install 'fix-timestamp #~(list "LV2PEG=ttl2c"
(lambda _ (string-append "prefix=" #$output)
(let ((early-1980 315619200)) ; 1980-01-02 UTC (string-append "pkgdatadir=" #$output "/share/azr3-jack"))
(utime "azr3.1" early-1980 early-1980)) #:phases
#t))))) #~(modify-phases %standard-phases
(inputs (replace 'bootstrap
(list gtkmm-2 lvtk jack-1 lash)) (lambda _
(native-inputs (call-with-output-file "Makefile.config"
(list pkg-config)) (lambda (port) (display "" port)))
(home-page "http://ll-plugins.nongnu.org/azr3/") (substitute* "Makefile"
(synopsis "Tonewheel organ synthesizer") (("^PACKAGE_VERSION =.*")
(description (string-append "PACKAGE_VERSION = \"" #$version "\"\n")))))
"AZR-3 is a port of the free VST plugin AZR-3. It is a tonewheel organ (add-before 'install 'fix-timestamp
(lambda _
(let ((early-1980 315619200)) ; 1980-01-02 UTC
(utime "azr3.1" early-1980 early-1980)))))))
(inputs
(list gtkmm-2 jack-2 lvtk))
(native-inputs
(list pkg-config))
(home-page "https://ll-plugins.nongnu.org/azr3/")
(synopsis "Tonewheel organ synthesizer")
(description
"AZR-3 is a port of the free VST plugin AZR-3. It is a tonewheel organ
with drawbars, distortion and rotating speakers. The organ has three with drawbars, distortion and rotating speakers. The organ has three
sections, two polyphonic sections with nine drawbars each and one monophonic sections, two polyphonic sections with nine drawbars each and one monophonic
bass section with five drawbars. A standalone JACK application and LV2 bass section with five drawbars. A standalone JACK application and LV2
plugins are provided.") plugins are provided.")
(license license:gpl2))) (license license:gpl2))))
(define-public calf (define-public calf
(package (package
@ -1148,7 +1160,6 @@ plugins are provided.")
glib glib
gtk+-2 gtk+-2
cairo cairo
lash
jack-1 jack-1
lv2 lv2
ladspa ladspa
@ -1477,7 +1488,7 @@ formats used to store information about DJ record libraries.")
bison bison
sed sed
grep)) grep))
(home-page "http://taopm.sourceforge.net/") (home-page "https://taopm.sourceforge.net/")
(synopsis "Sound Synthesis with Physical Models") (synopsis "Sound Synthesis with Physical Models")
(description "Tao is a software package for sound synthesis using physical (description "Tao is a software package for sound synthesis using physical
models. It provides a virtual acoustic material constructed from masses and models. It provides a virtual acoustic material constructed from masses and
@ -2148,7 +2159,7 @@ also play midifiles using a Soundfont.")
#t)))) #t))))
(native-inputs (native-inputs
(list tar bzip2)) (list tar bzip2))
(home-page "http://freepats.zenvoid.org") (home-page "https://freepats.zenvoid.org")
(synopsis "GUS compatible patches for MIDI players") (synopsis "GUS compatible patches for MIDI players")
(description (description
"FreePats is a project to create a free and open set of GUS compatible "FreePats is a project to create a free and open set of GUS compatible
@ -2302,7 +2313,7 @@ auto-wah.")
libsndfile libsndfile
libsamplerate libsamplerate
zlib)) zlib))
(home-page "http://rakarrack.sourceforge.net/") (home-page "https://rakarrack.sourceforge.net/")
(synopsis "Audio effects processor") (synopsis "Audio effects processor")
(description (description
"Rakarrack is a richly featured multi-effects processor emulating a "Rakarrack is a richly featured multi-effects processor emulating a
@ -2566,13 +2577,12 @@ audio signal streaming.")
(list lv2 (list lv2
lilv lilv
suil suil
gtk gtk+
gtkmm
qtbase-5 qtbase-5
jack-1)) jack-1))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "https://drobilla.net/software/jalv/") (home-page "https://drobilla.net/software/jalv.html")
(synopsis "Simple LV2 host for JACK") (synopsis "Simple LV2 host for JACK")
(description (description
"Jalv is a simple but fully featured LV2 host for JACK. It runs LV2 "Jalv is a simple but fully featured LV2 host for JACK. It runs LV2
@ -2742,7 +2752,7 @@ with applications that support them (e.g. PulseAudio).")
`(;; liblo test FAILED `(;; liblo test FAILED
;; liblo server error 19 in setsockopt(IP_ADD_MEMBERSHIP): No such device ;; liblo server error 19 in setsockopt(IP_ADD_MEMBERSHIP): No such device
#:tests? #f)) #:tests? #f))
(home-page "http://liblo.sourceforge.net") (home-page "https://liblo.sourceforge.net")
(synopsis "Implementation of the Open Sound Control protocol") (synopsis "Implementation of the Open Sound Control protocol")
(description (description
"liblo is a lightweight library that provides an easy to use "liblo is a lightweight library that provides an easy to use
@ -3512,7 +3522,7 @@ using Guix System.")
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list libogg libtheora libvorbis speex)) (list libogg libtheora libvorbis speex))
(home-page "http://idjc.sourceforge.net/") (home-page "https://idjc.sourceforge.net/")
(synopsis "Broadcast streaming library with IDJC extensions") (synopsis "Broadcast streaming library with IDJC extensions")
(description "This package provides libshout plus IDJC extensions.") (description "This package provides libshout plus IDJC extensions.")
;; GNU Library (not Lesser) General Public License. ;; GNU Library (not Lesser) General Public License.
@ -3592,7 +3602,7 @@ tempo and pitch of an audio recording independently of one another.")
"1ff2yfq3k4l209fr71v3w98fpjjv1chs09vkbmxj03lcikahxns8")))) "1ff2yfq3k4l209fr71v3w98fpjjv1chs09vkbmxj03lcikahxns8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list jack-1 alsa-lib)) (list alsa-lib jack-2))
(native-inputs (native-inputs
(list autoconf automake libtool pkg-config)) (list autoconf automake libtool pkg-config))
(home-page "https://www.music.mcgill.ca/~gary/rtmidi") (home-page "https://www.music.mcgill.ca/~gary/rtmidi")
@ -3748,7 +3758,7 @@ for loudness normalisation.")
freepats)) freepats))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "http://timidity.sourceforge.net/") (home-page "https://timidity.sourceforge.net/")
(synopsis "Software synthesizer for playing MIDI files") (synopsis "Software synthesizer for playing MIDI files")
(description (description
"TiMidity++ is a software synthesizer. It can play MIDI files by "TiMidity++ is a software synthesizer. It can play MIDI files by
@ -3833,7 +3843,7 @@ analysis plugins or audio feature extraction plugins.")
"/ar-lib")) "/ar-lib"))
"ar-lib") "ar-lib")
#t))))) #t)))))
(home-page "http://sbsms.sourceforge.net/") (home-page "https://sbsms.sourceforge.net/")
(synopsis "Library for time stretching and pitch scaling of audio") (synopsis "Library for time stretching and pitch scaling of audio")
(description (description
"SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time "SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time
@ -3911,7 +3921,7 @@ encode and decode wavpack files.")
(base32 (base32
"1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25")))) "1pnri98a603xk47smnxr551svbmgbzcw018mq1k6srbrq6kaaz25"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://modplug-xmms.sourceforge.net/") (home-page "https://modplug-xmms.sourceforge.net/")
(synopsis "Mod file playing library") (synopsis "Mod file playing library")
(description (description
"Libmodplug renders mod music files as raw audio data, for playing or "Libmodplug renders mod music files as raw audio data, for playing or
@ -3932,7 +3942,7 @@ surround and reverb.")
(base32 (base32
"1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m")))) "1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://xmp.sourceforge.net/") (home-page "https://xmp.sourceforge.net/")
(synopsis "Module player library") (synopsis "Module player library")
(description (description
"Libxmp is a library that renders module files to PCM data. It supports "Libxmp is a library that renders module files to PCM data. It supports
@ -3956,7 +3966,7 @@ Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).")
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list libxmp pulseaudio)) (list libxmp pulseaudio))
(home-page "http://xmp.sourceforge.net/") (home-page "https://xmp.sourceforge.net/")
(synopsis "Extended module player") (synopsis "Extended module player")
(description (description
"Xmp is a portable module player that plays over 90 mainstream and "Xmp is a portable module player that plays over 90 mainstream and
@ -4020,7 +4030,7 @@ control functionality, or just for playing around with the sound effects.")
libpng libpng
libvorbis libvorbis
pulseaudio)) pulseaudio))
(home-page "http://sox.sourceforge.net") (home-page "https://sox.sourceforge.net")
(synopsis "Sound processing utility") (synopsis "Sound processing utility")
(description (description
"SoX (Sound eXchange) is a command line utility that can convert "SoX (Sound eXchange) is a command line utility that can convert
@ -4135,7 +4145,7 @@ interface.")
(define-public qsynth (define-public qsynth
(package (package
(name "qsynth") (name "qsynth")
(version "0.5.7") (version "0.9.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4145,14 +4155,14 @@ interface.")
(string-append "mirror://sourceforge/qsynth/qsynth (attic)" (string-append "mirror://sourceforge/qsynth/qsynth (attic)"
"/qsynth-" version ".tar.gz"))) "/qsynth-" version ".tar.gz")))
(sha256 (sha256
(base32 "18im4w8agj60nkppwbkxqnhpp13z5li3w30kklv4lgs20rvgbvl6")))) (base32 "1cjg25nva5ivahr0qqlvf6ybnpcx9jgrxbp4vgwkk64b4k9wnd4n"))))
(build-system gnu-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; no "check" phase `(#:tests? #f)) ; no "check" phase
(native-inputs (native-inputs
(list qttools-5 pkg-config)) (list qttools pkg-config))
(inputs (inputs
(list fluidsynth qtbase-5 qtx11extras)) (list fluidsynth qtbase qtsvg qtwayland))
(home-page "https://qsynth.sourceforge.io") (home-page "https://qsynth.sourceforge.io")
(synopsis "Graphical user interface for FluidSynth") (synopsis "Graphical user interface for FluidSynth")
(description (description
@ -4517,7 +4527,7 @@ with support for HD extensions.")
'(modify-phases %standard-phases '(modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
(inputs (list fftw)) (inputs (list fftw))
(home-page "http://drc-fir.sourceforge.net/") (home-page "https://drc-fir.sourceforge.net/")
(synopsis "Digital room correction") (synopsis "Digital room correction")
(description (description
"DRC is a program used to generate correction filters for acoustic "DRC is a program used to generate correction filters for acoustic
@ -4643,7 +4653,7 @@ code, used in @code{libtoxcore}.")
(synopsis "GSM 06.10 lossy speech compression library") (synopsis "GSM 06.10 lossy speech compression library")
(description "This C library provides an encoder and a decoder for the GSM (description "This C library provides an encoder and a decoder for the GSM
06.10 RPE-LTP lossy speech compression algorithm.") 06.10 RPE-LTP lossy speech compression algorithm.")
(home-page "http://quut.com/gsm/") (home-page "https://quut.com/gsm/")
(license (license:non-copyleft "file://COPYRIGHT")))) (license (license:non-copyleft "file://COPYRIGHT"))))
(define-public python-pyalsaaudio (define-public python-pyalsaaudio
@ -5162,7 +5172,7 @@ developing fully accurate DirectX Audio runtime libraries.")
(list alsa-lib gtk+-2 libsndfile portaudio)) (list alsa-lib gtk+-2 libsndfile portaudio))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "http://gnaural.sourceforge.net/") (home-page "https://gnaural.sourceforge.net/")
(synopsis "Binaural beat synthesizer") (synopsis "Binaural beat synthesizer")
(description "Gnaural is a programmable auditory binaural beat synthesizer (description "Gnaural is a programmable auditory binaural beat synthesizer
intended to be used for brainwave entrainment. Gnaural supports creation of intended to be used for brainwave entrainment. Gnaural supports creation of
@ -6152,10 +6162,46 @@ managed by PipeWire.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(inputs (list faad2 glib libmad libvorbis)) (inputs (list faad2 glib libmad libvorbis))
(home-page "http://streamripper.sourceforge.net") (home-page "https://streamripper.sourceforge.net")
(synopsis "Record audio streams to your hard drive") (synopsis "Record audio streams to your hard drive")
(description "Streamripper records shoutcast-compatible (description "Streamripper records shoutcast-compatible
streams. For shoutcast style streams it finds the meta data or track streams. For shoutcast style streams it finds the meta data or track
separation data, and uses that as a marker for where the track should separation data, and uses that as a marker for where the track should
be separated.") be separated.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public cubeb
(let ((commit "9e29d728b0025c674904f83f5a13a88d1a6a5edc")
(revision "1"))
(package
(name "cubeb")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mozilla/cubeb")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"1sxkr3h8a4hd3c3a3cjydrszz6npxk3vh6ra3y67lds3zgc69c7n"))))
(build-system cmake-build-system)
(arguments
'(#:configure-flags
;; Sanitizers-cmake requires a git submodule.
'("-DUSE_SANITIZERS=0"
;; Tests require a git submodule for googletest.
"-DBUILD_TESTS=0"
;; Use our speex, not a bundled one.
"-DBUNDLE_SPEEX=0"
;; A static library would be built by default.
"-DBUILD_SHARED_LIBS=1"
;; Explicitly link against audio libraries so they are on the
;; runpath. Otherwise cubeb tries to dlopen them at runtime.
"-DCMAKE_SHARED_LINKER_FLAGS=-lasound -lpulse -lspeex")
#:tests? #f))
(inputs (list alsa-lib pulseaudio speex))
(synopsis "Cross-platform audio library")
(description "Cubeb is Mozilla's cross-platform audio library.")
(home-page "https://github.com/mozilla/cubeb")
(license license:isc))))

View File

@ -161,7 +161,7 @@ YubiKey into your existing user authentication infrastructure.")
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list linux-pam)) (list linux-pam))
(home-page "http://pamtester.sourceforge.net/") (home-page "https://pamtester.sourceforge.net/")
(synopsis "Utility for testing pluggable authentication modules (PAM) facility") (synopsis "Utility for testing pluggable authentication modules (PAM) facility")
(description (description
"Pamtester is a tiny utility program to test the pluggable authentication "Pamtester is a tiny utility program to test the pluggable authentication

View File

@ -213,7 +213,7 @@ files with a system-specific shebang."
(list (list
;; XXX: Kludge to hide the circular dependency. ;; XXX: Kludge to hide the circular dependency.
(module-ref (resolve-interface '(gnu packages guile)) (module-ref (resolve-interface '(gnu packages guile))
'guile-3.0/fixed) 'guile-3.0/pinned)
autoconf autoconf
bash-minimal)) bash-minimal))
(arguments (arguments

View File

@ -76,6 +76,13 @@ The files in the list do not have extensions (.el, .elc)."
(when (file-directory-p pkg-dir) (when (file-directory-p pkg-dir)
(package-load-descriptor pkg-dir))))))))))) (package-load-descriptor pkg-dir)))))))))))
;; If emacs built with tree-sitter, read the value of the environment variable
;; to make tree-sitter grammars available in emacs out-of-the-box.
(with-eval-after-load 'treesit
(when-let ((grammar-path (getenv "TREE_SITTER_GRAMMAR_PATH")))
(mapcar (lambda (x) (add-to-list 'treesit-extra-load-path x))
(split-string grammar-path ":"))))
(provide 'guix-emacs) (provide 'guix-emacs)
;;; guix-emacs.el ends here ;;; guix-emacs.el ends here

View File

@ -1645,7 +1645,7 @@ CONFIG_NET_FLOW_LIMIT=y
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_TCPPROBE=m CONFIG_NET_TCPPROBE=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
CONFIG_HAMRADIO=y CONFIG_HAMRADIO=y
# #

View File

@ -1639,7 +1639,7 @@ CONFIG_NET_FLOW_LIMIT=y
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_TCPPROBE=m CONFIG_NET_TCPPROBE=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
CONFIG_HAMRADIO=y CONFIG_HAMRADIO=y
# #

View File

@ -1747,7 +1747,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
CONFIG_HAMRADIO=y CONFIG_HAMRADIO=y
# #

View File

@ -1753,7 +1753,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
CONFIG_HAMRADIO=y CONFIG_HAMRADIO=y
# #

View File

@ -1745,7 +1745,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -1758,7 +1758,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -1756,7 +1756,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -1784,7 +1784,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -101,7 +101,7 @@ CONFIG_HAVE_EBPF_JIT=y
CONFIG_BPF_SYSCALL=y CONFIG_BPF_SYSCALL=y
CONFIG_BPF_JIT=y CONFIG_BPF_JIT=y
# CONFIG_BPF_JIT_ALWAYS_ON is not set # CONFIG_BPF_JIT_ALWAYS_ON is not set
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_PRELOAD is not set
CONFIG_BPF_LSM=y CONFIG_BPF_LSM=y
# end of BPF subsystem # end of BPF subsystem
@ -1736,7 +1736,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -96,7 +96,7 @@ CONFIG_BPF_SYSCALL=y
CONFIG_BPF_JIT=y CONFIG_BPF_JIT=y
# CONFIG_BPF_JIT_ALWAYS_ON is not set # CONFIG_BPF_JIT_ALWAYS_ON is not set
CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_BPF_JIT_DEFAULT_ON=y
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_PRELOAD is not set
CONFIG_BPF_LSM=y CONFIG_BPF_LSM=y
# end of BPF subsystem # end of BPF subsystem
@ -1756,7 +1756,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -108,7 +108,7 @@ CONFIG_HAVE_EBPF_JIT=y
# #
CONFIG_BPF_SYSCALL=y CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_JIT is not set # CONFIG_BPF_JIT is not set
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_PRELOAD is not set
# end of BPF subsystem # end of BPF subsystem
@ -1765,7 +1765,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -112,7 +112,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
# #
CONFIG_BPF_SYSCALL=y CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_JIT is not set # CONFIG_BPF_JIT is not set
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_PRELOAD is not set
# end of BPF subsystem # end of BPF subsystem
@ -1802,7 +1802,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -1713,7 +1713,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -1690,7 +1690,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -1723,7 +1723,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -1736,7 +1736,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -103,7 +103,7 @@ CONFIG_HAVE_EBPF_JIT=y
CONFIG_BPF_SYSCALL=y CONFIG_BPF_SYSCALL=y
CONFIG_BPF_JIT=y CONFIG_BPF_JIT=y
# CONFIG_BPF_JIT_ALWAYS_ON is not set # CONFIG_BPF_JIT_ALWAYS_ON is not set
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_PRELOAD is not set
CONFIG_BPF_LSM=y CONFIG_BPF_LSM=y
# end of BPF subsystem # end of BPF subsystem
@ -1757,7 +1757,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -112,7 +112,7 @@ CONFIG_BPF_SYSCALL=y
CONFIG_BPF_JIT=y CONFIG_BPF_JIT=y
# CONFIG_BPF_JIT_ALWAYS_ON is not set # CONFIG_BPF_JIT_ALWAYS_ON is not set
CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_BPF_JIT_DEFAULT_ON=y
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_PRELOAD is not set
CONFIG_BPF_LSM=y CONFIG_BPF_LSM=y
# end of BPF subsystem # end of BPF subsystem
@ -1772,7 +1772,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
CONFIG_NET_DROP_MONITOR=y CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -111,7 +111,7 @@ CONFIG_HAVE_EBPF_JIT=y
# #
CONFIG_BPF_SYSCALL=y CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_JIT is not set # CONFIG_BPF_JIT is not set
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_PRELOAD is not set
# end of BPF subsystem # end of BPF subsystem
@ -1810,7 +1810,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -116,7 +116,7 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
# #
CONFIG_BPF_SYSCALL=y CONFIG_BPF_SYSCALL=y
# CONFIG_BPF_JIT is not set # CONFIG_BPF_JIT is not set
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
# CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_PRELOAD is not set
# end of BPF subsystem # end of BPF subsystem
@ -1871,7 +1871,7 @@ CONFIG_NET_FLOW_LIMIT=y
# Network testing # Network testing
# #
CONFIG_NET_PKTGEN=m CONFIG_NET_PKTGEN=m
# CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DROP_MONITOR=m
# end of Network testing # end of Network testing
# end of Networking options # end of Networking options

View File

@ -50,7 +50,6 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#: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 perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -554,6 +553,13 @@ rsnapshot uses hard links to deduplicate identical files.")
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Gnulib's <stdio.h> refers to 'gets' for the purposes of
;; warning against its use, but 'gets' is no longer declared
;; in glibc's <stdio.h>. Remove that warning.
(substitute* "lib/stdio.in.h"
(("_GL_WARN_ON_USE \\(gets,.*")
"\n/* 'gets' is gone, rejoice! */\n"))
;; Include all the libtirpc headers necessary to get the ;; Include all the libtirpc headers necessary to get the
;; definitions of 'u_int', etc. ;; definitions of 'u_int', etc.
(substitute* '("src/block-server.c" (substitute* '("src/block-server.c"
@ -562,8 +568,7 @@ rsnapshot uses hard links to deduplicate identical files.")
(("#include <rpc/(.*)\\.h>" _ header) (("#include <rpc/(.*)\\.h>" _ header)
(string-append "#include <rpc/types.h>\n" (string-append "#include <rpc/types.h>\n"
"#include <rpc/rpc.h>\n" "#include <rpc/rpc.h>\n"
"#include <rpc/" header ".h>\n"))) "#include <rpc/" header ".h>\n")))))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(;; Link against libtirpc. '(;; Link against libtirpc.
@ -588,12 +593,16 @@ rsnapshot uses hard links to deduplicate identical files.")
(string-append (getenv "CPATH") (string-append (getenv "CPATH")
":" tirpc)) ":" tirpc))
(setenv "CPATH" tirpc))))) (setenv "CPATH" tirpc)))))
(add-before 'check 'skip-test (add-before 'check 'adjust-test
(lambda _ (lambda _
;; XXX: This test fails (1) because current GnuTLS no ;; This test uses a weird construct to spawn
;; longer supports OpenPGP authentication, and (2) for ;; 'chop-block-server' in the background. Replace it
;; some obscure reason. Better skip it. ;; with something that actually works.
(setenv "XFAIL_TESTS" "utils/block-server")))))) (substitute* "tests/utils/block-server"
(("chop_fail_if ! chop-block-server")
"chop-block-server")
(("'&'")
"&")))))))
(native-inputs (native-inputs
(list guile-2.0 gperf-3.0 ;see <https://bugs.gnu.org/32382> (list guile-2.0 gperf-3.0 ;see <https://bugs.gnu.org/32382>
pkg-config rpcsvc-proto)) ;for 'rpcgen' pkg-config rpcsvc-proto)) ;for 'rpcgen'
@ -1324,7 +1333,7 @@ borgmatic is powered by borg.")
python-paramiko python-paramiko
python-peewee python-peewee
python-psutil python-psutil
python-pyqt-without-qtwebkit python-pyqt
python-secretstorage python-secretstorage
;; This is included so that the qt-wrap phase picks it up. ;; This is included so that the qt-wrap phase picks it up.
qtsvg-5)) qtsvg-5))
@ -1351,7 +1360,7 @@ archives.")
(native-inputs (list intltool pkg-config)) (native-inputs (list intltool pkg-config))
(inputs (list gtk+)) (inputs (list gtk+))
(propagated-inputs (list rsync)) (propagated-inputs (list rsync))
(home-page "http://www.opbyte.it/grsync/") (home-page "https://www.opbyte.it/grsync/")
(synopsis "GTK frontend for rsync") (synopsis "GTK frontend for rsync")
(description (description
"Grsync is a simple graphical interface using GTK for the @command{rsync} "Grsync is a simple graphical interface using GTK for the @command{rsync}

View File

@ -18,7 +18,6 @@
(define-module (gnu packages barrier) (define-module (gnu packages barrier)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix download) #:use-module (guix download)

View File

@ -674,8 +674,7 @@ included.")
(substitute* "gold/Makefile.in" (substitute* "gold/Makefile.in"
((" testsuite") " "))))) ((" testsuite") " ")))))
'()))))) '())))))
(native-inputs (native-inputs (list bc))))
`(("bc" ,bc)))))
(define* (make-ld-wrapper name #:key (define* (make-ld-wrapper name #:key
(target (const #f)) (target (const #f))

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2016, 2017, 2020, 2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
@ -37,8 +37,11 @@
(version "8.0.6") (version "8.0.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ivmai/bdwgc/releases" (uri (list (string-append "https://github.com/ivmai/bdwgc/releases"
"/download/v" version "/gc-" version ".tar.gz")) "/download/v" version
"/gc-" version ".tar.gz")
(string-append "https://www.hboehm.info/gc/gc_source"
"/gc-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"04ga3c95w5az5sznzm73j19lvvfpf6k4sgkpjqsmjxpsr6mi8j9v")))) "04ga3c95w5az5sznzm73j19lvvfpf6k4sgkpjqsmjxpsr6mi8j9v"))))
@ -71,6 +74,9 @@
(list libatomic-ops) (list libatomic-ops)
'())) '()))
(outputs '("out" "debug")) (outputs '("out" "debug"))
(properties
'((release-monitoring-url . "https://www.hboehm.info/gc/gc_source/")
(upstream-name . "gc")))
(synopsis "The Boehm-Demers-Weiser conservative garbage collector (synopsis "The Boehm-Demers-Weiser conservative garbage collector
for C and C++") for C and C++")
(description (description

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -385,7 +385,7 @@ and will take advantage of multiple processor cores where possible.")
(define-public libtorrent-rasterbar (define-public libtorrent-rasterbar
(package (package
(name "libtorrent-rasterbar") (name "libtorrent-rasterbar")
(version "1.2.15") (version "1.2.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -394,7 +394,7 @@ and will take advantage of multiple processor cores where possible.")
"releases/download/v" version "/" "releases/download/v" version "/"
"libtorrent-rasterbar-" version ".tar.gz")) "libtorrent-rasterbar-" version ".tar.gz"))
(sha256 (sha256
(base32 "0jr1c876mvwbbbnav8ldcdm1l6z3g404jc5wp8z902jcd0w8dbf8")))) (base32 "0wpsaqadcicxl4lf1nc1i93c4yzjv8hpzhhrw1hdkrp4gn0vdwpy"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags '("-Dpython-bindings=ON" `(#:configure-flags '("-Dpython-bindings=ON"
@ -416,7 +416,7 @@ and will take advantage of multiple processor cores where possible.")
;; expiry date. To ensure succesful builds in the future, ;; expiry date. To ensure succesful builds in the future,
;; fake the time to be roughly that of the release. ;; fake the time to be roughly that of the release.
(setenv "FAKETIME_ONLY_CMDS" "test_ssl") (setenv "FAKETIME_ONLY_CMDS" "test_ssl")
(invoke "faketime" "2021-12-12" (invoke "faketime" "2022-10-24"
"ctest" "ctest"
"--exclude-regex" (string-join disabled-tests "|") "--exclude-regex" (string-join disabled-tests "|")
"-j" (if parallel-tests? "-j" (if parallel-tests?

View File

@ -1102,6 +1102,22 @@ partition."))
(modify-inputs (package-native-inputs base) (modify-inputs (package-native-inputs base)
(append arm-trusted-firmware-rk3399)))))) (append arm-trusted-firmware-rk3399))))))
(define-public u-boot-qemu-arm
(make-u-boot-package "qemu_arm" "arm-linux-gnueabihf"
;; Disable features that require OpenSSL due
;; to GPL/Openssl license incompatibilities.
;; See https://bugs.gnu.org/34717 for
;; details.
#:configs '("# CONFIG_FIT_SIGNATURE is not set")))
(define-public u-boot-qemu-arm64
(make-u-boot-package "qemu_arm64" "aarch64-linux-gnu"
;; Disable features that require OpenSSL due
;; to GPL/Openssl license incompatibilities.
;; See https://bugs.gnu.org/34717 for
;; details.
#:configs '("# CONFIG_FIT_SIGNATURE is not set")))
(define-public u-boot-qemu-riscv64 (define-public u-boot-qemu-riscv64
(make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu")) (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu"))
@ -1177,7 +1193,7 @@ Documentation} for more information (for example by running @samp{info
#~(modify-phases #$phases #~(modify-phases #$phases
(add-after 'unpack 'set-environment (add-after 'unpack 'set-environment
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(setenv "BL31 "(search-input-file inputs "bl31.elf")))))))) (setenv "BL31" (search-input-file inputs "bl31.elf"))))))))
(inputs (inputs
(modify-inputs (package-inputs base) (modify-inputs (package-inputs base)
(append arm-trusted-firmware-rk3328)))))) (append arm-trusted-firmware-rk3328))))))
@ -1501,7 +1517,7 @@ To flash this bootloader, write it to an SD card, then using the U-Boot serial
console: console:
@example @example
mmc dev 0 mmc dev 0
load mmc 0:1 ${loadaddr} /u-boot.imx load mmc 0:1 ${loadaddr} /boot/u-boot.imx
sf probe sf probe
sf erase 0 0x80000 sf erase 0 0x80000
sf write ${loadaddr} 0x400 $filesize sf write ${loadaddr} 0x400 $filesize

View File

@ -30,7 +30,6 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system) #:use-module (guix build-system)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module ((guix store) #:use-module ((guix store)
#:select (%store-monad interned-file text-file store-lift)) #:select (%store-monad interned-file text-file store-lift))

View File

@ -23,7 +23,6 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)

View File

@ -660,7 +660,7 @@ software.")
sqlite)) sqlite))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "http://gittup.org/tup/") (home-page "https://gittup.org/tup/")
(synopsis "Fast build system that's hard to get wrong") (synopsis "Fast build system that's hard to get wrong")
(description "Tup is a generic build system based on a directed acyclic (description "Tup is a generic build system based on a directed acyclic
graphs of commands to be executed. Tup instruments your build to detect the graphs of commands to be executed. Tup instruments your build to detect the
@ -996,7 +996,8 @@ maintenance-related files, for convenience.")
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GNULIB_SRCDIR") (variable "GNULIB_SRCDIR")
(files (list "src/gnulib"))))) (files (list "src/gnulib"))
(separator #f))))
(license (list license:lgpl2.0+ license:gpl3+)))) (license (list license:lgpl2.0+ license:gpl3+))))
(define-public gnulib (define-public gnulib

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016-2020, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 20182022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 20182022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 LuHui <luhux76@gmail.com> ;;; Copyright © 2022 LuHui <luhux76@gmail.com>
;;; ;;;
@ -35,7 +35,7 @@
(define-public busybox (define-public busybox
(package (package
(name "busybox") (name "busybox")
(version "1.35.0") (version "1.36.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -43,7 +43,7 @@
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1556hfgw32xf226dd138gfq0z1zf4r3f8naa9wrqld2sqd2b5vps")))) "19b1mzkc2hc2qsg4fnshdyqfxk1xkzwv900p40767ckwmz4509sl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:phases (list #:phases

View File

@ -44,7 +44,6 @@
#: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 python) #:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (guix store) #:use-module (guix store)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
@ -70,8 +69,8 @@
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
(define-public c-intro-and-ref (define-public c-intro-and-ref
(let ((revision "0") (let ((revision "1")
(commit "f88559678feeb1391a0e9c7cf060c4429ef22ffc")) (commit "47e5a234a7c036392e0f9e1e8e48ff3e6855840d"))
(package (package
(name "c-intro-and-ref") (name "c-intro-and-ref")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -83,7 +82,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0c08h8k7wkn5lw0jqnnaayx55d3vf1q11pgsixfw31i58rnwa5y2")))) "0aza4vvlg2w0ss6n5xp741ycvg16d041c1x87yh5hpnzcb6y0ii3"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:phases #~(modify-phases %standard-phases (list #:phases #~(modify-phases %standard-phases
@ -255,7 +254,7 @@ compiler while still keeping it small, simple, fast and understandable.")
(define-public qbe (define-public qbe
(package (package
(name "qbe") (name "qbe")
(version "1.0") (version "1.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -264,7 +263,7 @@ compiler while still keeping it small, simple, fast and understandable.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qx4a3fjjrp2m4dsn19rpbjf89k9w7w7l09s96jx8vv15vzsdgis")))) "07nl1kdgpz7hwfkng0yy4xihk0fmv1a2hq9bxzgvhy3vk9r7fmn8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:make-flags (list #:make-flags

View File

@ -87,7 +87,7 @@
"0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim")))) "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments '(#:tests? #f)) ; tests rely on access to external servers (arguments '(#:tests? #f)) ; tests rely on access to external servers
(home-page "http://libcddb.sourceforge.net/") (home-page "https://libcddb.sourceforge.net/")
(synopsis "C library to access data on a CDDB server") (synopsis "C library to access data on a CDDB server")
(description (description
"Libcddb is a C library to access data on a CDDB server (freedb.org). It "Libcddb is a C library to access data on a CDDB server (freedb.org). It
@ -281,7 +281,7 @@ reconstruction capability.")
(list autoconf automake pkg-config)) (list autoconf automake pkg-config))
(inputs (inputs
(list ao lame libmad libvorbis)) (list ao lame libmad libvorbis))
(home-page "http://cdrdao.sourceforge.net") (home-page "https://cdrdao.sourceforge.net")
(synopsis "Read and write CDs in disk-at-once mode") (synopsis "Read and write CDs in disk-at-once mode")
(description "cdrdao records audio or data CDs in disk-at-once (DAO) mode, (description "cdrdao records audio or data CDs in disk-at-once (DAO) mode,
based on a textual description of the contents. This mode writes the complete based on a textual description of the contents. This mode writes the complete
@ -350,7 +350,7 @@ CD's, DVD's or Blue Ray discs. The most important components are
@command{cdrecord}, a burning program, @command{cdda2wav}, a CD audio ripper @command{cdrecord}, a burning program, @command{cdda2wav}, a CD audio ripper
which uses libparanoia, and @command{mkisofs}, which can create various disc which uses libparanoia, and @command{mkisofs}, which can create various disc
images.") images.")
(home-page "http://cdrtools.sourceforge.net/private/cdrecord.html") (home-page "https://cdrtools.sourceforge.net/private/cdrecord.html")
;; mkisofs is GPL, the other programs are CDDL. ;; mkisofs is GPL, the other programs are CDDL.
(license (list cddl1.0 gpl2)))) (license (list cddl1.0 gpl2))))
@ -573,7 +573,7 @@ the data.")
(package (package
(name "cd-discid") (name "cd-discid")
(version "1.4") (version "1.4")
(home-page "http://linukz.org/cd-discid.shtml") (home-page "https://linukz.org/cd-discid.shtml")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://linukz.org/download/cd-discid-" (uri (string-append "http://linukz.org/download/cd-discid-"

View File

@ -41,6 +41,8 @@
;;; Copyright © 2022 David Elsing <david.elsing@posteo.net> ;;; Copyright © 2022 David Elsing <david.elsing@posteo.net>
;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2022 jgart <jgart@dismail.de> ;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -70,6 +72,8 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#: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)
@ -78,6 +82,7 @@
#: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 python-science) #:use-module (gnu packages python-science)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix utils) #:use-module (guix utils)
@ -90,6 +95,7 @@
#: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 guile)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
#:use-module (guix build-system pyproject) #:use-module (guix build-system pyproject)
#:use-module (guix build-system python) #:use-module (guix build-system python)
@ -351,7 +357,7 @@ testing of Unix command lines.")
(lambda _ (invoke "autoreconf" "-vfi")))))) (lambda _ (invoke "autoreconf" "-vfi"))))))
(native-inputs (native-inputs
(list automake autoconf libtool)) (list automake autoconf libtool))
(home-page "http://cunit.sourceforge.net/") (home-page "https://cunit.sourceforge.net/")
(synopsis "Automated testing framework for C") (synopsis "Automated testing framework for C")
(description (description
"CUnit is a lightweight system for writing, administering, and running "CUnit is a lightweight system for writing, administering, and running
@ -1024,6 +1030,76 @@ C++ but is used in C and C++ projects and frequently used in embedded systems
but it works for any C/C++ project.") but it works for any C/C++ project.")
(license license:bsd-3))) (license license:bsd-3)))
;; Required by actionlint. The version of `go-github-com-robfig-cron'
;; packaged in Guix is newer and changed some error messages, causing
;; unit tests in actionlint to fail.
(define-public go-github-com-robfig-cron-1.2
(package
(inherit go-github-com-robfig-cron)
(name "go-github-com-robfig-cron")
(version "1.2.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/robfig/cron")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva"))))))
(define-public actionlint
(package
(name "actionlint")
(version "1.6.23")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/rhysd/actionlint")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"07is4920a40zrl7mfldg0az2pisi7f6dv4vh3ijn3nzb4i7fqbni"))))
(build-system go-build-system)
(arguments
'(#:import-path "github.com/rhysd/actionlint/cmd/actionlint"
#:unpack-path "github.com/rhysd/actionlint"
#:install-source? #f))
(inputs (list go-github-com-fatih-color
go-github-com-mattn-go-colorable
go-github-com-mattn-go-runewidth
go-github-com-robfig-cron-1.2
go-golang.org-x-sync-errgroup
go-golang.org-x-sync-semaphore
go-gopkg-in-yaml-v3))
(native-inputs (list go-github-com-google-go-cmp-cmp))
(home-page "https://rhysd.github.io/actionlint/")
(synopsis "Static checker for GitHub Actions workflow files")
(description
"actionlint is a static checker for GitHub Actions
workflow files. Features include:
@itemize
@item Syntax check for workflow files to check unexpected or missing
keys following workflow syntax
@item Strong type check for @code{$@{@{ @}@}} expressions to catch
several semantic errors like access to not existing property, type
mismatches, ...
@item Actions usage check to check that inputs at @code{with:} and
outputs in @code{steps.@{id@}.outputs} are correct
@item Reusable workflow check to check inputs/outputs/secrets of
reusable workflows and workflow calls
@item shellcheck and pyflakes integrations for scripts at @code{run:}
@item Security checks; script injection by untrusted inputs,
hard-coded credentials
@item Other several useful checks; glob syntax validation,
dependencies check for @code{needs:}, runner label validation, cron
syntax validation, ...
@end itemize
")
(license license:expat)))
(define-public python-parameterized (define-public python-parameterized
(package (package
(name "python-parameterized") (name "python-parameterized")
@ -1115,7 +1191,7 @@ available via the @code{unittest.mock} module.")
(add-after 'unpack 'invoke-2to3 (add-after 'unpack 'invoke-2to3
(lambda _ (lambda _
(invoke "2to3" "-w" ".")))))) (invoke "2to3" "-w" "."))))))
(home-page "http://readthedocs.org/docs/nose/") (home-page "https://readthedocs.org/docs/nose/")
(synopsis "Python testing library") (synopsis "Python testing library")
(description (description
"Nose extends the unittest library to make testing easier.") "Nose extends the unittest library to make testing easier.")
@ -2623,6 +2699,24 @@ pragmas to control it from within your code. Additionally, it is
possible to write plugins to add your own checks.") possible to write plugins to add your own checks.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public python-setuptools-lint
(package
(name "python-setuptools-lint")
(version "0.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "setuptools-lint" version))
(sha256
(base32
"16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577"))))
(build-system python-build-system)
(propagated-inputs (list python-pylint))
(home-page "https://github.com/johnnoone/setuptools-pylint")
(synopsis "Run pylint with @command{python setup.py lint}")
(description "This package expose pylint as a lint command into
setup.py.")
(license license:bsd-3)))
(define-public python-paramunittest (define-public python-paramunittest
(package (package
(name "python-paramunittest") (name "python-paramunittest")
@ -3029,7 +3123,7 @@ retried.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv")))))) (invoke "pytest" "-vv"))))))
(home-page "http://hamcrest.org/") (home-page "https://hamcrest.org/")
(synopsis "Hamcrest matchers for Python") (synopsis "Hamcrest matchers for Python")
(description "PyHamcrest is a framework for writing matcher objects, (description "PyHamcrest is a framework for writing matcher objects,
allowing you to declaratively define \"match\" rules.") allowing you to declaratively define \"match\" rules.")
@ -3395,3 +3489,79 @@ directories and files.")
tables by saving expected data in a data directory (courtesy of pytest-datadir) tables by saving expected data in a data directory (courtesy of pytest-datadir)
that can be used to verify that future runs produce the same data.") that can be used to verify that future runs produce the same data.")
(license license:expat))) (license license:expat)))
(define-public guile-proba
(package
(name "guile-proba")
(version "0.3.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://codeberg.org/luis-felipe/guile-proba")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "1mjnrbb6gv5f95i1ihn75yh7ya445pcnj13cy34x2v58h9n2r80s"))))
(build-system guile-build-system)
(inputs (list bash-minimal guile-3.0))
(native-inputs (list texinfo))
(propagated-inputs (list guile-config guile-lib))
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'set-paths 'add-output-to-guile-load-paths
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(guile-version (target-guile-effective-version))
(scm-path (string-append out
"/share/guile/site/"
guile-version))
(go-path (string-append out
"/lib/guile/"
guile-version
"/site-ccache")))
(setenv "GUILE_LOAD_PATH"
(string-append scm-path ":"
(getenv "GUILE_LOAD_PATH")))
(setenv "GUILE_LOAD_COMPILED_PATH"
(string-append
go-path ":"
(getenv "GUILE_LOAD_COMPILED_PATH"))))))
(add-after 'build 'build-manual
(lambda _
(invoke "makeinfo" "manual/main.texi")))
(add-after 'build 'check
(lambda _
(invoke "guile" "proba.scm" "run" "tests")))
(add-after 'install 'install-wrapped-script
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin-dir (string-append out "/bin"))
(script (string-append bin-dir "/proba")))
(mkdir-p bin-dir)
(copy-file "proba.scm" script)
(chmod script #o555)
(wrap-program script
`("GUILE_LOAD_PATH" = (,(getenv "GUILE_LOAD_PATH")))
`("GUILE_LOAD_COMPILED_PATH" =
(,(getenv "GUILE_LOAD_COMPILED_PATH")))))))
(add-after 'install 'install-manual
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(info-dir (string-append out "/share/info")))
(mkdir-p info-dir)
(install-file "guile-proba" info-dir)))))
#:scheme-file-regexp
#~(begin
(use-modules (ice-9 regex))
(lambda (file stat) (string-match "/proba/.*\\.scm$" file)))))
(home-page "https://luis-felipe.gitlab.io/guile-proba/")
(synopsis "Testing tools for GNU Guile projects with SRFI 64 test suites")
(description
"This software is a set of testing tools for GNU Guile projects
with SRFI 64-based test suites. It comes with a command-line interface
to run test collections, and a library that includes a test runner and
helpers for writing tests.")
(license license:public-domain)))

View File

@ -67,7 +67,6 @@
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system python)) #:use-module (guix build-system python))
@ -425,7 +424,7 @@ stored with user-specified precision.")
perl perl
tinyxml2 tinyxml2
tng)) tng))
(home-page "http://www.gromacs.org/") (home-page "https://www.gromacs.org/")
(synopsis "Molecular dynamics software package") (synopsis "Molecular dynamics software package")
(description "GROMACS is a versatile package to perform molecular dynamics, (description "GROMACS is a versatile package to perform molecular dynamics,
i.e. simulate the Newtonian equations of motion for systems with hundreds to i.e. simulate the Newtonian equations of motion for systems with hundreds to

View File

@ -4,7 +4,7 @@
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com> ;;; Copyright © 2021, 2022, 2023 Philip McGrath <philip@philipmcgrath.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -251,10 +251,9 @@ provided and is #f."
(if (target-64bit? system) (if (target-64bit? system)
"64" "64"
"32") "32")
;; missing (guix utils) predicate target-little-endian? (if (target-little-endian? system)
(if (target-ppc32? system) "l"
"b" "b")))
"l")))
(define* (racket-cs-native-supported-system? #:optional (define* (racket-cs-native-supported-system? #:optional
(system (system
@ -467,7 +466,7 @@ and 32-bit PowerPC architectures.")
(package (package
(inherit chez-scheme) (inherit chez-scheme)
(name "chez-scheme-for-racket") (name "chez-scheme-for-racket")
(version "9.5.9.8") (version "9.9.9-pre-release.14")
;; The version should match `scheme-version`. ;; The version should match `scheme-version`.
;; See racket/src/ChezScheme/s/cmacros.ss c. line 360. ;; See racket/src/ChezScheme/s/cmacros.ss c. line 360.
;; It will always be different than the upstream version! ;; It will always be different than the upstream version!
@ -1239,7 +1238,7 @@ syntax, with various aliases for commonly used patterns.")
(replace 'install (replace 'install
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key (make-flags '()) #:allow-other-keys)
(apply invoke "make" "chez-install" make-flags)))))) (apply invoke "make" "chez-install" make-flags))))))
(home-page "http://synthcode.com/scheme/fmt") (home-page "https://synthcode.com/scheme/fmt")
(synopsis "Combinator formatting library for Chez Scheme") (synopsis "Combinator formatting library for Chez Scheme")
(description "This package provides a library of procedures for (description "This package provides a library of procedures for
formatting Scheme objects to text in various ways, and for easily formatting Scheme objects to text in various ways, and for easily

View File

@ -330,6 +330,23 @@ and workspaces that can be used in the compiler environment of your choice.")
(package (package
(inherit cmake-minimal) (inherit cmake-minimal)
(name "cmake") (name "cmake")
(version "3.25.1")
(source (origin
(inherit (package-source cmake-minimal))
(method url-fetch)
(uri (string-append "https://cmake.org/files/v"
(version-major+minor version)
"/cmake-" version ".tar.gz"))
(snippet (match (origin-snippet (package-source cmake-minimal))
(('begin ('define 'preserved-files ('quote x))
rest ...)
`(begin (define preserved-files
',(cons "Utilities/cmelf" x))
,@rest))))
(sha256
(base32
"1n4inb3fvk70sni5gmkljqw3cyllalyg3fnr9rlr7x3aa44isl8w"))
(patches (search-patches "cmake-curl-certificates-3.24.patch"))))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
(substitute-keyword-arguments (package-arguments cmake-minimal) (substitute-keyword-arguments (package-arguments cmake-minimal)

View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2015, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2018, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
@ -323,7 +323,7 @@ COCOMO model or user-provided parameters.")
(define-public cloc (define-public cloc
(package (package
(name "cloc") (name "cloc")
(version "1.94") (version "1.96.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -332,7 +332,7 @@ COCOMO model or user-provided parameters.")
(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 "082kkzr168lkv35hvijq95b817lyj2azcwld47xpws9h35556jlv")))) (base32 "0j7qwc5n1y05jl3rq83mf1d0pavkz9z0waqi8dxblkgw4pwwnjyv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list coreutils (list coreutils
@ -430,7 +430,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(define-public universal-ctags (define-public universal-ctags
(package (package
(name "universal-ctags") (name "universal-ctags")
(version "6.0.20230122.0") (version "6.0.20230212.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -440,7 +440,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"121d1dyc3wd4bzv4wky3x66j1va3d6ywbw71abp3l88fv7sc0f73")) "0616y8sqbydh4baixs1fndknjvhfpf57p7a0yr1l5n732lknk2pm"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -475,7 +475,7 @@ features that are not supported by the standard @code{stdio} implementation.")
(substitute* "Tmain/utils.sh" (substitute* "Tmain/utils.sh"
(("/bin/echo") (which "echo")))))))) (("/bin/echo") (which "echo"))))))))
(native-inputs (native-inputs
(list autoconf automake packcc perl pkg-config)) (list autoconf automake packcc perl pkg-config python-docutils))
(inputs (inputs
(list jansson libseccomp libxml2 libyaml pcre2)) (list jansson libseccomp libxml2 libyaml pcre2))
(home-page "https://ctags.io/") (home-page "https://ctags.io/")
@ -580,7 +580,7 @@ stack traces.")
`("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))) `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))
#t))))) #t)))))
(inputs (list perl perl-io-compress perl-json)) (inputs (list perl perl-io-compress perl-json))
(home-page "http://ltp.sourceforge.net/coverage/lcov.php") (home-page "https://ltp.sourceforge.net/coverage/lcov.php")
(synopsis "Code coverage tool that enhances GNU gcov") (synopsis "Code coverage tool that enhances GNU gcov")
(description "LCOV is an extension of @command{gcov}, a tool part of the (description "LCOV is an extension of @command{gcov}, a tool part of the
GNU@tie{}Binutils, which provides information about what parts of a program GNU@tie{}Binutils, which provides information about what parts of a program
@ -809,7 +809,7 @@ independent targets.")
(install-file l etcdir)) (install-file l etcdir))
(find-files "etc" "\\.cfg$"))) (find-files "etc" "\\.cfg$")))
#t))))) #t)))))
(home-page "http://uncrustify.sourceforge.net/") (home-page "https://uncrustify.sourceforge.net/")
(synopsis "Code formatter for C and other related languages") (synopsis "Code formatter for C and other related languages")
(description (description
"Beautify source code in many languages of the C family (C, C++, C#, "Beautify source code in many languages of the C family (C, C++, C#,
@ -875,7 +875,7 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features:
(make-so-link sofile "(\\.[0-9]){2}$")) ;; link .so.3 (make-so-link sofile "(\\.[0-9]){2}$")) ;; link .so.3
(find-files libdir "lib.*\\.so\\..*"))) (find-files libdir "lib.*\\.so\\..*")))
#t))))) #t)))))
(home-page "http://astyle.sourceforge.net/") (home-page "https://astyle.sourceforge.net/")
(synopsis "Source code indenter, formatter, and beautifier") (synopsis "Source code indenter, formatter, and beautifier")
(description (description
"Artistic Style is a source code indenter, formatter, and beautifier for "Artistic Style is a source code indenter, formatter, and beautifier for
@ -1076,7 +1076,7 @@ Readline library.")
;; on SysV curses. ;; on SysV curses.
(list (string-append "--with-ncurses=" (list (string-append "--with-ncurses="
(assoc-ref %build-inputs "ncurses"))))) (assoc-ref %build-inputs "ncurses")))))
(home-page "http://cscope.sourceforge.net") (home-page "https://cscope.sourceforge.net")
(synopsis "Tool for browsing source code") (synopsis "Tool for browsing source code")
(description (description
"Cscope is a text screen based source browsing tool. Although it is "Cscope is a text screen based source browsing tool. Although it is

View File

@ -3242,7 +3242,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; This package must be public because other modules refer to it. However, ;; This package must be public because other modules refer to it. However,
;; mark it as hidden so that 'fold-packages' ignores it. ;; mark it as hidden so that 'fold-packages' ignores it.
(with-boot4 (hidden-package (with-boot4 (hidden-package
(package-with-bootstrap-guile guile-3.0/fixed)))) (package-with-bootstrap-guile guile-3.0/pinned))))
(define-public glibc-utf8-locales-final (define-public glibc-utf8-locales-final
;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed

View File

@ -1368,7 +1368,7 @@ for most inputs, but the resulting compressed files are anywhere from 20% to
((target-x86-32?) ((target-x86-32?)
(list nasm)) (list nasm))
(else '()))) (else '())))
(home-page "http://p7zip.sourceforge.net/") (home-page "https://p7zip.sourceforge.net/")
(synopsis "Command-line file archiver with high compression ratio") (synopsis "Command-line file archiver with high compression ratio")
(description "p7zip is a command-line port of 7-Zip, a file archiver that (description "p7zip is a command-line port of 7-Zip, a file archiver that
handles the 7z format which features very high compression ratios.") handles the 7z format which features very high compression ratios.")
@ -2530,7 +2530,7 @@ file compression algorithm.")
(define-public xarchiver (define-public xarchiver
(package (package
(name "xarchiver") (name "xarchiver")
(version "0.5.4.17") (version "0.5.4.20")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -2539,7 +2539,7 @@ file compression algorithm.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "00adrjpxqlaccrwjf65w3vhxfswdj0as8aj263c6f9b85llypc5v")))) (base32 "1bgc8r2ii96ghslfscpjhswjgscvw65h2rjr0zvfqn8saqh1ydrv"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
(list gettext-minimal intltool libxslt pkg-config)) (list gettext-minimal intltool libxslt pkg-config))
@ -2760,6 +2760,27 @@ serializations such as ASN.1 and MessagePack.")
(license license:expat) (license license:expat)
(home-page "https://github.com/PJK/libcbor"))) (home-page "https://github.com/PJK/libcbor")))
(define-public lzfse
(package
(name "lzfse")
(version "1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/lzfse/lzfse")
(commit (string-append "lzfse-" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5"))))
(build-system cmake-build-system)
(home-page "https://github.com/lzfse/lzfse")
(synopsis "LZFSE compression library and command line tool")
(description "LZFSE is a Lempel-Ziv style data compression algorithm using
Finite State Entropy coding. It targets similar compression rates at higher
compression and decompression speed compared to Deflate using Zlib.")
(license license:bsd-3)))
(define-public fcrackzip (define-public fcrackzip
(package (package
(name "fcrackzip") (name "fcrackzip")

View File

@ -97,7 +97,7 @@
go-golang-org-x-net go-golang-org-x-net
go-golang-org-x-oauth2 go-golang-org-x-oauth2
go-github-com-rogpeppe-go-internal go-github-com-rogpeppe-go-internal
gopkg-in-errgo-fmt-errors)) go-gopkg-in-errgo-fmt-errors))
(home-page "https://www.chezmoi.io/") (home-page "https://www.chezmoi.io/")
(synopsis "Personal configuration files manager") (synopsis "Personal configuration files manager")
(description "This package helps to manage personal configuration files (description "This package helps to manage personal configuration files

View File

@ -26,6 +26,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system copy)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system meson) #:use-module (guix build-system meson)
@ -46,7 +47,8 @@
#:use-module (gnu packages selinux) #:use-module (gnu packages selinux)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
#:use-module (gnu packages web)) #:use-module (gnu packages web)
#:use-module (gnu packages wget))
(define-public crun (define-public crun
(let ((commit "c381048530aa750495cf502ddb7181f2ded5b400")) (let ((commit "c381048530aa750495cf502ddb7181f2ded5b400"))
@ -153,6 +155,41 @@ manager (like Podman or CRI-O) and an Open Container Initiative (OCI)
runtime (like runc or crun) for a single container.") runtime (like runc or crun) for a single container.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public distrobox
(package
(name "distrobox")
(version "1.4.2.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/89luca89/distrobox")
(commit version)))
(sha256
(base32 "0gs81m1bvlyq6ad22zsdsw1q6s3agy79vx94kdf6zjzngbanlydk"))
(file-name (git-file-name name version))))
(build-system copy-build-system)
(inputs
(list podman wget))
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-before 'install 'refer-to-inputs
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "." "^distrobox.*[^1]$")
(("podman") (search-input-file inputs "/bin/podman"))
(("wget") (search-input-file inputs "/bin/wget"))
(("command -v") "test -x"))))
(replace 'install
(lambda _
(invoke "./install" "--prefix" #$output))))))
(home-page "https://distrobox.privatedns.org/")
(synopsis "Create and start containers highly integrated with the hosts")
(description
"Distrobox is a fancy wrapper around Podman or Docker to create and start
containers highly integrated with the hosts.")
(license license:gpl3)))
(define-public libslirp (define-public libslirp
(package (package
(name "libslirp") (name "libslirp")
@ -274,15 +311,19 @@ configure network interfaces in Linux containers.")
(define-public podman (define-public podman
(package (package
(name "podman") (name "podman")
(version "4.3.1") (version "4.4.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/containers/podman") (url "https://github.com/containers/podman")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(modules '((guix build utils)))
;; FIXME: Btrfs libraries not detected by these scripts.
(snippet '(substitute* "Makefile"
((".*hack/btrfs.*") "")))
(sha256 (sha256
(base32 "05hv4xdf06n728lmsx793zygypc9i404bgcgpy0fyrg8c2s11q2h")) (base32 "0qbr6rbyig3c2hvdvmd94jjkg820hpdz6j7dgyv62dl6wfwvj5jj"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -344,7 +385,7 @@ configure network interfaces in Linux containers.")
(native-inputs (native-inputs
(list bats (list bats
git git
go go-1.19
; strace ; XXX debug ; strace ; XXX debug
pkg-config pkg-config
python)) python))

View File

@ -42,7 +42,6 @@
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (guix build-system dune) #:use-module (guix build-system dune)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system ocaml)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)

View File

@ -1428,6 +1428,27 @@ queues header library based on circular buffer with @code{std::atomic}.")
conversions to and from strings, iteration and related functionality.") conversions to and from strings, iteration and related functionality.")
(license license:expat))) (license license:expat)))
(define-public mcpp
(package
(name "mcpp")
(version "2.7.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/mcpp/mcpp/"
"V." version "/mcpp-" version ".tar.gz"))
(sha256
(base32
"0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv"))))
(build-system gnu-build-system)
(arguments
(list #:configure-flags #~(list "--enable-mcpplib" "--disable-static")))
(home-page "https://mcpp.sourceforge.net/")
(synopsis "C/C++ preprocessor")
(description
"@code{mcpp} is Matsui's CPP implementation precisely conformed to
standards.")
(license license:bsd-2)))
(define-public cli11 (define-public cli11
(package (package
(name "cli11") (name "cli11")
@ -1818,7 +1839,7 @@ syntax with variables, conditions, functions and more.")
(define-public simdjson (define-public simdjson
(package (package
(name "simdjson") (name "simdjson")
(version "1.0.2") (version "3.1.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1827,7 +1848,7 @@ syntax with variables, conditions, functions and more.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"05i5jnqd7ngps79cws16ls48gnx08ykkkib3n2hbrdhr1wwrnv7a")))) "0q784bm8xbz3p782dw02cdds6m71wk3acy94vva8krc9g88142ws"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; tests require downloading dependencies '(#:tests? #f ; tests require downloading dependencies

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
;;; Copyright © 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 20192021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 20192021 Tobias Geerinckx-Rice <me@tobias.gr>
@ -17761,6 +17761,26 @@ from macros.")
@code{Cargo.toml}.") @code{Cargo.toml}.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
(define-public rust-downcast-0.11
(package
(name "rust-downcast")
(version "0.11.0")
(source (origin
(method url-fetch)
(uri (crate-uri "downcast" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1wa78ahlc57wmqyq2ncr80l7plrkgz57xsg7kfzgpcnqac8gld8l"))))
(build-system cargo-build-system)
(home-page "https://github.com/fkoep/downcast-rs")
(synopsis
"Trait for downcasting trait objects back to their original types")
(description
"This package provides a trait, and utilities, for downcasting trait
objects back to their original types. The same as the rust-downcast-rs crate.")
(license license:expat)))
(define-public rust-downcast-rs-1 (define-public rust-downcast-rs-1
(package (package
(name "rust-downcast-rs") (name "rust-downcast-rs")
@ -26033,6 +26053,30 @@ Hash-based Message Authentication Code algorithm} for SHA1.")
"This package provides a library for HTML entity encoding and decoding.") "This package provides a library for HTML entity encoding and decoding.")
(license (list license:asl2.0 license:expat license:mpl2.0)))) (license (list license:asl2.0 license:expat license:mpl2.0))))
(define-public rust-html-escape-0.2
(package
(name "rust-html-escape")
(version "0.2.12")
(source (origin
(method url-fetch)
(uri (crate-uri "html-escape" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"01f2v3c6j2rk5h2lhdbh62j07cm1fvzqw4vplj2sms83jpx5qc8m"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-utf8-width" ,rust-utf8-width-0.1))
#:cargo-development-inputs
(("rust-bencher" ,rust-bencher-0.1))))
(home-page "https://magiclen.org/html-escape")
(synopsis "Library for encoding and escaping special characters in HTML")
(description
"This package provides a library for encoding and escaping special
characters in HTML, decoding and unescaping HTML entities as well.")
(license license:expat)))
(define-public rust-hts-sys-2 (define-public rust-hts-sys-2
(package (package
(name "rust-hts-sys") (name "rust-hts-sys")
@ -33689,6 +33733,92 @@ IOCP and Async I/O abstractions.")
#:cargo-development-inputs #:cargo-development-inputs
(("rust-rand" ,rust-rand-0.3)))))) (("rust-rand" ,rust-rand-0.3))))))
(define-public rust-mockall-0.11
(package
(name "rust-mockall")
(version "0.11.1")
(source (origin
(method url-fetch)
(uri (crate-uri "mockall" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0k3g3xxf195vsnzmwza047dv89zlg6h5yj5774wjlndgpdvf8han"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Not all files included.
#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
("rust-downcast" ,rust-downcast-0.11)
("rust-fragile" ,rust-fragile-1)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-mockall-derive" ,rust-mockall-derive-0.11)
("rust-predicates" ,rust-predicates-2)
("rust-predicates-tree" ,rust-predicates-tree-1))
#:cargo-development-inputs
(("rust-async-trait" ,rust-async-trait-0.1)
("rust-futures" ,rust-futures-0.3)
("rust-mockall-double" ,rust-mockall-double-0.3)
("rust-serde" ,rust-serde-1)
("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-tracing" ,rust-tracing-0.1))))
(home-page "https://github.com/asomers/mockall")
(synopsis "Mock object library for Rust")
(description
"Mockall is a rich mocking library with a terse and ergonomic interface.")
(license (list license:expat license:asl2.0))))
(define-public rust-mockall-derive-0.11
(package
(name "rust-mockall-derive")
(version "0.11.1")
(source (origin
(method url-fetch)
(uri (crate-uri "mockall-derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1ixhmsrg5ky4b2jlvbxhlpr3mbv7frd6wr8msm005vijb5rmcb96"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))
#:cargo-development-inputs
(("rust-pretty-assertions" ,rust-pretty-assertions-0.7))))
(home-page "https://github.com/asomers/mockall")
(synopsis "Procedural macros for the Mockall crate")
(description
"This package procides procedural macros for the Mockall crate.")
(license (list license:expat license:asl2.0))))
(define-public rust-mockall-double-0.3
(package
(name "rust-mockall-double")
(version "0.3.0")
(source (origin
(method url-fetch)
(uri (crate-uri "mockall-double" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1xk6hjr7m73zly4hg3zmma437vqvrwnjxy2wfxy1hxbk52xwfwdf"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))
(home-page "https://github.com/asomers/mockall")
(synopsis "Double test adapter that works well with Mockall")
(description
"This crate makes it even easier to use mocking by providing a way to
select the mock struct at compile time. Used with the Mockall crate.")
(license (list license:expat license:asl2.0))))
(define-public rust-model-0.1 (define-public rust-model-0.1
(package (package
(name "rust-model") (name "rust-model")
@ -35286,7 +35416,7 @@ structures.")
("rust-time" ,rust-time-0.1) ("rust-time" ,rust-time-0.1)
("rust-typemap" ,rust-typemap-0.3) ("rust-typemap" ,rust-typemap-0.3)
("rust-url" ,rust-url-1)))) ("rust-url" ,rust-url-1))))
(home-page "http://nickel-org.github.io/") (home-page "https://nickel-org.github.io/")
(synopsis "Web application framework for Rust") (synopsis "Web application framework for Rust")
(description (description
"@code{nickel.rs} is a simple and lightweight foundation for web "@code{nickel.rs} is a simple and lightweight foundation for web
@ -35384,8 +35514,36 @@ nitrokey crate and others using it.")
nitrokey-test crate.") nitrokey-test crate.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public rust-nix-0.26
(package
(name "rust-nix")
(version "0.26.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "nix" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "155610n6bp37sqg7p0qihzi0jnvqkpqc40nyik89frbc6lfqv9a6"))))
(build-system cargo-build-system)
(arguments
(list #:skip-build? #t
#:cargo-inputs
`(("rust-bitflags" ,rust-bitflags-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-libc" ,rust-libc-0.2)
("rust-memoffset" ,rust-memoffset-0.7))))
(home-page "https://github.com/nix-rust/nix")
(synopsis "Rust friendly bindings to *nix APIs")
(description
"Nix seeks to provide friendly bindings to various *nix platform APIs.
The goal is to not provide a 100% unified interface, but to unify what can be
while still providing platform specific APIs.")
(license license:expat)))
(define-public rust-nix-0.24 (define-public rust-nix-0.24
(package (package
(inherit rust-nix-0.26)
(name "rust-nix") (name "rust-nix")
(version "0.24.2") (version "0.24.2")
(source (source
@ -35395,21 +35553,13 @@ nitrokey-test crate.")
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "1z35n1bhzslr7zawy2c0fl90jjy9l5b3lnsidls3908vfk0xnp0r")))) (base32 "1z35n1bhzslr7zawy2c0fl90jjy9l5b3lnsidls3908vfk0xnp0r"))))
(build-system cargo-build-system)
(arguments (arguments
(list #:skip-build? #t (list #:skip-build? #t
#:cargo-inputs #:cargo-inputs
`(("rust-bitflags" ,rust-bitflags-1) `(("rust-bitflags" ,rust-bitflags-1)
("rust-cfg-if" ,rust-cfg-if-1) ("rust-cfg-if" ,rust-cfg-if-1)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-memoffset" ,rust-memoffset-0.6)))) ("rust-memoffset" ,rust-memoffset-0.6))))))
(home-page "https://github.com/nix-rust/nix")
(synopsis "Rust friendly bindings to *nix APIs")
(description
"Nix seeks to provide friendly bindings to various *nix platform APIs.
The goal is to not provide a 100% unified interface, but to unify what can be
while still providing platform specific APIs.")
(license license:expat)))
(define-public rust-nix-0.23 (define-public rust-nix-0.23
(package (package
@ -43105,6 +43255,80 @@ language.")
language.") language.")
(license license:asl2.0))) (license license:asl2.0)))
;; It's recommended that rust-protobuf, rust-protobuf-codegen
;; and rust-probuf-codegen-pure be the same version
(define-public rust-protobuf-2
(package
(name "rust-protobuf")
(version "2.14.0")
(source (origin
(method url-fetch)
(uri (crate-uri "protobuf" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"11bl8hf522s9mbkckivnn9n8s3ss4g41w6jmfdsswmr5adqd71lf"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; missing files in the release tarball.
#:cargo-inputs
(("rust-bytes" ,rust-bytes-0.5)
("rust-serde" ,rust-serde-1)
("rust-serde-derive" ,rust-serde-derive-1))))
(home-page "https://github.com/stepancheg/rust-protobuf/")
(synopsis "Rust implementation of Google protocol buffers")
(description
"This package provides a library to read and write protocol buffer's data.")
(license license:expat)))
;; It's recommended that rust-protobuf, rust-protobuf-codegen
;; and rust-probuf-codegen-pure be the same version
(define-public rust-protobuf-codegen-2
(package
(name "rust-protobuf-codegen")
(version "2.14.0")
(source (origin
(method url-fetch)
(uri (crate-uri "protobuf-codegen" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"031bx325lsgcx7wc76vc2cqph6q0b34jgc8nz0g2rkwcfnx3n4fy"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-protobuf" ,rust-protobuf-2))))
(home-page "https://github.com/stepancheg/rust-protobuf/")
(synopsis "Code generator for rust-protobuf")
(description
"This package provides a code generator for rust-protobuf. It includes a
library to invoke programmatically (e.g. from @code{build.rs}) and
@code{protoc-gen-rust} binary.")
(license license:expat)))
;; It's recommended that rust-protobuf, rust-protobuf-codegen
;; and rust-probuf-codegen-pure be the same version
(define-public rust-protobuf-codegen-pure-2
(package
(name "rust-protobuf-codegen-pure")
(version "2.14.0")
(source (origin
(method url-fetch)
(uri (crate-uri "protobuf-codegen-pure" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0h34gfqlb7bqmgqv1mfgy5wk35z5r2h5ki3p3pdcmw1vqzmly6id"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-protobuf" ,rust-protobuf-2)
("rust-protobuf-codegen" ,rust-protobuf-codegen-2))))
(home-page "https://github.com/stepancheg/rust-protobuf/")
(synopsis "Pure-rust codegen for protobuf using protobuf-parser")
(description "This package provides a pure-rust codegen for protobuf
using protobuf-parser.")
(license license:expat)))
(define-public rust-psl-2 (define-public rust-psl-2
(package (package
(name "rust-psl") (name "rust-psl")
@ -53909,6 +54133,28 @@ Unicode strings.")
I/O programming.") I/O programming.")
(license license:expat))) (license license:expat)))
(define-public rust-smallbitvec-2
(package
(name "rust-smallbitvec")
(version "2.5.1")
(source (origin
(method url-fetch)
(uri (crate-uri "smallbitvec" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0plrbldsjpwip3afbzd8fgrnvdhizcg5z4ncfqs4q6x4qjflzkkm"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-development-inputs
(("rust-bit-vec" ,rust-bit-vec-0.4)
("rust-rand" ,rust-rand-0.4))))
(home-page "https://github.com/servo/smallbitvec")
(synopsis "Bit vector optimized for size and inline storage")
(description "This package provides a bit vector optimized for size and
inline storage.")
(license (list license:expat license:asl2.0))))
(define-public rust-smallvec-1 (define-public rust-smallvec-1
(package (package
(name "rust-smallvec") (name "rust-smallvec")
@ -56062,7 +56308,7 @@ and Jaro-Winkler.")
(define-public rust-structopt-0.3 (define-public rust-structopt-0.3
(package (package
(name "rust-structopt") (name "rust-structopt")
(version "0.3.21") (version "0.3.26")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -56071,14 +56317,27 @@ and Jaro-Winkler.")
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"136j0lvjmpv5syi751vxg8vb30gfyv4k81x8d18kxrj6xvbsqxsj")))) "043sg3qxllann6q9i71d05qp3q13scmcvhxhd950ka2v8ij5qsqc"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:skip-build? #t `(#:skip-build? #t
#:cargo-inputs #:cargo-inputs
(("rust-structopt-derive" ,rust-structopt-derive-0.4) (("rust-structopt-derive" ,rust-structopt-derive-0.4)
("rust-lazy-static" ,rust-lazy-static-1) ("rust-lazy-static" ,rust-lazy-static-1)
("rust-clap" ,rust-clap-2)))) ("rust-paw" ,rust-paw-1)
("rust-clap" ,rust-clap-2))
#:cargo-development-inputs
(("rust-strum" ,rust-strum-0.21)
("rust-trybuild" ,rust-trybuild-1)
("rust-rustversion" ,rust-rustversion-1))
#:phases
(modify-phases %standard-phases
(add-before 'build 'fixup-cargo-toml
(lambda _
(substitute* "Cargo.toml"
;; feature does not exist
(("lints.*") "")
(("2.33") ,(package-version rust-clap-2))))))))
(home-page "https://github.com/TeXitoi/structopt") (home-page "https://github.com/TeXitoi/structopt")
(synopsis "Parse command line argument by defining a struct") (synopsis "Parse command line argument by defining a struct")
(description (description
@ -56113,7 +56372,7 @@ struct.")
(define-public rust-structopt-derive-0.4 (define-public rust-structopt-derive-0.4
(package (package
(name "rust-structopt-derive") (name "rust-structopt-derive")
(version "0.4.14") (version "0.4.18")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -56122,7 +56381,7 @@ struct.")
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"143gjwvz3s86hwp070km83y25n8kqp5f01kb1dr19f4ilkywvaav")))) "1q5gcigmvw0cinjxzpyrkflliq5r1ivljmrvfrl3phcwgwraxdfw"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:skip-build? #t `(#:skip-build? #t
@ -59407,7 +59666,7 @@ fixed set of worker threads.")
("rust-log" ,rust-log-0.4) ("rust-log" ,rust-log-0.4)
("rust-ordered-float" ,rust-ordered-float-1) ("rust-ordered-float" ,rust-ordered-float-1)
("rust-threadpool" ,rust-threadpool-1)))) ("rust-threadpool" ,rust-threadpool-1))))
(home-page "http://thrift.apache.org") (home-page "https://thrift.apache.org")
(synopsis "Rust bindings for the Apache Thrift RPC system") (synopsis "Rust bindings for the Apache Thrift RPC system")
(description (description
"This crate provides Rust bindings for the Apache Thrift RPC system.") "This crate provides Rust bindings for the Apache Thrift RPC system.")
@ -62512,7 +62771,7 @@ etc. distance calculations and string search.")
("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20) ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20)
("rust-webpki" ,rust-webpki-0.21) ("rust-webpki" ,rust-webpki-0.21)
("rust-webpki-roots" ,rust-webpki-roots-0.21)))) ("rust-webpki-roots" ,rust-webpki-roots-0.21))))
(home-page "http://www.trust-dns.org/index.html") (home-page "https://www.trust-dns.org/index.html")
(synopsis "DNS over HTTPS extension for the Trust-DNS client") (synopsis "DNS over HTTPS extension for the Trust-DNS client")
(description (description
"Trust-DNS is a safe and secure DNS library. This is an extension for "Trust-DNS is a safe and secure DNS library. This is an extension for
@ -62646,7 +62905,7 @@ the Trust-DNS client to use DNS over HTTPS.")
("rust-tokio" ,rust-tokio-1) ("rust-tokio" ,rust-tokio-1)
("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)
("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)))) ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20))))
(home-page "http://www.trust-dns.org/index.html") (home-page "https://www.trust-dns.org/index.html")
(synopsis "native-tls extension for the Trust-DNS client") (synopsis "native-tls extension for the Trust-DNS client")
(description "Trust-DNS is a safe and secure DNS library. This is an (description "Trust-DNS is a safe and secure DNS library. This is an
extension for the Trust-DNS client to use native-tls for TLS.") extension for the Trust-DNS client to use native-tls for TLS.")
@ -62744,7 +63003,7 @@ extension for the Trust-DNS client to use native-tls for TLS.")
("rust-tokio" ,rust-tokio-1) ("rust-tokio" ,rust-tokio-1)
("rust-tokio-openssl" ,rust-tokio-openssl-0.6) ("rust-tokio-openssl" ,rust-tokio-openssl-0.6)
("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)))) ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20))))
(home-page "http://www.trust-dns.org/index.html") (home-page "https://www.trust-dns.org/index.html")
(synopsis "tokio-openssl extension for the Trust-DNS client") (synopsis "tokio-openssl extension for the Trust-DNS client")
(description "Trust-DNS is a safe and secure DNS library. This is an (description "Trust-DNS is a safe and secure DNS library. This is an
extension for the Trust-DNS client to use tokio-openssl for TLS.") extension for the Trust-DNS client to use tokio-openssl for TLS.")
@ -62862,7 +63121,7 @@ extension for the Trust-DNS client to use tokio-openssl for TLS.")
("rust-tokio" ,rust-tokio-1) ("rust-tokio" ,rust-tokio-1)
("rust-url" ,rust-url-2) ("rust-url" ,rust-url-2)
("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))))
(home-page "http://www.trust-dns.org/index.html") (home-page "https://www.trust-dns.org/index.html")
(synopsis "Safe and secure DNS library") (synopsis "Safe and secure DNS library")
(description (description
"Trust-DNS is a safe and secure DNS library. This is the foundational "Trust-DNS is a safe and secure DNS library. This is the foundational
@ -63022,7 +63281,7 @@ DNS protocol library for all Trust-DNS projects.")
("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20) ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)
("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20) ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20)
("rust-webpki-roots" ,rust-webpki-roots-0.21)))) ("rust-webpki-roots" ,rust-webpki-roots-0.21))))
(home-page "http://www.trust-dns.org/index.html") (home-page "https://www.trust-dns.org/index.html")
(synopsis "Safe and secure DNS library") (synopsis "Safe and secure DNS library")
(description (description
"Trust-DNS is a safe and secure DNS library. This Resolver library uses "Trust-DNS is a safe and secure DNS library. This Resolver library uses
@ -63171,7 +63430,7 @@ other queries.")
("rust-tokio-rustls" ,rust-tokio-rustls-0.22) ("rust-tokio-rustls" ,rust-tokio-rustls-0.22)
("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20) ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)
("rust-webpki" ,rust-webpki-0.21)))) ("rust-webpki" ,rust-webpki-0.21))))
(home-page "http://www.trust-dns.org/index.html") (home-page "https://www.trust-dns.org/index.html")
(synopsis "rustls extension for the Trust-DNS client") (synopsis "rustls extension for the Trust-DNS client")
(description (description
"Trust-DNS is a safe and secure DNS library. This is an extension for "Trust-DNS is a safe and secure DNS library. This is an extension for
@ -63940,7 +64199,7 @@ panic-free alternative to @code{core::fmt}.")
(("rust-criterion" ,rust-criterion-0.3) (("rust-criterion" ,rust-criterion-0.3)
("rust-num-bigint" ,rust-num-bigint-0.4) ("rust-num-bigint" ,rust-num-bigint-0.4)
("rust-rug" ,rust-rug-1)))) ("rust-rug" ,rust-rug-1))))
(home-page "http://parity.io") (home-page "https://parity.io")
(synopsis "Large, fixed-size integer arithmetic in Rust") (synopsis "Large, fixed-size integer arithmetic in Rust")
(description "This package is a Rust library for large, fixed-size integer (description "This package is a Rust library for large, fixed-size integer
arithmetic.") arithmetic.")
@ -65676,7 +65935,11 @@ hardware registers.")
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1kz8svnqnxclllsgh0ck20rplw3qzp46b5v30yscnzrgw8vgahjg")))) "1kz8svnqnxclllsgh0ck20rplw3qzp46b5v30yscnzrgw8vgahjg"))
(snippet
'(begin
(delete-file "vim10m_match")
(delete-file "vim10m_table")))))
(arguments (arguments
`(#:tests? #f ; tests not included in release `(#:tests? #f ; tests not included in release
#:cargo-inputs #:cargo-inputs
@ -68003,7 +68266,7 @@ Read/Write streams as well as low-level in-memory encoding and decoding.")
(("rust-linked-hash-map" ,rust-linked-hash-map-0.5)) (("rust-linked-hash-map" ,rust-linked-hash-map-0.5))
#:cargo-development-inputs #:cargo-development-inputs
(("rust-quickcheck" ,rust-quickcheck-0.9)))) (("rust-quickcheck" ,rust-quickcheck-0.9))))
(home-page "http://chyh1990.github.io/yaml-rust/") (home-page "https://chyh1990.github.io/yaml-rust/")
(synopsis "YAML 1.2 parser for Rust") (synopsis "YAML 1.2 parser for Rust")
(description "This package is a YAML 1.2 parser for Rust.") (description "This package is a YAML 1.2 parser for Rust.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))

View File

@ -38,7 +38,6 @@
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (ice-9 match) #:use-module (ice-9 match)

View File

@ -149,7 +149,7 @@
(description "The libdecaf library is an implementation of elliptic curve (description "The libdecaf library is an implementation of elliptic curve
cryptography using the Montgomery and Edwards curves Curve25519, Ed25519, cryptography using the Montgomery and Edwards curves Curve25519, Ed25519,
Ed448-Goldilocks and Curve448, using the Decaf encoding.") Ed448-Goldilocks and Curve448, using the Decaf encoding.")
(home-page "http://ed448goldilocks.sourceforge.net/") (home-page "https://ed448goldilocks.sourceforge.net/")
(license (list license:expat ;library (license (list license:expat ;library
license:bsd-2)))) ;python bindings license:bsd-2)))) ;python bindings
@ -1013,7 +1013,7 @@ using ctypes is included, and several other language bindings are available.")
(base32 (base32
"0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i")))) "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://ccrypt.sourceforge.net") (home-page "https://ccrypt.sourceforge.net")
(synopsis "Command-line utility for encrypting and decrypting files and streams") (synopsis "Command-line utility for encrypting and decrypting files and streams")
(description "@command{ccrypt} is a utility for encrypting and decrypting (description "@command{ccrypt} is a utility for encrypting and decrypting
files and streams. It was designed as a replacement for the standard unix files and streams. It was designed as a replacement for the standard unix

View File

@ -7,7 +7,7 @@
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 20172022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 20172022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -687,6 +687,30 @@ should only be used as part of the Guix cups-pk-helper service.")
(native-inputs (native-inputs
(list perl pkg-config)))) (list perl pkg-config))))
;;; TODO: Integrate in base hplip package on core-updates.
(define-public hplip-next
(package
(inherit hplip)
(name "hplip")
(version "3.22.10")
(source (origin
(inherit (package-source hplip))
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
"09366v0x10l35bkda6s5ysh64qdf24givn2gxlyidr2kdcpkyg2k"))))
(arguments
(substitute-keyword-arguments (package-arguments hplip)
((#:phases phases)
#~(modify-phases #$phases
(add-after 'unpack 'fix-more-hard-coded-file-names
(lambda* (#:key outputs #:allow-other-keys)
(substitute* (find-files "." "\\.py$")
(("/etc/hp/hplip.conf")
(string-append (assoc-ref outputs "out")
"/etc/hp/hplip.conf")))))))))))
(define-public hplip-minimal (define-public hplip-minimal
(package/inherit hplip (package/inherit hplip
(name "hplip-minimal") (name "hplip-minimal")
@ -862,7 +886,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(define-public epson-inkjet-printer-escpr (define-public epson-inkjet-printer-escpr
(package (package
(name "epson-inkjet-printer-escpr") (name "epson-inkjet-printer-escpr")
(version "1.7.22") (version "1.7.24")
;; XXX: This currently works. But it will break as soon as a newer ;; XXX: This currently works. But it will break as soon as a newer
;; version is available since the URLs for older versions are not ;; version is available since the URLs for older versions are not
;; preserved. An alternative source will be added as soon as ;; preserved. An alternative source will be added as soon as
@ -870,11 +894,11 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/13/96/" (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/14/31/"
"55/c6fced63098ae1ba104f11f572794fd558ffca29/" "90/d2f5b28fcfaa0a1d1753eac5703aa5d88004ce06/"
"epson-inkjet-printer-escpr-1.7.22-1lsb3.2.tar.gz")) "epson-inkjet-printer-escpr-1.7.24-1lsb3.2.tar.gz"))
(sha256 (sha256
(base32 "0b359krhhjjw5hc4b0gqdqwrm6dzc263mdccfzgnyyq7znkyybqb")))) (base32 "0bwff3p6d0xgghf3bicylbxkv9vxz3gjjbr0iafyxz23kalzz9qj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:modules (list #:modules

View File

@ -5,7 +5,7 @@
;;; Copyright © 2015, 2020, 2021, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2020, 2021, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2019, 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2017, 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
@ -301,7 +301,7 @@ FILE and LDAP; in particular it supports HTTPS certificates, HTTP POST, HTTP
PUT, FTP uploading, kerberos, HTTP form based upload, proxies, cookies, PUT, FTP uploading, kerberos, HTTP form based upload, proxies, cookies,
user+password authentication, file transfer resume, http proxy tunneling and user+password authentication, file transfer resume, http proxy tunneling and
more!") more!")
(home-page "http://www.curlpp.org") (home-page "https://www.curlpp.org")
(license license:expat))) (license license:expat)))
(define-public h2c (define-public h2c
@ -334,7 +334,7 @@ curl to obtain exactly that HTTP request.")
(define-public coeurl (define-public coeurl
(package (package
(name "coeurl") (name "coeurl")
(version "0.2.1") (version "0.3.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -343,7 +343,7 @@ curl to obtain exactly that HTTP request.")
(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 "0qbbrfs35zl0wl6x6jn4p9ncxgdm70a883cflvikkykx9n5k2lpq")))) (base32 "1b435c2szwibm4i4r7mh22klyv9ncdkwkiy95p4xjfalsx4ripxh"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
(list doctest pkg-config)) (list doctest pkg-config))

View File

@ -178,8 +178,6 @@
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (guix build-system ruby) #:use-module (guix build-system ruby)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system scons)
#:use-module (guix build-system trivial)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
@ -596,7 +594,7 @@ the API, and provides features such as:
(list memcached python-pytest)) (list memcached python-pytest))
(inputs (inputs
(list libmemcached zlib cyrus-sasl)) (list libmemcached zlib cyrus-sasl))
(home-page "http://sendapatch.se/projects/pylibmc/") (home-page "https://sendapatch.se/projects/pylibmc/")
(synopsis "Python client for memcached") (synopsis "Python client for memcached")
(description (description
"@code{pylibmc} is a client in Python for memcached. It is a wrapper "@code{pylibmc} is a client in Python for memcached. It is a wrapper
@ -2346,7 +2344,7 @@ data sources. Data sources include SQL Servers and any software with an ODBC
Driver.") Driver.")
(license license:lgpl2.1+) (license license:lgpl2.1+)
;; 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 "http://www.unixodbc.org"))) (home-page "https://www.unixodbc.org")))
(define-public nanodbc (define-public nanodbc
(package (package
@ -2670,7 +2668,7 @@ organized in hash table, B+ tree, or fixed-length array.")
#t))))) #t)))))
(inputs (inputs
(list lz4 zlib snappy)) (list lz4 zlib snappy))
(home-page "http://source.wiredtiger.com/") (home-page "https://source.wiredtiger.com/")
(synopsis "NoSQL data engine") (synopsis "NoSQL data engine")
(description (description
"WiredTiger is an extensible platform for data management. It supports "WiredTiger is an extensible platform for data management. It supports
@ -2863,7 +2861,7 @@ semantics.")
"Libpqxx is a C++ library to enable user programs to communicate with the "Libpqxx is a C++ library to enable user programs to communicate with the
PostgreSQL database back-end. The database back-end can be local or it may be PostgreSQL database back-end. The database back-end can be local or it may be
on another machine, accessed via TCP/IP.") on another machine, accessed via TCP/IP.")
(home-page "http://pqxx.org/") (home-page "https://pqxx.org/")
(license license:bsd-3))) (license license:bsd-3)))
(define-public go-go-etcd-io-bbolt (define-public go-go-etcd-io-bbolt
@ -3192,7 +3190,7 @@ for ODBC.")
pkg-config pkg-config
txt2man txt2man
which)) which))
(home-page "http://mdbtools.sourceforge.net/") (home-page "https://mdbtools.sourceforge.net/")
(synopsis "Read Microsoft Access databases") (synopsis "Read Microsoft Access databases")
(description "MDB Tools is a set of tools and applications to read the (description "MDB Tools is a set of tools and applications to read the
proprietary MDB file format used in Microsoft's Access database package. This proprietary MDB file format used in Microsoft's Access database package. This
@ -3356,7 +3354,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
(list autoconf automake bison flex gperf libtool)) (list autoconf automake bison flex gperf libtool))
(inputs (inputs
(list openssl net-tools readline zlib)) (list openssl net-tools readline zlib))
(home-page "http://vos.openlinksw.com/owiki/wiki/VOS/") (home-page "https://vos.openlinksw.com/owiki/wiki/VOS/")
(synopsis "Multi-model database system") (synopsis "Multi-model database system")
(description "Virtuoso is a scalable cross-platform server that combines (description "Virtuoso is a scalable cross-platform server that combines
relational, graph, and document data management with web application server relational, graph, and document data management with web application server
@ -4685,7 +4683,7 @@ SQLAlchemy.")
similar to the DBI/DBD layer in Perl. Writing one generic set of code, similar to the DBI/DBD layer in Perl. Writing one generic set of code,
programmers can leverage the power of multiple databases and multiple programmers can leverage the power of multiple databases and multiple
simultaneous database connections by using this framework.") simultaneous database connections by using this framework.")
(home-page "http://libdbi.sourceforge.net/") (home-page "https://libdbi.sourceforge.net/")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public libdbi-drivers (define-public libdbi-drivers
@ -4756,7 +4754,7 @@ The drivers officially supported by @code{libdbi} are:
@item PostgreSQL, @item PostgreSQL,
@item SQLite. @item SQLite.
@end itemize") @end itemize")
(home-page "http://libdbi-drivers.sourceforge.net/") (home-page "https://libdbi-drivers.sourceforge.net/")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public soci (define-public soci
@ -4791,7 +4789,7 @@ The drivers officially supported by @code{libdbi} are:
(description (description
"SOCI is an abstraction layer for several database backends, including "SOCI is an abstraction layer for several database backends, including
PostreSQL, SQLite, ODBC and MySQL.") PostreSQL, SQLite, ODBC and MySQL.")
(home-page "http://soci.sourceforge.net/") (home-page "https://soci.sourceforge.net/")
(license license:boost1.0))) (license license:boost1.0)))
(define-public freetds (define-public freetds

View File

@ -5,6 +5,7 @@
;;; Copyright © 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -35,6 +36,56 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson)) #:use-module (guix build-system meson))
(define-public coucal
(let ((commit "73ada075553b7607d083037a87cb9c73b3683bfc")
(revision "1"))
(package
(name "coucal")
(version (git-version "0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xroche/coucal")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"01996vda3wj5ywpwg9yhysaq6cyi44xnkyhihbwwi43hrj1ic2vm"))))
(build-system gnu-build-system)
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'do-not-run-tests-early
(lambda _
(substitute* "Makefile"
(("(all: ).*" _ lead) (string-append lead "gcc")))))
(add-after 'unpack 'remove-Werror
;; Prevent "this statement may fall through
;; [-Wimplicit-fallthrough=]" errors from "murmurhash3.h" file.
(lambda _
(substitute* "Makefile"
(("-Werror ") ""))))
(delete 'configure) ;no configure script
(replace 'install ;no install target
(lambda _
(let ((doc (string-append #$output
"/share/doc/" #$name "-" #$version)))
(install-file "README.md" doc))
(for-each (lambda (f) (install-file f #$output))
(find-files "." "(coucal|murmurhash)"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "make" "tests" "runtests")))))))
(home-page "https://github.com/xroche/coucal")
(synopsis "Cuckoo-hashing-based hashtable with stash area C library")
(description "Coucal is an implementation of the Cuckoo hashing
algorithm with a stash area using by default the MurmurHash hash function.")
;; Library is released under Expat terms, but the source includes
;; "murmurhash3.h", which is placed in the public domain.
(license (list license:expat license:public-domain)))))
(define-public gdsl (define-public gdsl
(package (package
(name "gdsl") (name "gdsl")

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; ;;;
@ -89,7 +89,7 @@ contains the archive keys used for that.")
(define-public debian-ports-archive-keyring (define-public debian-ports-archive-keyring
(package (package
(name "debian-ports-archive-keyring") (name "debian-ports-archive-keyring")
(version "2022.02.15") (version "2023.02.01")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -98,7 +98,7 @@ contains the archive keys used for that.")
"/debian-ports-archive-keyring_" version ".tar.xz")) "/debian-ports-archive-keyring_" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"096m45l7g8vbk67gwc6bmkzpx8mhn6xfglgrzlg9xkgcs5gxqyc0")))) "1xq7i6plgfbf4drqdmmk1yija48x11jmhnk2av3cajn2cdhkw73s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; No test suite. '(#:tests? #f ; No test suite.
@ -127,8 +127,7 @@ contains the archive keys used for that.")
(string-append "trusted.gpg/" (basename key ".key") ".gpg") (string-append "trusted.gpg/" (basename key ".key") ".gpg")
(lambda _ (lambda _
(apply invoke "gpg" (append gpg-options (list key)))))) (apply invoke "gpg" (append gpg-options (list key))))))
(find-files "active-keys")) (find-files "active-keys")))))
#t)))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -138,8 +137,7 @@ contains the archive keys used for that.")
(install-file "debian-ports-archive-keyring-removed.gpg" key) (install-file "debian-ports-archive-keyring-removed.gpg" key)
(for-each (lambda (file) (for-each (lambda (file)
(install-file file apt)) (install-file file apt))
(find-files "trusted.gpg" "\\.gpg$"))) (find-files "trusted.gpg" "\\.gpg$"))))))))
#t)))))
(native-inputs (native-inputs
(list gnupg)) (list gnupg))
(home-page "https://tracker.debian.org/pkg/debian-ports-archive-keyring") (home-page "https://tracker.debian.org/pkg/debian-ports-archive-keyring")
@ -194,7 +192,7 @@ contains the archive keys used for that.")
(define-public debootstrap (define-public debootstrap
(package (package
(name "debootstrap") (name "debootstrap")
(version "1.0.126") (version "1.0.128")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -203,7 +201,7 @@ contains the archive keys used for that.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7")))) (base32 "0hc7xc6qvnmjlpf3j6bm25kf0j1ifvv5j7a0iljfmbag4idxc9jv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -328,7 +326,7 @@ debian/copyright for more information.")))))
#:phases (modify-phases %standard-phases (delete 'configure)))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
(list wget perl)) (list wget perl))
(home-page "http://apt-mirror.github.io/") (home-page "https://apt-mirror.github.io/")
(synopsis "Script for mirroring a Debian repository") (synopsis "Script for mirroring a Debian repository")
(description (description
"apt-mirror is a small tool that provides the ability to selectively "apt-mirror is a small tool that provides the ability to selectively
@ -339,7 +337,7 @@ distributions such as Debian and Trisquel.")
(define-public dpkg (define-public dpkg
(package (package
(name "dpkg") (name "dpkg")
(version "1.21.12") (version "1.21.21")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -348,7 +346,7 @@ distributions such as Debian and Trisquel.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "08a72lhkgz4iiimdkqlmf58m31zrwqcs0741nbxxq1x3s9phc25m")))) (base32 "0vgc5irrjyyb5y5hza2hbq3dgfylrxvfdzysw8zzlhgf4bhm69zq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

View File

@ -11,6 +11,7 @@
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2022 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2023 Andy Tai <atai@atai.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -53,6 +54,7 @@
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages lesstif)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
@ -70,6 +72,7 @@
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
@ -617,7 +620,7 @@ the position of the variable and allows you to modify its value.")
(inputs (inputs
(modify-inputs (package-inputs gnu-make) (modify-inputs (package-inputs gnu-make)
(prepend readline))) (prepend readline)))
(home-page "http://bashdb.sourceforge.net/remake/") (home-page "https://bashdb.sourceforge.net/remake/")
(description "Remake is an enhanced version of GNU Make that adds improved (description "Remake is an enhanced version of GNU Make that adds improved
error reporting, better tracing, profiling, and a debugger.") error reporting, better tracing, profiling, and a debugger.")
(license license:gpl3+))) (license license:gpl3+)))
@ -834,7 +837,7 @@ engineering.")
(define-public seer-gdb (define-public seer-gdb
(package (package
(name "seer-gdb") (name "seer-gdb")
(version "1.11") (version "1.14")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -843,7 +846,7 @@ engineering.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"0778573rixhdanmzp4slghpwgv7pm08n7cpa24rm3wrvs77ic3kb")))) "16mz1c58jf1zrgjpxmp58bx8viyidhs1qg0y8ql2f07wgyy6zx33"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; Those are strangely manual `(#:tests? #f ; Those are strangely manual
@ -860,6 +863,36 @@ engineering.")
;; Note: Some icons in src/resources are creative commons 3.0 and/or 4.0. ;; Note: Some icons in src/resources are creative commons 3.0 and/or 4.0.
(license license:gpl3+))) (license license:gpl3+)))
(define-public ddd
(package
(name "ddd")
(version "3.3.12")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/ddd/ddd-" version ".tar.gz"))
(sha256
(base32
"0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;tests require manual intervention
;; Avoid "friend declaration specifies default arguments and isnt
;; a definition" errors.
#:configure-flags #~(list "CXXFLAGS=-fpermissive")))
(native-inputs
(list pkg-config))
(inputs
(list motif ncurses gdb))
(synopsis "Graphical front-end for GDB and other debuggers")
(description "GNU DDD, the Data Display Debugger, is a graphical front-end
for command-line debuggers. Many back-end debuggers are supported, notably
the GNU debugger, GDB. In addition to usual debugging features such as
viewing the source files, DDD has additional graphical, interactive features
to aid in debugging.")
(home-page "https://www.gnu.org/software/ddd/")
(license license:gpl3+)))
(define-public delve (define-public delve
(package (package
(name "delve") (name "delve")

View File

@ -30,108 +30,76 @@
(define-public dhall (define-public dhall
(package (package
(name "dhall") (name "dhall")
(version "1.39.0") (version "1.41.2")
(source (source (origin
(origin (method url-fetch)
(method url-fetch) (uri (hackage-uri "dhall" version))
(uri (string-append "https://hackage.haskell.org/package/dhall/dhall-" (sha256
version ".tar.gz")) (base32
(sha256 "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"))))
(base32 "1by2d84fbckspczddl4npfsf89q6nprmbg0i5g8yr1psp0fpl4ab"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (properties '((upstream-name . "dhall")))
(list ghc-aeson (inputs (list ghc-aeson
ghc-aeson-pretty ghc-aeson-pretty
ghc-ansi-terminal ghc-ansi-terminal
ghc-atomic-write-0.2.0.7 ghc-atomic-write
ghc-case-insensitive ghc-base16-bytestring
ghc-cborg ghc-case-insensitive
ghc-cborg-json ghc-cborg
ghc-contravariant ghc-cborg-json
ghc-data-fix ghc-contravariant
ghc-diff ghc-data-fix
ghc-dotgen ghc-diff
ghc-either ghc-dotgen
ghc-exceptions ghc-either
ghc-half ghc-half
ghc-hashable ghc-hashable
ghc-lens-family-core ghc-indexed-traversable
ghc-megaparsec ghc-lens-family-core
ghc-memory ghc-megaparsec
ghc-mmorph ghc-mmorph
ghc-network-uri ghc-network-uri
ghc-optparse-applicative ghc-optparse-applicative
ghc-parsers ghc-parsers
ghc-parser-combinators ghc-parser-combinators
ghc-prettyprinter ghc-prettyprinter
ghc-prettyprinter-ansi-terminal ghc-prettyprinter-ansi-terminal
ghc-pretty-simple ghc-pretty-simple
ghc-profunctors ghc-profunctors
ghc-pretty-simple ghc-repline
ghc-repline ghc-serialise
ghc-serialise ghc-scientific
ghc-scientific ghc-text-manipulate
ghc-text-manipulate ghc-text-short
ghc-th-lift-instances ghc-th-lift-instances
ghc-transformers-compat ghc-unordered-containers
ghc-unordered-containers ghc-uri-encode
ghc-uri-encode ghc-vector
ghc-vector ghc-cryptohash-sha256
ghc-cryptonite ghc-http-types
ghc-http-types ghc-http-client
ghc-http-client ghc-http-client-tls))
ghc-http-client-tls)) (native-inputs (list ghc-foldl
(native-inputs ghc-generic-random
(list ghc-foldl ghc-quickcheck
ghc-generic-random-1.3.0.1 ghc-quickcheck-instances
ghc-quickcheck ghc-special-values
ghc-quickcheck-instances ghc-spoon
ghc-semigroups ghc-system-filepath
ghc-special-values ghc-tasty
ghc-spoon ghc-tasty-expected-failure
ghc-tasty ghc-tasty-hunit
ghc-tasty-expected-failure ghc-tasty-quickcheck
ghc-tasty-hunit ghc-tasty-silver
ghc-tasty-quickcheck ghc-temporary
ghc-tasty-silver ghc-turtle
ghc-turtle ghc-mockery
ghc-mockery ghc-doctest))
ghc-doctest))
(arguments (arguments
`(#:phases `(#:tests? #f ; Tries to access httpbin.org
(modify-phases %standard-phases #:cabal-revision ("4"
(add-after 'unpack 'remove-network-tests "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx")))
(lambda _ (home-page "http://hackage.haskell.org/package/dhall")
(with-directory-excursion "dhall-lang/tests"
(for-each
delete-file
'("import/success/customHeadersA.dhall"
"import/success/noHeaderForwardingA.dhall"
"import/success/unit/RemoteAsTextA.dhall"
"import/success/unit/SimpleRemoteA.dhall"
"import/success/unit/asLocation/RemoteChain1A.dhall"
"import/success/unit/asLocation/RemoteChain2A.dhall"
"import/success/unit/asLocation/RemoteChain3A.dhall"
"import/success/unit/asLocation/RemoteChainEnvA.dhall"
"import/success/unit/asLocation/RemoteChainMissingA.dhall"
"type-inference/success/CacheImportsA.dhall"
"type-inference/success/CacheImportsCanonicalizeA.dhall")))
(substitute* "src/Dhall/Tutorial.hs"
(((string-append
"-- >>> input auto "
"\"https://raw.githubusercontent.com/dhall-lang"
"/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/"
"examples/True\" :: IO Bool"))
"")
(((string-append
"-- >>> input auto "
"\"False == "
"https://raw.githubusercontent.com/dhall-lang"
"/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/"
"examples/True\" :: IO Bool"))
""))
#t)))))
(home-page "https://dhall-lang.org/")
(synopsis "Configuration language guaranteed to terminate") (synopsis "Configuration language guaranteed to terminate")
(description (description
"Dhall is an explicitly typed configuration language that is not Turing "Dhall is an explicitly typed configuration language that is not Turing

View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018, 2020-2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2017, 2018, 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018, 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@ -239,7 +239,7 @@ and a Python library.")
(define-public translate-shell (define-public translate-shell
(package (package
(name "translate-shell") (name "translate-shell")
(version "0.9.7") (version "0.9.7.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -248,7 +248,7 @@ and a Python library.")
(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 "03p00v8g0y2xs3sza2r2kmhwiajaz9viab6xk9snw7chzw2cddiq")))) (base32 "0jfrypcz963pfvwwaz2i0xvwp2909ldzp15v68mgd2mbqkqw9d90"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases

View File

@ -527,7 +527,7 @@ and a @command{fsck.vfat} compatibility symlink for use in an initrd.")
(sha256 (sha256
(base32 "1gmdxr36allrgap2j4dv238d8awkj327ww0jjwpjwrpbvfpyzjf4")))) (base32 "1gmdxr36allrgap2j4dv238d8awkj327ww0jjwpjwrpbvfpyzjf4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://sg.danny.cz/sg/sdparm.html") (home-page "https://sg.danny.cz/sg/sdparm.html")
(synopsis "Provide access to SCSI device parameters") (synopsis "Provide access to SCSI device parameters")
(description (description
"Sdparm reads and modifies SCSI device parameters. These devices can be "Sdparm reads and modifies SCSI device parameters. These devices can be
@ -562,7 +562,7 @@ and unloading removable media and some other housekeeping functions.")
(string-append "manprefix=") (string-append "manprefix=")
(string-append "DESTDIR=" (string-append "DESTDIR="
(assoc-ref %outputs "out"))))) (assoc-ref %outputs "out")))))
(home-page "http://idle3-tools.sourceforge.net") (home-page "https://idle3-tools.sourceforge.net")
(synopsis "Change or disable Western Digital hard drives' Idle3 timer") (synopsis "Change or disable Western Digital hard drives' Idle3 timer")
(description (description
"Idle3-tools provides a utility to get, set, or disable the Idle3 timer "Idle3-tools provides a utility to get, set, or disable the Idle3 timer
@ -575,14 +575,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
(define-public gparted (define-public gparted
(package (package
(name "gparted") (name "gparted")
(version "1.4.0") (version "1.5.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-"
version "/gparted-" version ".tar.gz")) version "/gparted-" version ".tar.gz"))
(sha256 (sha256
(base32 "1gl7g1lg72s63a9xlc4kcc6ksq6r7h8k9a6456xbxzak5rwklag5")))) (base32 "1pm8jah6lakv83zm3isx4bgmi5xdwaqkjxmiv7qky224m4kfm59w"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
;; Tests require access to files outside the build container, such ;; Tests require access to files outside the build container, such
@ -1448,7 +1448,7 @@ reliably with @code{bmaptool} than with traditional tools, like @code{dd} or
(list autoconf automake libtool pkg-config)) (list autoconf automake libtool pkg-config))
(inputs (inputs
(list cairo pango tokyocabinet ncurses)) (list cairo pango tokyocabinet ncurses))
(home-page "http://duc.zevv.nl") (home-page "https://duc.zevv.nl")
(synopsis "Library and suite of tools for inspecting disk usage") (synopsis "Library and suite of tools for inspecting disk usage")
(description "Duc maintains a database of accumulated sizes of (description "Duc maintains a database of accumulated sizes of
directories of the file system, and allows you to query this database with directories of the file system, and allows you to query this database with

View File

@ -458,7 +458,7 @@ useful tools for testing Django applications and projects.")
python-setuptools-scm python-setuptools-scm
python-pysolr python-pysolr
python-whoosh)) python-whoosh))
(home-page "http://haystacksearch.org/") (home-page "https://haystacksearch.org/")
(synopsis "Pluggable search for Django") (synopsis "Pluggable search for Django")
(description "Haystack provides modular search for Django. It features a (description "Haystack provides modular search for Django. It features a
unified, familiar API that allows you to plug in different search backends unified, familiar API that allows you to plug in different search backends

View File

@ -85,7 +85,7 @@
(substitute* "desktopfiles/Makefile.am" (substitute* "desktopfiles/Makefile.am"
(("gzip") "gzip -n")) (("gzip") "gzip -n"))
#t))))) #t)))))
(home-page "http://djvu.sourceforge.net/") (home-page "https://djvu.sourceforge.net/")
(synopsis "Implementation of DjVu, the document format") (synopsis "Implementation of DjVu, the document format")
(description "DjVuLibre is an implementation of DjVu, (description "DjVuLibre is an implementation of DjVu,
including viewers, browser plugins, decoders, simple encoders, and including viewers, browser plugins, decoders, simple encoders, and
@ -124,7 +124,7 @@ utilities.")
(for-each make-file-writable (for-each make-file-writable
(find-files ".")) (find-files "."))
#t))))) #t)))))
(home-page "http://djvu.sourceforge.net/djview4.html") (home-page "https://djvu.sourceforge.net/djview4.html")
(synopsis "Viewer for the DjVu image format") (synopsis "Viewer for the DjVu image format")
(description "DjView is a standalone viewer for DjVu files. (description "DjView is a standalone viewer for DjVu files.

View File

@ -19,6 +19,8 @@
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Simon South <simon@simonsouth.net> ;;; Copyright © 2020 Simon South <simon@simonsouth.net>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -64,6 +66,7 @@
#:use-module (gnu packages nettle) #:use-module (gnu packages nettle)
#:use-module (gnu packages networking) #:use-module (gnu packages networking)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#: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)
@ -81,6 +84,7 @@
#:use-module (guix gexp) #:use-module (guix gexp)
#: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 download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
@ -290,7 +294,7 @@ prompt the user with the option to go with insecure DNS only.")
(define-public dnsmasq (define-public dnsmasq
(package (package
(name "dnsmasq") (name "dnsmasq")
(version "2.88") (version "2.89")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -298,7 +302,7 @@ prompt the user with the option to go with insecure DNS only.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1cy1zci6vyhzczy6ncc5m9d7zsnnzs9mmwd6pr9w0h03l7nlsm13")))) "02dnxfnman38armn3sw56w80f9wb2vgm3qgm15crs2yg8q1j7g82"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -312,7 +316,7 @@ prompt the user with the option to go with insecure DNS only.")
(string-append "PKG_CONFIG=" ,(pkg-config-for-target)) (string-append "PKG_CONFIG=" ,(pkg-config-for-target))
"COPTS=\"-DHAVE_DBUS\"") "COPTS=\"-DHAVE_DBUS\"")
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(home-page "http://www.thekelleys.org.uk/dnsmasq/doc.html") (home-page "https://www.thekelleys.org.uk/dnsmasq/doc.html")
(synopsis "Small caching DNS proxy and DHCP/TFTP server") (synopsis "Small caching DNS proxy and DHCP/TFTP server")
(description (description
"Dnsmasq is a light-weight DNS forwarder and DHCP server. It is designed "Dnsmasq is a light-weight DNS forwarder and DHCP server. It is designed
@ -333,14 +337,14 @@ and BOOTP/TFTP for network booting of diskless machines.")
;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; When updating, check whether isc-dhcp's bundled copy should be as well.
;; The BIND release notes are available here: ;; The BIND release notes are available here:
;; https://www.isc.org/bind/ ;; https://www.isc.org/bind/
(version "9.16.37") (version "9.16.38")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ftp.isc.org/isc/bind9/" version (uri (string-append "https://ftp.isc.org/isc/bind9/" version
"/bind-" version ".tar.xz")) "/bind-" version ".tar.xz"))
(sha256 (sha256
(base32 "1az2y8zdpn6vfmx4xqnsh5znagcrsvkqa1hz3h8izzm24ban2ihf")) (base32 "03y52iyc2g63lkk9x2vaizpr0jv27g1z6mcxnjw8m8l4kaflrx4d"))
(patches (patches
(search-patches "bind-re-add-attr-constructor-priority.patch")))) (search-patches "bind-re-add-attr-constructor-priority.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -871,7 +875,7 @@ Extensions} (DNSSEC).")
(define-public knot (define-public knot
(package (package
(name "knot") (name "knot")
(version "3.2.4") (version "3.2.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -880,7 +884,7 @@ Extensions} (DNSSEC).")
(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 "0b6fnrdy5zqn3mnn5cl92j0m7k9l6hh4gnr92qpirqf54bl2lfm2")) (base32 "0xhr6i5qq0yhxqj50hsm51lb1v5lj4vfkzdcsvh7lw8wg6j1d03b"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1098,7 +1102,7 @@ LuaJIT, both a resolver library and a daemon.")
(define-public ddclient (define-public ddclient
(package (package
(name "ddclient") (name "ddclient")
(version "3.9.1") (version "3.10.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1107,62 +1111,46 @@ LuaJIT, both a resolver library and a daemon.")
(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 "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w")))) (base32 "0l87d72apwrg6ipc9gix5gv64d4hr1ykxmss8x4r8d8mgj6j8rf1"))
(build-system trivial-build-system) ; no Makefile.PL (modules '((guix build utils)))
(snippet
;; XXX: erroneous version value, this is fixed in master
#~(begin
(substitute* "configure.ac"
(("3.10.0_2") #$version))))
(patches (search-patches "ddclient-skip-test.patch"))))
(build-system gnu-build-system)
(native-inputs (native-inputs
(list bash perl)) (list autoconf automake libtool
perl-test-warnings perl-test-mockmodule))
(inputs (inputs
(list inetutils ; logger (list inetutils ; logger
net-tools net-tools
perl-data-validate-ip bash-minimal ;for 'wrap-program'
perl
perl-digest-sha1 perl-digest-sha1
perl-io-socket-ssl)) perl-io-socket-ssl
perl-io-socket-inet6 ;; XXX: this is likely to be removed in a future ddclient release
;; https://github.com/ddclient/ddclient/issues/461
perl-json))
(arguments (arguments
`(#:modules ((guix build utils)) (list
#:builder #:configure-flags #~(list "--localstatedir=/var")
(begin #:phases
(use-modules (guix build utils) #~(modify-phases %standard-phases
(ice-9 match) (replace 'install
(srfi srfi-26)) (lambda _
(setenv "PATH" (string-append ;; XXX: Do not create /var
(assoc-ref %build-inputs "bash") "/bin" ":" (invoke "make" "localstatedir=/tmp/discard" "install")))
(assoc-ref %build-inputs "perl") "/bin")) (add-after 'wrap 'wrap-ddclient
(lambda* (#:key inputs #:allow-other-keys)
;; Copy the (read-only) source into the (writable) build directory. (wrap-program (string-append #$output "/bin/ddclient")
(copy-recursively (assoc-ref %build-inputs "source") ".") `("PERL5LIB" ":" prefix ,(string-split (getenv "PERL5LIB") #\:))
`("PATH" prefix ,(map (lambda (x)
;; Install. (string-append (assoc-ref inputs x) "/bin"))
(let* ((out (assoc-ref %outputs "out")) '("inetutils" "net-tools")))))))))
(bin (string-append out "/bin"))) (native-search-paths
(let ((file "ddclient")) (list $SSL_CERT_DIR $SSL_CERT_FILE))
(substitute* file
(("/usr/bin/perl") (which "perl"))
;; Strictly use /etc/ddclient/ddclient.conf.
(("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf")
(("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf")
;; Strictly use /var/cache/ddclient/ddclient.cache
(("\\$cachedir\\$program\\.cache")
"/var/cache/ddclient/ddclient.cache"))
(install-file file bin)
(wrap-program (string-append bin "/" file)
`("PATH" ":" =
("$PATH"
,@(map (lambda (input)
(match input
((name . store)
(string-append store "/bin"))))
%build-inputs)))
`("PERL5LIB" ":" =
,(delete
""
(map (match-lambda
(((? (cut string-prefix? "perl-" <>) name) . dir)
(string-append dir "/lib/perl5/site_perl"))
(_ ""))
%build-inputs)))))
(for-each (cut install-file <> (string-append out
"/share/ddclient"))
(find-files "." "sample.*$"))))))
(home-page "https://ddclient.net/") (home-page "https://ddclient.net/")
(synopsis "Address updating utility for dynamic DNS services") (synopsis "Address updating utility for dynamic DNS services")
(description "This package provides a client to update dynamic IP (description "This package provides a client to update dynamic IP
@ -1389,3 +1377,39 @@ interface. It then calls all the helper scripts it knows about so it can
configure the real @file{/etc/resolv.conf} and optionally any local configure the real @file{/etc/resolv.conf} and optionally any local
nameservers other than libc.") nameservers other than libc.")
(license license:bsd-2))) (license license:bsd-2)))
(define-public smartdns
(package
(name "smartdns")
(version "40")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pymumu/smartdns")
(commit (string-append "Release" version))))
(file-name (git-file-name name version))
(modules '((guix build utils)))
(snippet '(substitute* "Makefile"
((".*SYSTEMDSYSTEMUNITDIR.*") "")))
(sha256
(base32
"0ibbj96s40xgk6q7dsgpx65rjkknl1pn7nca5fcbbhcm2m80nzjj"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;no tests
#:make-flags
#~(list (string-append "CC=" #$(cc-for-target))
(string-append "DESTDIR=" #$output)
"PREFIX=''")
#:phases
#~(modify-phases %standard-phases
(delete 'configure))))
(inputs (list openssl))
(home-page "https://github.com/pymumu/smartdns")
(synopsis "Local DNS server")
(description
"SmartDNS is a DNS server that accepts DNS query requests from local
clients, obtains DNS query results from multiple upstream DNS servers, and
returns the fastest access results to clients.")
(license license:gpl3+)))

View File

@ -588,7 +588,7 @@ the in DocBook SGML DTDs.")
"/bin")) "/bin"))
'("libxslt" "texlive" '("libxslt" "texlive"
"imagemagick" "inkscape")))))))))) "imagemagick" "inkscape"))))))))))
(home-page "http://dblatex.sourceforge.net") (home-page "https://dblatex.sourceforge.net")
(synopsis "DocBook to LaTeX Publishing") (synopsis "DocBook to LaTeX Publishing")
(description (description
"DocBook to LaTeX Publishing transforms your SGML/XML DocBook documents "DocBook to LaTeX Publishing transforms your SGML/XML DocBook documents
@ -774,7 +774,7 @@ Detect the differences in markup between two SGML files.
(map (lambda (prog) (map (lambda (prog)
(symlink prog (string-append out "/bin/db2x_" prog))) (symlink prog (string-append out "/bin/db2x_" prog)))
'("docbook2man" "docbook2texi")))))))) '("docbook2man" "docbook2texi"))))))))
(home-page "http://docbook2x.sourceforge.net") (home-page "https://docbook2x.sourceforge.net")
(synopsis "Convert DocBook to man page and Texinfo format") (synopsis "Convert DocBook to man page and Texinfo format")
(description (description
"docbook2X is a software package that converts DocBook documents into the "docbook2X is a software package that converts DocBook documents into the

View File

@ -724,3 +724,85 @@ containers. It manages a single child process and ensures that any zombie
processes produced from it are reaped and that signals are properly forwarded. processes produced from it are reaped and that signals are properly forwarded.
Tini is integrated with Docker.") Tini is integrated with Docker.")
(license license:expat))) (license license:expat)))
(define-public docker-registry
(package
(name "docker-registry")
(version "2.8.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/docker/distribution")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1w8zr97p2c62gm1lrdwqa704ivjsy25ylznrddbbpv63idwdbi9k"))))
(build-system go-build-system)
(arguments
(list
#:import-path "github.com/docker/distribution"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir-to-src
(lambda _ (chdir "src/github.com/docker/distribution")))
(add-after 'chdir-to-src 'fix-versioning
(lambda _
;; The Makefile use git to compute the version and the
;; revision. This requires the .git directory that we don't have
;; anymore in the unpacked source.
(substitute* "Makefile"
(("^VERSION=\\$\\(.*\\)")
(string-append "VERSION=v" #$version))
;; The revision originally used the git hash with .m appended
;; if there was any local modifications.
(("^REVISION=\\$\\(.*\\)") "REVISION=0"))))
(replace 'build
(lambda _
(invoke "make" "binaries")))
(replace 'install
(lambda _
(let ((bin (string-append #$output "/bin")))
(mkdir-p bin)
(for-each
(lambda (file)
(install-file (string-append "bin/" file) bin))
'("digest"
"registry"
"registry-api-descriptor-template")))
(let ((doc (string-append
#$output "/share/doc/" #$name "-" #$version)))
(mkdir-p doc)
(for-each
(lambda (file)
(install-file file doc))
'("BUILDING.md"
"CONTRIBUTING.md"
"LICENSE"
"MAINTAINERS"
"README.md"
"ROADMAP.md"))
(copy-recursively "docs/" (string-append doc "/docs")))
(let ((examples
(string-append
#$output "/share/doc/" #$name "-" #$version
"/registry-example-configs")))
(mkdir-p examples)
(for-each
(lambda (file)
(install-file (string-append "cmd/registry/" file) examples))
'("config-cache.yml"
"config-example.yml"
"config-dev.yml")))))
(delete 'install-license-files))))
(home-page "https://github.com/docker/distribution")
(synopsis "Docker registry server and associated tools")
(description "The Docker registry server enable you to host your own
docker registry. With it, there is also two other utilities:
@itemize
@item The digest utility is a tool that generates checksums compatibles with
various docker manifest files.
@item The registry-api-descriptor-template is a tool for generating API
specifications from the docs/spec/api.md.tmpl file.
@end itemize")
(license license:asl2.0)))

View File

@ -363,7 +363,7 @@ additional metadata about the object to which the docstring belongs.")
docbook-xml-4.2)) docbook-xml-4.2))
(native-inputs (native-inputs
(list intltool)) (list intltool))
(home-page "http://scrollkeeper.sourceforge.net/") (home-page "https://scrollkeeper.sourceforge.net/")
(synopsis "Open Documentation Cataloging Project") (synopsis "Open Documentation Cataloging Project")
(description (description
"ScrollKeeper is a cataloging system for documentation. It manages "ScrollKeeper is a cataloging system for documentation. It manages

View File

@ -200,7 +200,7 @@ with Microsoft Compiled HTML (CHM) files")
python-pychm python-pychm
python-pycryptodome python-pycryptodome
python-pygments python-pygments
python-pyqt-without-qtwebkit python-pyqt
python-pyqtwebengine python-pyqtwebengine
python-regex python-regex
speech-dispatcher speech-dispatcher
@ -246,7 +246,7 @@ tags = [\"WS_X11\"]")
(string-append "[tool.sip.project] (string-append "[tool.sip.project]
sip-include-dirs = [\"" sip-include-dirs = [\""
#$(this-package-input #$(this-package-input
"python-pyqt-without-qtwebkit") "python-pyqt")
"/share/sip\"]"))) "/share/sip\"]")))
(substitute* "src/calibre/ebooks/pdf/pdftohtml.py" (substitute* "src/calibre/ebooks/pdf/pdftohtml.py"
(("PDFTOHTML = 'pdftohtml'") (("PDFTOHTML = 'pdftohtml'")
@ -434,7 +434,7 @@ accessing and converting various ebook file formats.")
(base32 (base32
"1f36dbq7nc77lln1by2n1yl050g9dc63viawhs3gc3169mavm36x")))) "1f36dbq7nc77lln1by2n1yl050g9dc63viawhs3gc3169mavm36x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "http://vimgadgets.sourceforge.net/liblinebreak/") (home-page "https://vimgadgets.sourceforge.net/liblinebreak/")
(synopsis "Library for detecting where linebreaks are allowed in text") (synopsis "Library for detecting where linebreaks are allowed in text")
(description "@code{liblinebreak} is an implementation of the line (description "@code{liblinebreak} is an implementation of the line
breaking algorithm as described in Unicode 6.0.0 Standard Annex 14, breaking algorithm as described in Unicode 6.0.0 Standard Annex 14,

View File

@ -449,7 +449,7 @@ specialized device.")
(license license:gpl3))) (license license:gpl3)))
(define-public openboard (define-public openboard
;; The last release builds from qtwebkit, which is planned for removal in ;; The last release builds from qtwebkit, which has been removed from
;; Guix, so use the latest commit of the 1.7-dev branch, which builds with ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with
;; qtwebengine-5. ;; qtwebengine-5.
(let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311 (let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311
@ -582,7 +582,7 @@ a pen-tablet display and a beamer.")
(define-public fet (define-public fet
(package (package
(name "fet") (name "fet")
(version "6.8.0") (version "6.8.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -591,7 +591,7 @@ a pen-tablet display and a beamer.")
(list (string-append directory base) (list (string-append directory base)
(string-append directory "old/" base)))) (string-append directory "old/" base))))
(sha256 (sha256
(base32 "12hbw87d6aza77615apvbkdgrn3gqdw0q9xp2pw64w2513z0a2jm")))) (base32 "0bwm6j0drxkrmx8zbr78a7xbbzb1i9365qv93fkwjg9v92b9clhr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -805,7 +805,7 @@ stored and user can review his performance in any time.")
("python-pyaudio" ,python-pyaudio) ("python-pyaudio" ,python-pyaudio)
;; `python-pyqtwebengine' must precede `python-pyqt' in PYTHONPATH. ;; `python-pyqtwebengine' must precede `python-pyqt' in PYTHONPATH.
("python-pyqtwebengine" ,python-pyqtwebengine) ("python-pyqtwebengine" ,python-pyqtwebengine)
("python-pyqt" ,python-pyqt-without-qtwebkit) ("python-pyqt" ,python-pyqt)
("python-requests" ,python-requests) ("python-requests" ,python-requests)
("python-send2trash" ,python-send2trash) ("python-send2trash" ,python-send2trash)
("python-sip" ,python-sip) ("python-sip" ,python-sip)

View File

@ -429,5 +429,5 @@ individual low-level driver modules.")
(description "Xoscope is a digital oscilloscope that can acquire signals (description "Xoscope is a digital oscilloscope that can acquire signals
from ALSA, ESD, and COMEDI sources. This package currently does not include from ALSA, ESD, and COMEDI sources. This package currently does not include
support for ESD sources.") support for ESD sources.")
(home-page "http://xoscope.sourceforge.net/") (home-page "https://xoscope.sourceforge.net/")
(license license:gpl2+))) (license license:gpl2+)))

View File

@ -56,7 +56,8 @@
(base32 "1rdg3xp3js9xadclk3cdypkscm5wahgsfmm4ldcw3xswzhw6ri8w")) (base32 "1rdg3xp3js9xadclk3cdypkscm5wahgsfmm4ldcw3xswzhw6ri8w"))
(patches (patches
(search-patches "elm-reactor-static-files.patch" (search-patches "elm-reactor-static-files.patch"
"elm-offline-package-registry.patch")))) "elm-offline-package-registry.patch"
"elm-ghc9.2.patch"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
(list (list
@ -70,7 +71,7 @@
(add-before 'configure 'update-constraints (add-before 'configure 'update-constraints
(lambda _ (lambda _
(substitute* "elm.cabal" (substitute* "elm.cabal"
(("(ansi-terminal|containers|network|http-client|language-glsl)\\s+[^,]+" all dep) (("(ansi-terminal|bytestring|containers|network|HTTP|http-client|language-glsl)\\s+[^,]+" all dep)
dep))))))) dep)))))))
(inputs (inputs
(list ghc-ansi-terminal (list ghc-ansi-terminal

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,7 @@
;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us> ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Declan Tsien <declantsien@riseup.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -65,6 +66,7 @@
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages lesstif) ; motif
#:use-module (gnu packages linux) ; alsa-lib, gpm #:use-module (gnu packages linux) ; alsa-lib, gpm
#:use-module (gnu packages mail) ; for mailutils #:use-module (gnu packages mail) ; for mailutils
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
@ -75,6 +77,7 @@
#:use-module (gnu packages sqlite) #:use-module (gnu packages sqlite)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages tree-sitter)
#:use-module (gnu packages web) ; for jansson #:use-module (gnu packages web) ; for jansson
#:use-module (gnu packages webkit) #:use-module (gnu packages webkit)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -365,7 +368,15 @@
(files '("lib/emacs/native-site-lisp"))) (files '("lib/emacs/native-site-lisp")))
(search-path-specification (search-path-specification
(variable "INFOPATH") (variable "INFOPATH")
(files '("share/info"))))) (files '("share/info")))
;; tree-sitter support is not yet available in emacs 28, but this
;; search path won't harm and also will be beneficial for
;; emacs-next and other emacs-* packages, which have tree-sitter
;; support enabled. Please, remove this comment, when emacs
;; package is updated to 29.
(search-path-specification
(variable "TREE_SITTER_GRAMMAR_PATH")
(files '("lib/tree-sitter")))))
(home-page "https://www.gnu.org/software/emacs/") (home-page "https://www.gnu.org/software/emacs/")
(synopsis "The extensible, customizable, self-documenting text editor") (synopsis "The extensible, customizable, self-documenting text editor")
@ -381,12 +392,12 @@ languages.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public emacs-next (define-public emacs-next
(let ((commit "6adc193ad66445acd84caba6973424ecbd21da26") (let ((commit "f1f571e72ae10285762d3a941e56f7c4048272af")
(revision "4")) (revision "1"))
(package (package
(inherit emacs) (inherit emacs)
(name "emacs-next") (name "emacs-next")
(version (git-version "29.0.50" revision commit)) (version (git-version "29.0.60" revision commit))
(source (source
(origin (origin
(inherit (package-source emacs)) (inherit (package-source emacs))
@ -401,7 +412,7 @@ languages.")
"emacs-native-comp-driver-options.patch")) "emacs-native-comp-driver-options.patch"))
(sha256 (sha256
(base32 (base32
"0b48qg9w7fzvhva78gzi3cs2m6asj11fk0kgys49fqhwskigzg1f")))) "1rildbxq53yvc2rllg2qccgxzbbnr6qbija0lyqacsy8dlzaysch"))))
(inputs (inputs
(modify-inputs (package-inputs emacs) (modify-inputs (package-inputs emacs)
(prepend sqlite))) (prepend sqlite)))
@ -409,6 +420,35 @@ languages.")
(modify-inputs (package-native-inputs emacs) (modify-inputs (package-native-inputs emacs)
(prepend autoconf)))))) (prepend autoconf))))))
(define-public emacs-next-tree-sitter
(let ((commit "ac7ec87a7a0db887e4ae7fe9005aea517958b778")
(revision "0"))
(package
(inherit emacs)
(name "emacs-next-tree-sitter")
(version (git-version "30.0.50" revision commit))
(source
(origin
(inherit (package-source emacs))
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/emacs.git/")
(commit commit)))
(file-name (git-file-name name version))
;; emacs-source-date-epoch.patch is no longer necessary
(patches (search-patches "emacs-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
"emacs-native-comp-driver-options.patch"))
(sha256
(base32
"1akq6dbllwwqwx21wnwnv6aax1nsi2ypbd7j3i79sw62s3gf399z"))))
(inputs
(modify-inputs (package-inputs emacs)
(prepend sqlite tree-sitter)))
(native-inputs
(modify-inputs (package-native-inputs emacs)
(prepend autoconf))))))
(define-public emacs-next-pgtk (define-public emacs-next-pgtk
(package (package
(inherit emacs-next) (inherit emacs-next)
@ -473,6 +513,30 @@ editor (with xwidgets support)")
(modify-inputs (package-inputs emacs) (modify-inputs (package-inputs emacs)
(prepend webkitgtk-with-libsoup2 libxcomposite))))) (prepend webkitgtk-with-libsoup2 libxcomposite)))))
(define-public emacs-motif
(package/inherit emacs
(name "emacs-motif")
(synopsis
"The extensible, customizable, self-documenting text editor (with Motif
toolkit)")
(build-system gnu-build-system)
(inputs (modify-inputs (package-inputs emacs)
(delete "gtk+")
(prepend inotify-tools motif)))
(arguments
(substitute-keyword-arguments
(package-arguments
emacs)
((#:configure-flags flags #~'())
#~(cons "--with-x-toolkit=motif"
#$flags))
((#:modules _)
(%emacs-modules build-system))
((#:phases phases)
#~(modify-phases #$phases
(delete 'restore-emacs-pdmp)
(delete 'strip-double-wrap)))))))
(define-public emacs-no-x (define-public emacs-no-x
(package/inherit emacs (package/inherit emacs
(name "emacs-no-x") (name "emacs-no-x")

View File

@ -1585,7 +1585,7 @@ plus many of their variants.")
"TARGETS += sdcc-misc\n" "TARGETS += sdcc-misc\n"
"PKGS += $(SDCC_MISC)"))) "PKGS += $(SDCC_MISC)")))
#t))))) #t)))))
(home-page "http://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
that targets 8-bit microcontrollers in the Intel MCS-51 (8051); MOS Technology that targets 8-bit microcontrollers in the Intel MCS-51 (8051); MOS Technology

View File

@ -3,7 +3,7 @@
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016, 2021 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2015, 2016, 2021 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2018 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@ -74,6 +74,7 @@
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
@ -1506,6 +1507,57 @@ reference frontend for the libretro API, currently used by most as a modular
multi-system game/emulator system.") multi-system game/emulator system.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public wasm4
(package
(name "wasm4")
(version "2.5.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/aduros/wasm4")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0ycnznwy4i4fw6l507y5xm986rxqvnpl971725q8xinsnq2swpnl"))))
(build-system cmake-build-system)
(arguments
(list
#:tests? #f ; no check target
#:configure-flags
#~(list (string-append "-DCMAKE_C_FLAGS="
"-I" #$minifb "/include "
"-I" #$wasm3 "/include"))
#:phases
'(modify-phases %standard-phases
;; WASM4's source is a combination of multiple runtimes. We want to
;; build the native one.
(add-after 'unpack 'chdir-to-native-runtime
(lambda _
(chdir "runtimes/native")))
;; WASM4 uses git submodules to bundle several dependencies, which we
;; have instead made dedicated packages for. This phase hacks the
;; build system to use our own stuff.
(add-after 'chdir-to-native-runtime 'unbundle
(lambda _
(substitute* "CMakeLists.txt"
;; These directories do not exist because we aren't pulling in
;; submodules.
(("add_subdirectory\\(vendor/minifb\\)") "")
(("add_subdirectory\\(vendor/cubeb\\)") "")
;; Add additional libraries needed to successfully link the
;; wasm4 executable using the unbundled dependencies.
(("target_link_libraries\\(wasm4 minifb cubeb\\)")
"target_link_libraries(wasm4 m GL X11 xkbcommon minifb cubeb m3)")))))))
(inputs (list cubeb minifb wasm3))
(synopsis "WebAssembly fantasy console")
(description "WASM-4 is a low-level fantasy game console for building
small games with WebAssembly. Game cartridges (ROMs) are small,
self-contained .wasm files that can be built with any programming language
that compiles to WebAssembly.")
(home-page "https://wasm4.org")
(license license:isc)))
(define-public scummvm (define-public scummvm
(package (package
(name "scummvm") (name "scummvm")
@ -1716,7 +1768,7 @@ This is a part of the TiLP project.")
(define-public mame (define-public mame
(package (package
(name "mame") (name "mame")
(version "0.249") (version "0.251")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1725,7 +1777,7 @@ 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 "1akws4l3b7z5mkf09mdaz640rj41sbg3sh1xlv1sp0yhdjqjpi90")) (base32 "102p6kz4ph9m0sxsyavqhjzg00gmnq8m5mnd5sf14c61d2jc0vzk"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.

Some files were not shown because too many files have changed in this diff Show More