Merge branch 'staging' into 'core-updates'.
Conflicts: gnu/local.mk gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/gl.scm gnu/packages/glib.scm gnu/packages/guile.scm gnu/packages/node.scm gnu/packages/openldap.scm gnu/packages/package-management.scm gnu/packages/python-xyz.scm gnu/packages/python.scm gnu/packages/tls.scm gnu/packages/vpn.scm gnu/packages/xorg.scm
This commit is contained in:
commit
01f0707207
407 changed files with 75910 additions and 10423 deletions
|
@ -121,6 +121,7 @@
|
|||
(eval . (put 'let-system 'scheme-indent-function 1))
|
||||
|
||||
(eval . (put 'with-database 'scheme-indent-function 2))
|
||||
(eval . (put 'call-with-database 'scheme-indent-function 1))
|
||||
(eval . (put 'call-with-transaction 'scheme-indent-function 1))
|
||||
(eval . (put 'with-statement 'scheme-indent-function 3))
|
||||
(eval . (put 'call-with-retrying-transaction 'scheme-indent-function 1))
|
||||
|
|
|
@ -79,6 +79,8 @@
|
|||
(name "jonsger"))
|
||||
("83B6 703A DCCA 3B69 4BCE 2DA6 E6A5 EE3C 1946 7A0D"
|
||||
(name "kkebreau"))
|
||||
("ACC2 3BA0 59F7 CCF4 08F0 43AD 442A 84B8 C70E 2F87"
|
||||
(name "leoprikler"))
|
||||
("45E5 75FA 53EA 8BD6 1BCE 0B4E 3ADC 75F0 13D6 78F9"
|
||||
(name "leungbk"))
|
||||
(;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0"
|
||||
|
|
38
Makefile.am
38
Makefile.am
|
@ -1,5 +1,5 @@
|
|||
# GNU Guix --- Functional package management for GNU
|
||||
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
|
||||
# Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
|
||||
|
@ -39,6 +39,7 @@ do_subst = $(SED) \
|
|||
-e 's,[@]GUILE[@],$(GUILE),g' \
|
||||
-e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \
|
||||
-e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \
|
||||
-e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \
|
||||
-e 's,[@]localedir[@],$(localedir),g'
|
||||
|
||||
scripts/guix: scripts/guix.in Makefile
|
||||
|
@ -126,6 +127,7 @@ MODULES = \
|
|||
guix/build-system/android-ndk.scm \
|
||||
guix/build-system/ant.scm \
|
||||
guix/build-system/cargo.scm \
|
||||
guix/build-system/chicken.scm \
|
||||
guix/build-system/clojure.scm \
|
||||
guix/build-system/cmake.scm \
|
||||
guix/build-system/dub.scm \
|
||||
|
@ -175,6 +177,7 @@ MODULES = \
|
|||
guix/build/download-nar.scm \
|
||||
guix/build/cargo-build-system.scm \
|
||||
guix/build/cargo-utils.scm \
|
||||
guix/build/chicken-build-system.scm \
|
||||
guix/build/cmake-build-system.scm \
|
||||
guix/build/dub-build-system.scm \
|
||||
guix/build/dune-build-system.scm \
|
||||
|
@ -318,6 +321,14 @@ MODULES += \
|
|||
|
||||
endif HAVE_GUILE_SSH
|
||||
|
||||
if HAVE_GUILE_AVAHI
|
||||
|
||||
MODULES += \
|
||||
guix/avahi.scm \
|
||||
guix/scripts/discover.scm
|
||||
|
||||
endif HAVE_GUILE_AVAHI
|
||||
|
||||
if BUILD_DAEMON_OFFLOAD
|
||||
|
||||
MODULES += \
|
||||
|
@ -344,10 +355,15 @@ dist_noinst_DATA = \
|
|||
AUX_FILES = \
|
||||
gnu/packages/aux-files/chromium/master-preferences.json \
|
||||
gnu/packages/aux-files/emacs/guix-emacs.el \
|
||||
gnu/packages/aux-files/linux-libre/5.9-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.9-arm64.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.9-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \
|
||||
gnu/packages/aux-files/guix.vim \
|
||||
gnu/packages/aux-files/linux-libre/5.10-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.10-arm64.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.10-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.9-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.9-arm64.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.9-i686.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.4-arm.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.4-arm64.conf \
|
||||
gnu/packages/aux-files/linux-libre/5.4-i686.conf \
|
||||
|
@ -380,6 +396,8 @@ EXAMPLES = \
|
|||
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
|
||||
|
||||
nobase_dist_guilemodule_DATA = \
|
||||
guix/d3.v3.js \
|
||||
guix/graph.js \
|
||||
guix/store/schema.sql \
|
||||
$(MODULES) $(MODULES_NOT_COMPILED) $(AUX_FILES) $(EXAMPLES) \
|
||||
$(MISC_DISTRO_FILES)
|
||||
|
@ -443,7 +461,6 @@ SCM_TESTS = \
|
|||
tests/monads.scm \
|
||||
tests/nar.scm \
|
||||
tests/networking.scm \
|
||||
tests/offload.scm \
|
||||
tests/opam.scm \
|
||||
tests/openpgp.scm \
|
||||
tests/packages.scm \
|
||||
|
@ -480,6 +497,12 @@ SCM_TESTS = \
|
|||
tests/uuid.scm \
|
||||
tests/workers.scm
|
||||
|
||||
if BUILD_DAEMON_OFFLOAD
|
||||
SCM_TESTS += tests/offload.scm
|
||||
else
|
||||
EXTRA_DIST += tests/offload.scm
|
||||
endif
|
||||
|
||||
SH_TESTS = \
|
||||
tests/guix-build.sh \
|
||||
tests/guix-build-branch.sh \
|
||||
|
@ -594,8 +617,6 @@ EXTRA_DIST += \
|
|||
build-aux/test-driver.scm \
|
||||
build-aux/update-guix-package.scm \
|
||||
build-aux/update-NEWS.scm \
|
||||
d3.v3.js \
|
||||
graph.js \
|
||||
tests/test.drv \
|
||||
tests/signing-key.pub \
|
||||
tests/signing-key.sec \
|
||||
|
@ -705,7 +726,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
|
|||
--localstatedir="$$dc_install_base/var" \
|
||||
--with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \
|
||||
--with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \
|
||||
--with-nix-prefix="$(NIX_PREFIX)" \
|
||||
--enable-daemon \
|
||||
ac_cv_guix_test_root="$(GUIX_TEST_ROOT)"
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ if test "x$guix_build_daemon" = "xyes"; then
|
|||
GUIX_ASSERT_CXX11
|
||||
|
||||
AC_PROG_RANLIB
|
||||
AC_CONFIG_HEADER([nix/config.h])
|
||||
AC_CONFIG_HEADERS([nix/config.h])
|
||||
|
||||
dnl Use 64-bit file system calls so that we can support files > 2 GiB.
|
||||
AC_SYS_LARGEFILE
|
||||
|
@ -34,7 +34,6 @@ if test "x$guix_build_daemon" = "xyes"; then
|
|||
dnl Look for SQLite, a required dependency.
|
||||
PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= 3.6.19])
|
||||
|
||||
AC_DEFINE([NIX_VERSION], ["0.0.0"], [Fake Nix version number.])
|
||||
AC_DEFINE_UNQUOTED([SYSTEM], ["$guix_system"],
|
||||
[Guix host system type--i.e., platform and OS kernel tuple.])
|
||||
|
||||
|
|
32
configure.ac
32
configure.ac
|
@ -1,7 +1,7 @@
|
|||
# -*- Autoconf -*-
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.68)
|
||||
AC_PREREQ([2.69])
|
||||
AC_INIT([GNU Guix],
|
||||
[m4_esyscmd([build-aux/git-version-gen .tarball-version])],
|
||||
[bug-guix@gnu.org], [guix],
|
||||
|
@ -29,35 +29,35 @@ GUIX_ASSERT_SUPPORTED_SYSTEM
|
|||
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])
|
||||
|
||||
AC_ARG_WITH(store-dir,
|
||||
AC_HELP_STRING([--with-store-dir=PATH],
|
||||
AS_HELP_STRING([--with-store-dir=PATH],
|
||||
[file name of the store (defaults to /gnu/store)]),
|
||||
[storedir="$withval"],
|
||||
[storedir="/gnu/store"])
|
||||
AC_SUBST(storedir)
|
||||
|
||||
AC_ARG_WITH([bash-completion-dir],
|
||||
AC_HELP_STRING([--with-bash-completion-dir=DIR],
|
||||
AS_HELP_STRING([--with-bash-completion-dir=DIR],
|
||||
[name of the Bash completion directory]),
|
||||
[bashcompletiondir="$withval"],
|
||||
[bashcompletiondir='${sysconfdir}/bash_completion.d'])
|
||||
AC_SUBST([bashcompletiondir])
|
||||
|
||||
AC_ARG_WITH([zsh-completion-dir],
|
||||
AC_HELP_STRING([--with-zsh-completion-dir=DIR],
|
||||
AS_HELP_STRING([--with-zsh-completion-dir=DIR],
|
||||
[name of the Zsh completion directory]),
|
||||
[zshcompletiondir="$withval"],
|
||||
[zshcompletiondir='${datadir}/zsh/site-functions'])
|
||||
AC_SUBST([zshcompletiondir])
|
||||
|
||||
AC_ARG_WITH([fish-completion-dir],
|
||||
AC_HELP_STRING([--with-fish-completion-dir=DIR],
|
||||
AS_HELP_STRING([--with-fish-completion-dir=DIR],
|
||||
[name of the Fish completion directory]),
|
||||
[fishcompletiondir="$withval"],
|
||||
[fishcompletiondir='${datadir}/fish/vendor_completions.d'])
|
||||
AC_SUBST([fishcompletiondir])
|
||||
|
||||
AC_ARG_WITH([selinux-policy-dir],
|
||||
AC_HELP_STRING([--with-selinux-policy-dir=DIR],
|
||||
AS_HELP_STRING([--with-selinux-policy-dir=DIR],
|
||||
[name of the SELinux policy directory]),
|
||||
[selinux_policydir="$withval"],
|
||||
[selinux_policydir='${datadir}/selinux/'])
|
||||
|
@ -102,7 +102,7 @@ if test "x$GUILD" = "x"; then
|
|||
fi
|
||||
|
||||
if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then
|
||||
PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3])
|
||||
PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.6])
|
||||
fi
|
||||
|
||||
dnl Get CFLAGS and LDFLAGS for libguile.
|
||||
|
@ -161,6 +161,11 @@ if test "x$have_guile_lzlib" != "xyes"; then
|
|||
AC_MSG_ERROR([Guile-lzlib is missing; please install it.])
|
||||
fi
|
||||
|
||||
dnl Check for Guile-Avahi.
|
||||
GUILE_MODULE_AVAILABLE([have_guile_avahi], [(avahi)])
|
||||
AM_CONDITIONAL([HAVE_GUILE_AVAHI],
|
||||
[test "x$have_guile_avahi" = "xyes"])
|
||||
|
||||
dnl Guile-newt is used by the graphical installer.
|
||||
GUILE_MODULE_AVAILABLE([have_guile_newt], [(newt)])
|
||||
|
||||
|
@ -189,19 +194,6 @@ AC_SUBST([GZIP])
|
|||
AC_SUBST([BZIP2])
|
||||
AC_SUBST([XZ])
|
||||
|
||||
AC_ARG_WITH([nix-prefix],
|
||||
[AS_HELP_STRING([--with-nix-prefix=DIR],
|
||||
[search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
|
||||
[case "$withval" in
|
||||
yes|no) ;;
|
||||
*)
|
||||
NIX_PREFIX="$withval"
|
||||
PATH="$NIX_PREFIX/bin:$PATH"; export PATH
|
||||
AC_SUBST([NIX_PREFIX])
|
||||
;;
|
||||
esac],
|
||||
[])
|
||||
|
||||
AC_ARG_WITH([nixpkgs],
|
||||
[AS_HELP_STRING([--with-nixpkgs=DIR],
|
||||
[search for Nixpkgs in DIR (for testing purposes only)])],
|
||||
|
|
|
@ -166,14 +166,15 @@ actually installing them. So that you can distinguish between your
|
|||
``end-user'' hat and your ``motley'' costume.
|
||||
|
||||
To that end, all the command-line tools can be used even if you have not
|
||||
run @code{make install}. To do that, you first need to have an environment
|
||||
with all the dependencies available (@pxref{Building from Git}), and then
|
||||
simply prefix each command with
|
||||
@command{./pre-inst-env} (the @file{pre-inst-env} script lives in the
|
||||
top build tree of Guix; it is generated by @command{./configure}).
|
||||
As an example, here is how you would build the @code{hello} package as
|
||||
defined in your working tree (this assumes @command{guix-daemon} is
|
||||
already running on your system; it's OK if it's a different version):
|
||||
run @code{make install}. To do that, you first need to have an
|
||||
environment with all the dependencies available (@pxref{Building from
|
||||
Git}), and then simply prefix each command with @command{./pre-inst-env}
|
||||
(the @file{pre-inst-env} script lives in the top build tree of Guix; it
|
||||
is generated by running @command{./bootstrap} followed by
|
||||
@command{./configure}). As an example, here is how you would build the
|
||||
@code{hello} package as defined in your working tree (this assumes
|
||||
@command{guix-daemon} is already running on your system; it's OK if it's
|
||||
a different version):
|
||||
|
||||
@example
|
||||
$ ./pre-inst-env guix build hello
|
||||
|
@ -391,6 +392,7 @@ needed is to review and apply the patch.
|
|||
* Version Numbers:: When the name is not enough.
|
||||
* Synopses and Descriptions:: Helping users find the right package.
|
||||
* Snippets versus Phases:: Whether to use a snippet, or a build phase.
|
||||
* Emacs Packages:: Your Elisp fix.
|
||||
* Python Modules:: A touch of British comedy.
|
||||
* Perl Modules:: Little pearls.
|
||||
* Java Packages:: Coffee break.
|
||||
|
@ -636,6 +638,46 @@ embed store items in the sources; such patching should rather be done
|
|||
using build phases. Refer to the @code{origin} record documentation for
|
||||
more information (@pxref{origin Reference}).
|
||||
|
||||
@node Emacs Packages
|
||||
@subsection Emacs Packages
|
||||
|
||||
@cindex emacs, packaging
|
||||
@cindex elisp, packaging
|
||||
Emacs packages should preferably use the Emacs build system
|
||||
(@pxref{emacs-build-system}), for uniformity and the benefits provided
|
||||
by its build phases, such as the auto-generation of the autoloads file
|
||||
and the byte compilation of the sources. Because there is no
|
||||
standardized way to run a test suite for Emacs packages, tests are
|
||||
disabled by default. When a test suite is available, it should be
|
||||
enabled by setting the @code{#:tests?} argument to @code{#true}. By
|
||||
default, the command to run the test is @command{make check}, but any
|
||||
command can be specified via the @code{#:test-command} argument. The
|
||||
@code{#:test-command} argument expects a list containing a command and
|
||||
its arguments, to be invoked during the @code{check} phase.
|
||||
|
||||
The Elisp dependencies of Emacs packages are typically provided as
|
||||
@code{propagated-inputs} when required at run time. As for other
|
||||
packages, build or test dependencies should be specified as
|
||||
@code{native-inputs}.
|
||||
|
||||
Emacs packages sometimes depend on resources directories that should be
|
||||
installed along the Elisp files. The @code{#:include} argument can be
|
||||
used for that purpose, by specifying a list of regexps to match. The
|
||||
best practice when using the @code{#:include} argument is to extend
|
||||
rather than override its default value (accessible via the
|
||||
@code{%default-include} variable). As an example, a yasnippet extension
|
||||
package typically include a @file{snippets} directory, which could be
|
||||
copied to the installation directory using:
|
||||
|
||||
@lisp
|
||||
#:include (cons "^snippets/" %default-include))
|
||||
@end lisp
|
||||
|
||||
When encountering problems, it is wise to check for the presence of the
|
||||
@code{Package-Requires} extension header in the package main source
|
||||
file, and whether any dependencies and their versions listed therein are
|
||||
satisfied.
|
||||
|
||||
@node Python Modules
|
||||
@subsection Python Modules
|
||||
|
||||
|
@ -864,7 +906,8 @@ to proper type error reports.
|
|||
Guix code should define appropriate data types (for instance, using
|
||||
@code{define-record-type*}) rather than abuse lists. In addition, it
|
||||
should use pattern matching, via Guile’s @code{(ice-9 match)} module,
|
||||
especially when matching lists.
|
||||
especially when matching lists (@pxref{Pattern Matching,,, guile, GNU
|
||||
Guile Reference Manual}).
|
||||
|
||||
@node Formatting Code
|
||||
@subsection Formatting Code
|
||||
|
@ -1008,7 +1051,7 @@ to other packages unwillingly retained. It may also help determine
|
|||
whether to split the package (@pxref{Packages with Multiple Outputs}),
|
||||
and which optional dependencies should be used. In particular, avoid adding
|
||||
@code{texlive} as a dependency: because of its extreme size, use
|
||||
@code{texlive-tiny} or @code{texlive-union} instead.
|
||||
the @code{texlive-tiny} package or @code{texlive-union} procedure instead.
|
||||
|
||||
@item
|
||||
For important changes, check that dependent package (if applicable) are
|
||||
|
|
|
@ -2245,7 +2245,7 @@ section on @ref{Reproducible profiles}.
|
|||
|
||||
@item
|
||||
Easier upgrades and maintenance: Multiple profiles make it easy to keep
|
||||
package listings at hand and make upgrades completely friction-less.
|
||||
package listings at hand and make upgrades completely frictionless.
|
||||
@end itemize
|
||||
|
||||
Concretely, here follows some typical profiles:
|
||||
|
|
282
doc/guix.texi
282
doc/guix.texi
|
@ -21,7 +21,7 @@
|
|||
@set SUBSTITUTE-URL https://@value{SUBSTITUTE-SERVER}
|
||||
|
||||
@copying
|
||||
Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès@*
|
||||
Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès@*
|
||||
Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@*
|
||||
Copyright @copyright{} 2013 Nikita Karetnikov@*
|
||||
Copyright @copyright{} 2014, 2015, 2016 Alex Kost@*
|
||||
|
@ -84,6 +84,8 @@ Copyright @copyright{} 2020 André Batista@*
|
|||
Copyright @copyright{} 2020 Alexandru-Sergiu Marton@*
|
||||
Copyright @copyright{} 2020 raingloom@*
|
||||
Copyright @copyright{} 2020 Daniel Brooks@*
|
||||
Copyright @copyright{} 2020 John Soo@*
|
||||
Copyright @copyright{} 2020 Jonathan Brielmaier@*
|
||||
|
||||
Permission is granted to copy, distribute and/or modify this document
|
||||
under the terms of the GNU Free Documentation License, Version 1.3 or
|
||||
|
@ -829,6 +831,7 @@ Guile,, gnutls-guile, GnuTLS-Guile});
|
|||
or later;
|
||||
@item @uref{https://notabug.org/guile-zlib/guile-zlib, Guile-zlib};
|
||||
@item @uref{https://notabug.org/guile-lzlib/guile-lzlib, Guile-lzlib};
|
||||
@item @uref{https://www.nongnu.org/guile-avahi/, Guile-Avahi};
|
||||
@item
|
||||
@c FIXME: Specify a version number once a release has been made.
|
||||
@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.3.0
|
||||
|
@ -848,6 +851,10 @@ Support for build offloading (@pxref{Daemon Offload Setup}) and
|
|||
@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH},
|
||||
version 0.13.0 or later.
|
||||
|
||||
@item
|
||||
@uref{https://ngyro.com/software/guile-semver.html, Guile-Semver} for
|
||||
the @code{crate} importer (@pxref{Invoking guix import}).
|
||||
|
||||
@item
|
||||
When @url{http://www.bzip.org, libbz2} is available,
|
||||
@command{guix-daemon} can use it to compress build logs.
|
||||
|
@ -1290,7 +1297,7 @@ master node:
|
|||
@end example
|
||||
|
||||
This will attempt to connect to each of the build machines specified in
|
||||
@file{/etc/guix/machines.scm}, make sure Guile and the Guix modules are
|
||||
@file{/etc/guix/machines.scm}, make sure Guix is
|
||||
available on each machine, attempt to export to the machine and import
|
||||
from it, and report any error in the process.
|
||||
|
||||
|
@ -1578,6 +1585,36 @@ Unless @option{--lose-logs} is used, all the build logs are kept in the
|
|||
@var{localstatedir}. To save space, the daemon automatically compresses
|
||||
them with Bzip2 by default.
|
||||
|
||||
@item --discover[=yes|no]
|
||||
Whether to discover substitute servers on the local network using mDNS
|
||||
and DNS-SD.
|
||||
|
||||
This feature is still experimental. However, here are a few
|
||||
considerations.
|
||||
|
||||
@enumerate
|
||||
@item
|
||||
It might be faster/less expensive than fetching from remote servers;
|
||||
@item
|
||||
There are no security risks, only genuine substitutes will be used
|
||||
(@pxref{Substitute Authentication});
|
||||
@item
|
||||
An attacker advertising @command{guix publish} on your LAN cannot serve
|
||||
you malicious binaries, but they can learn what software you’re
|
||||
installing;
|
||||
@item
|
||||
Servers may serve substitute over HTTP, unencrypted, so anyone on the
|
||||
LAN can see what software you’re installing.
|
||||
@end enumerate
|
||||
|
||||
It is also possible to enable or disable substitute server discovery at
|
||||
run-time by running:
|
||||
|
||||
@example
|
||||
herd discover guix-daemon on
|
||||
herd discover guix-daemon off
|
||||
@end example
|
||||
|
||||
@item --disable-deduplication
|
||||
@cindex deduplication
|
||||
Disable automatic file ``deduplication'' in the store.
|
||||
|
@ -2355,9 +2392,9 @@ bootloaders.
|
|||
|
||||
Once you are done partitioning the target hard disk drive, you have to
|
||||
create a file system on the relevant partition(s)@footnote{Currently
|
||||
Guix System only supports ext4, btrfs, and JFS file systems. In particular,
|
||||
code that reads file system UUIDs and labels only works for these file system
|
||||
types.}. For the ESP, if you have one and assuming it is
|
||||
Guix System only supports ext4, btrfs, JFS, and F2FS file systems. In
|
||||
particular, code that reads file system UUIDs and labels only works for these
|
||||
file system types.}. For the ESP, if you have one and assuming it is
|
||||
@file{/dev/sda1}, run:
|
||||
|
||||
@example
|
||||
|
@ -2750,7 +2787,7 @@ the command prints and, similar to what we saw above, paste these two
|
|||
lines in your terminal and @file{.bash_profile}:
|
||||
|
||||
@example
|
||||
GUIX_PROFILE="$HOME/.config/guix/current/etc/profile"
|
||||
GUIX_PROFILE="$HOME/.config/guix/current"
|
||||
. "$GUIX_PROFILE/etc/profile"
|
||||
@end example
|
||||
|
||||
|
@ -7311,6 +7348,29 @@ parameters available to cargo. It will also remove an included
|
|||
defined by the crate.
|
||||
@end defvr
|
||||
|
||||
@defvr {Scheme Variable} chicken-build-system
|
||||
This variable is exported by @code{(guix build-system chicken)}. It
|
||||
builds @uref{https://call-cc.org/, CHICKEN Scheme} modules, also called
|
||||
``eggs'' or ``extensions''. CHICKEN generates C source code, which then
|
||||
gets compiled by a C compiler, in this case GCC.
|
||||
|
||||
This build system adds @code{chicken} to the package inputs, as well as
|
||||
the packages of @code{gnu-build-system}.
|
||||
|
||||
The build system can't (yet) deduce the egg's name automatically, so just like
|
||||
with @code{go-build-system} and its @code{#:import-path}, you should define
|
||||
@code{#:egg-name} in the package's @code{arguments} field.
|
||||
|
||||
For example, if you are packaging the @code{srfi-1} egg:
|
||||
|
||||
@lisp
|
||||
(arguments '(#:egg-name "srfi-1"))
|
||||
@end lisp
|
||||
|
||||
Egg dependencies must be defined in @code{propagated-inputs}, not @code{inputs}
|
||||
because CHICKEN doesn't embed absolute references in compiled eggs.
|
||||
Test dependencies should go to @code{native-inputs}, as usual.
|
||||
@end defvr
|
||||
|
||||
@defvr {Scheme Variable} copy-build-system
|
||||
This variable is exported by @code{(guix build-system copy)}. It
|
||||
|
@ -7878,6 +7938,7 @@ Which D compiler is used can be specified with the @code{#:ldc}
|
|||
parameter which defaults to @code{ldc}.
|
||||
@end defvr
|
||||
|
||||
@anchor{emacs-build-system}
|
||||
@defvr {Scheme Variable} emacs-build-system
|
||||
This variable is exported by @code{(guix build-system emacs)}. It
|
||||
implements an installation procedure similar to the packaging system
|
||||
|
@ -10306,6 +10367,24 @@ This is similar to @option{--with-branch}, except that it builds from
|
|||
@var{commit} rather than the tip of a branch. @var{commit} must be a valid
|
||||
Git commit SHA1 identifier or a tag.
|
||||
|
||||
@item --with-patch=@var{package}=@var{file}
|
||||
Add @var{file} to the list of patches applied to @var{package}, where
|
||||
@var{package} is a spec such as @code{python@@3.8} or @code{glibc}.
|
||||
@var{file} must contain a patch; it is applied with the flags specified
|
||||
in the @code{origin} of @var{package} (@pxref{origin Reference}), which
|
||||
by default includes @code{-p1} (@pxref{patch Directories,,, diffutils,
|
||||
Comparing and Merging Files}).
|
||||
|
||||
As an example, the command below rebuilds Coreutils with the GNU C
|
||||
Library (glibc) patched with the given patch:
|
||||
|
||||
@example
|
||||
guix build coreutils --with-patch=glibc=./glibc-frob.patch
|
||||
@end example
|
||||
|
||||
In this example, glibc itself as well as everything that leads to
|
||||
Coreutils in the dependency graph is rebuilt.
|
||||
|
||||
@cindex test suite, skipping
|
||||
@item --without-tests=@var{package}
|
||||
Build @var{package} without running its tests. This can be useful in
|
||||
|
@ -10409,6 +10488,13 @@ The returned source tarball is the result of applying any patches and
|
|||
code snippets specified in the package @code{origin} (@pxref{Defining
|
||||
Packages}).
|
||||
|
||||
@cindex source, verification
|
||||
As with other derivations, the result of building a source derivation
|
||||
can be verified using the @option{--check} option (@pxref{build-check}).
|
||||
This is useful to validate that a (potentially already built or
|
||||
substituted, thus cached) package source matches against its declared
|
||||
hash.
|
||||
|
||||
Note that @command{guix build -S} compiles the sources only of the
|
||||
specified packages. They do not include the sources of statically
|
||||
linked dependencies and by themselves are insufficient for reproducing
|
||||
|
@ -10951,6 +11037,13 @@ When @option{--recursive} is added, the importer will traverse the
|
|||
dependency graph of the given upstream package recursively and generate
|
||||
package expressions for all those packages that are not yet in Guix.
|
||||
|
||||
When @option{--style=specification} is added, the importer will generate
|
||||
package definitions whose inputs are package specifications instead of
|
||||
references to package variables. This is useful when generated package
|
||||
definitions are to be appended to existing user modules, as the list of
|
||||
used package modules need not be changed. The default is
|
||||
@option{--style=variable}.
|
||||
|
||||
When @option{--archive=bioconductor} is added, metadata is imported from
|
||||
@uref{https://www.bioconductor.org/, Bioconductor}, a repository of R
|
||||
packages for the analysis and comprehension of high-throughput
|
||||
|
@ -11234,6 +11327,25 @@ in Guix.
|
|||
@cindex OCaml
|
||||
Import metadata from the @uref{https://opam.ocaml.org/, OPAM} package
|
||||
repository used by the OCaml community.
|
||||
|
||||
Additional options include:
|
||||
|
||||
@table @code
|
||||
@item --recursive
|
||||
@itemx -r
|
||||
Traverse the dependency graph of the given upstream package recursively
|
||||
and generate package expressions for all those packages that are not yet
|
||||
in Guix.
|
||||
@item --repo
|
||||
Select the given repository (a repository name). Possible values include:
|
||||
@itemize
|
||||
@item @code{opam}, the default opam repository,
|
||||
@item @code{coq} or @code{coq-released}, the stable repository for coq packages,
|
||||
@item @code{coq-core-dev}, the repository that contains development versions of coq,
|
||||
@item @code{coq-extra-dev}, the repository that contains development versions
|
||||
of coq packages.
|
||||
@end itemize
|
||||
@end table
|
||||
@end table
|
||||
|
||||
The structure of the @command{guix import} code is modular. It would be
|
||||
|
@ -12167,6 +12279,11 @@ The signing key pair must be generated before @command{guix publish} is
|
|||
launched, using @command{guix archive --generate-key} (@pxref{Invoking
|
||||
guix archive}).
|
||||
|
||||
When the @option{--advertise} option is passed, the server advertises
|
||||
its availability on the local network using multicast DNS (mDNS) and DNS
|
||||
service discovery (DNS-SD), currently @i{via} Guile-Avahi (@pxref{Top,,,
|
||||
guile-avahi, Using Avahi in Guile Scheme Programs}).
|
||||
|
||||
The general syntax is:
|
||||
|
||||
@example
|
||||
|
@ -12846,9 +12963,12 @@ ClientCommand: cuirass --cache-directory /var/cache/cuirass @dots{}
|
|||
LockHeld: /gnu/store/@dots{}-perl-ipc-cmd-0.96.lock
|
||||
LockHeld: /gnu/store/@dots{}-python-six-bootstrap-1.11.0.lock
|
||||
LockHeld: /gnu/store/@dots{}-libjpeg-turbo-2.0.0.lock
|
||||
ChildProcess: 20495: guix offload x86_64-linux 7200 1 28800
|
||||
ChildProcess: 27733: guix offload x86_64-linux 7200 1 28800
|
||||
ChildProcess: 27793: guix offload x86_64-linux 7200 1 28800
|
||||
ChildPID: 20495
|
||||
ChildCommand: guix offload x86_64-linux 7200 1 28800
|
||||
ChildPID: 27733
|
||||
ChildCommand: guix offload x86_64-linux 7200 1 28800
|
||||
ChildPID: 27793
|
||||
ChildCommand: guix offload x86_64-linux 7200 1 28800
|
||||
@end example
|
||||
|
||||
In this example we see that @command{guix-daemon} has three clients:
|
||||
|
@ -12857,12 +12977,12 @@ integration tool; their process identifier (PID) is given by the
|
|||
@code{ClientPID} field. The @code{SessionPID} field gives the PID of the
|
||||
@command{guix-daemon} sub-process of this particular session.
|
||||
|
||||
The @code{LockHeld} fields show which store items are currently locked by this
|
||||
session, which corresponds to store items being built or substituted (the
|
||||
@code{LockHeld} field is not displayed when @command{guix processes} is not
|
||||
running as root). Last, by looking at the @code{ChildProcess} field, we
|
||||
understand that these three builds are being offloaded (@pxref{Daemon Offload
|
||||
Setup}).
|
||||
The @code{LockHeld} fields show which store items are currently locked
|
||||
by this session, which corresponds to store items being built or
|
||||
substituted (the @code{LockHeld} field is not displayed when
|
||||
@command{guix processes} is not running as root). Last, by looking at
|
||||
the @code{ChildPID} and @code{ChildCommand} fields, we understand that
|
||||
these three builds are being offloaded (@pxref{Daemon Offload Setup}).
|
||||
|
||||
The output is in Recutils format so we can use the handy @command{recsel}
|
||||
command to select sessions of interest (@pxref{Selection Expressions,,,
|
||||
|
@ -12876,6 +12996,45 @@ ClientPID: 19419
|
|||
ClientCommand: cuirass --cache-directory /var/cache/cuirass @dots{}
|
||||
@end example
|
||||
|
||||
Additional options are listed below.
|
||||
|
||||
@table @code
|
||||
@item --format=@var{format}
|
||||
@itemx -f @var{format}
|
||||
Produce output in the specified @var{format}, one of:
|
||||
|
||||
@table @code
|
||||
@item recutils
|
||||
The default option. It outputs a set of Session recutils records
|
||||
that include each @code{ChildProcess} as a field.
|
||||
|
||||
@item normalized
|
||||
Normalize the output records into record sets (@pxref{Record Sets,,,
|
||||
recutils, GNU recutils manual}). Normalizing into record sets allows
|
||||
joins across record types. The example below lists the PID of each
|
||||
@code{ChildProcess} and the associated PID for @code{Session} that
|
||||
spawned the @code{ChildProcess} where the @code{Session} was started
|
||||
using @command{guix build}.
|
||||
|
||||
@example
|
||||
$ guix processes --format=normalized | \
|
||||
recsel \
|
||||
-j Session \
|
||||
-t ChildProcess \
|
||||
-p Session.PID,PID \
|
||||
-e 'Session.ClientCommand ~ "guix build"'
|
||||
PID: 4435
|
||||
Session_PID: 4278
|
||||
|
||||
PID: 4554
|
||||
Session_PID: 4278
|
||||
|
||||
PID: 4646
|
||||
Session_PID: 4278
|
||||
@end example
|
||||
@end table
|
||||
@end table
|
||||
|
||||
@node System Configuration
|
||||
@chapter System Configuration
|
||||
|
||||
|
@ -13209,7 +13368,8 @@ The default label includes the kernel name and version.
|
|||
@item @code{keyboard-layout} (default: @code{#f})
|
||||
This field specifies the keyboard layout to use in the console. It can be
|
||||
either @code{#f}, in which case the default keyboard layout is used (usually
|
||||
US English), or a @code{<keyboard-layout>} record.
|
||||
US English), or a @code{<keyboard-layout>} record. @xref{Keyboard Layout},
|
||||
for more information.
|
||||
|
||||
This keyboard layout is in effect as soon as the kernel has booted. For
|
||||
instance, it is the keyboard layout in effect when you type a passphrase if
|
||||
|
@ -15019,6 +15179,10 @@ disables the timeout.
|
|||
The type of compression used for build logs---one of @code{gzip},
|
||||
@code{bzip2}, or @code{none}.
|
||||
|
||||
@item @code{discover?} (default: @code{#f})
|
||||
Whether to discover substitute servers on the local network using mDNS
|
||||
and DNS-SD.
|
||||
|
||||
@item @code{extra-options} (default: @code{'()})
|
||||
List of extra command-line options for @command{guix-daemon}.
|
||||
|
||||
|
@ -15226,6 +15390,14 @@ The TCP port to listen for connections.
|
|||
The host (and thus, network interface) to listen to. Use
|
||||
@code{"0.0.0.0"} to listen on all the network interfaces.
|
||||
|
||||
@item @code{advertise?} (default: @code{#f})
|
||||
When true, advertise the service on the local network @i{via} the DNS-SD
|
||||
protocol, using Avahi.
|
||||
|
||||
This allows neighboring Guix devices with discovery on (see
|
||||
@code{guix-configuration} above) to discover this @command{guix publish}
|
||||
instance and to automatically download substitutes from it.
|
||||
|
||||
@item @code{compression} (default: @code{'(("gzip" 3))})
|
||||
This is a list of compression method/level tuple used when compressing
|
||||
substitutes. For example, to compress all substitutes with @emph{both} lzip
|
||||
|
@ -17102,6 +17274,10 @@ only restarts services that are not currently running, which is
|
|||
conservative: it minimizes disruption but leaves outdated services
|
||||
running.
|
||||
|
||||
Use @command{herd status} to find out candidates for restarting.
|
||||
@xref{Services}, for general information about services. Common
|
||||
services to restart would include @code{ntpd} and @code{ssh-daemon}.
|
||||
|
||||
By default, the @code{mcron} service is restarted. This ensures that
|
||||
the latest version of the unattended upgrade job will be used next time.
|
||||
|
||||
|
@ -18451,6 +18627,12 @@ This service adds the @code{xfce} package to the system profile, and
|
|||
extends polkit with the ability for @code{thunar} to manipulate the file
|
||||
system as root from within a user session, after the user has authenticated
|
||||
with the administrator's password.
|
||||
|
||||
Note that @code{xfce4-panel} and its plugin packages should be installed in
|
||||
the same profile to ensure compatibility. When using this service, you should
|
||||
add extra plugins (@code{xfce4-whiskermenu-plugin},
|
||||
@code{xfce4-weather-plugin}, etc.) to the @code{packages} field of your
|
||||
@code{operating-system}.
|
||||
@end defvr
|
||||
|
||||
@deftp {Data Type} xfce-desktop-configuration
|
||||
|
@ -21046,6 +21228,30 @@ Mailutils Manual}, for details.
|
|||
@end table
|
||||
@end deftp
|
||||
|
||||
@subsubheading Radicale Service
|
||||
@cindex CalDAV
|
||||
@cindex CardDAV
|
||||
|
||||
@deffn {Scheme Variable} radicale-service-type
|
||||
This is the type of the @uref{https://radicale.org, Radicale} CalDAV/CardDAV
|
||||
server whose value should be a @code{radicale-configuration}.
|
||||
@end deffn
|
||||
|
||||
@deftp {Data Type} radicale-configuration
|
||||
Data type representing the configuration of @command{radicale}.
|
||||
|
||||
@table @asis
|
||||
@item @code{package} (default: @code{radicale})
|
||||
The package that provides @command{radicale}.
|
||||
|
||||
@item @code{config-file} (default: @code{%default-radicale-config-file})
|
||||
File-like object of the configuration file to use, by default it will listen
|
||||
on TCP port 5232 of @code{localhost} and use the @code{htpasswd} file at
|
||||
@file{/var/lib/radicale/users} with no (@code{plain}) encryption.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
@node Messaging Services
|
||||
@subsection Messaging Services
|
||||
|
||||
|
@ -21917,13 +22123,10 @@ where monitoring these statistics is desirable.
|
|||
@defvar {Scheme variable} prometheus-node-exporter-service-type
|
||||
This is the service type for the
|
||||
@uref{https://github.com/prometheus/node_exporter/, prometheus-node-exporter}
|
||||
service, its value must be a @code{prometheus-node-exporter-configuration}
|
||||
record as in this example:
|
||||
service, its value must be a @code{prometheus-node-exporter-configuration}.
|
||||
|
||||
@lisp
|
||||
(service prometheus-node-exporter-service-type
|
||||
(prometheus-node-exporter-configuration
|
||||
(web-listen-address ":9100")))
|
||||
(service prometheus-node-exporter-service-type)
|
||||
@end lisp
|
||||
@end defvar
|
||||
|
||||
|
@ -21937,6 +22140,14 @@ The prometheus-node-exporter package to use.
|
|||
@item @code{web-listen-address} (default: @code{":9100"})
|
||||
Bind the web interface to the specified address.
|
||||
|
||||
@item @code{textfile-directory} (default: @code{"/var/lib/prometheus/node-exporter"})
|
||||
This directory can be used to export metrics specific to this machine.
|
||||
Files containing metrics in the text format, with the filename ending in
|
||||
@code{.prom} should be placed in this directory.
|
||||
|
||||
@item @code{extra-options} (default: @code{'()})
|
||||
Extra options to pass to the Prometheus node exporter.
|
||||
|
||||
@end table
|
||||
@end deftp
|
||||
|
||||
|
@ -22112,7 +22323,7 @@ Defaults to @samp{"zabbix"}.
|
|||
Unique, case sensitive hostname which is required for active checks and
|
||||
must match hostname as configured on the server.
|
||||
|
||||
Defaults to @samp{"Zabbix server"}.
|
||||
Defaults to @samp{""}.
|
||||
|
||||
@end deftypevr
|
||||
|
||||
|
@ -25572,6 +25783,9 @@ Owner's group of the @code{cuirass} process.
|
|||
Number of seconds between the poll of the repositories followed by the
|
||||
Cuirass jobs.
|
||||
|
||||
@item @code{queue-size} (default: @code{1})
|
||||
Size of the database writer queue.
|
||||
|
||||
@item @code{database} (default: @code{"/var/lib/cuirass/cuirass.db"})
|
||||
Location of sqlite database which contains the build results and previously
|
||||
added specifications.
|
||||
|
@ -31344,10 +31558,12 @@ each other:
|
|||
@table @code
|
||||
|
||||
@item extension-graph
|
||||
Emit in Dot/Graphviz format to standard output the @dfn{service
|
||||
Emit to standard output the @dfn{service
|
||||
extension graph} of the operating system defined in @var{file}
|
||||
(@pxref{Service Composition}, for more information on service
|
||||
extensions).
|
||||
extensions). By default the output is in Dot/Graphviz format, but you
|
||||
can choose a different format with @option{--graph-backend}, as with
|
||||
@command{guix graph} (@pxref{Invoking guix graph, @option{--backend}}):
|
||||
|
||||
The command:
|
||||
|
||||
|
@ -31359,11 +31575,14 @@ shows the extension relations among services.
|
|||
|
||||
@anchor{system-shepherd-graph}
|
||||
@item shepherd-graph
|
||||
Emit in Dot/Graphviz format to standard output the @dfn{dependency
|
||||
Emit to standard output the @dfn{dependency
|
||||
graph} of shepherd services of the operating system defined in
|
||||
@var{file}. @xref{Shepherd Services}, for more information and for an
|
||||
example graph.
|
||||
|
||||
Again, the default output format is Dot/Graphviz, but you can pass
|
||||
@option{--graph-backend} to select a different one.
|
||||
|
||||
@end table
|
||||
|
||||
@node Invoking guix deploy
|
||||
|
@ -32699,10 +32918,15 @@ Bootstrapping in our context refers to how the distribution gets built
|
|||
``from nothing''. Remember that the build environment of a derivation
|
||||
contains nothing but its declared inputs (@pxref{Introduction}). So
|
||||
there's an obvious chicken-and-egg problem: how does the first package
|
||||
get built? How does the first compiler get compiled? Note that this is
|
||||
a question of interest only to the curious hacker, not to the regular
|
||||
user, so you can shamelessly skip this section if you consider yourself
|
||||
a ``regular user''.
|
||||
get built? How does the first compiler get compiled?
|
||||
|
||||
It is tempting to think of this question as one that only die-hard
|
||||
hackers may care about. However, while the answer to that question is
|
||||
technical in nature, its implications are wide-ranging. How the
|
||||
distribution is bootstrapped defines the extent to which we, as
|
||||
individuals and as a collective of users and hackers, can trust the
|
||||
software we run. It is a central concern from the standpoint of
|
||||
@emph{security} and from a @emph{user freedom} viewpoint.
|
||||
|
||||
@cindex bootstrap binaries
|
||||
The GNU system is primarily made of C code, with libc at its core. The
|
||||
|
|
|
@ -111,6 +111,24 @@ _guix_is_removing ()
|
|||
$result
|
||||
}
|
||||
|
||||
_guix_is_dash_f ()
|
||||
{
|
||||
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-f" ] \
|
||||
|| { case "${COMP_WORDS[$COMP_CWORD]}" in
|
||||
--file=*|--install-from-file=*) true;;
|
||||
*) false;;
|
||||
esac }
|
||||
}
|
||||
|
||||
_guix_is_dash_l ()
|
||||
{
|
||||
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-l" ] \
|
||||
|| { case "${COMP_WORDS[$COMP_CWORD]}" in
|
||||
--load=*) true;;
|
||||
*) false;;
|
||||
esac }
|
||||
}
|
||||
|
||||
_guix_is_dash_L ()
|
||||
{
|
||||
[ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-L" ] \
|
||||
|
@ -182,7 +200,7 @@ _guix_complete ()
|
|||
*)
|
||||
if _guix_is_command "package"
|
||||
then
|
||||
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p
|
||||
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p || _guix_is_dash_f
|
||||
then
|
||||
_guix_complete_file
|
||||
elif _guix_is_removing
|
||||
|
@ -217,7 +235,7 @@ _guix_complete ()
|
|||
fi
|
||||
elif _guix_is_command "build"
|
||||
then
|
||||
if _guix_is_dash_L || _guix_is_dash_m
|
||||
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_f
|
||||
then
|
||||
_guix_complete_file
|
||||
else
|
||||
|
@ -225,7 +243,7 @@ _guix_complete ()
|
|||
fi
|
||||
elif _guix_is_command "environment"
|
||||
then
|
||||
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p
|
||||
if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p || _guix_is_dash_l
|
||||
then
|
||||
_guix_complete_file
|
||||
else
|
||||
|
|
|
@ -20,13 +20,26 @@
|
|||
#
|
||||
# <local ref> <local sha1> <remote ref> <remote sha1>
|
||||
|
||||
# Only use the hook when pushing to Savannah.
|
||||
case "$2" in
|
||||
*.gnu.org*)
|
||||
exec make authenticate check-channel-news
|
||||
exit 127
|
||||
;;
|
||||
*)
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
# This is the "empty hash" used by Git when pushing a branch deletion.
|
||||
z40=0000000000000000000000000000000000000000
|
||||
|
||||
while read local_ref local_hash remote_ref remote_hash
|
||||
do
|
||||
# When deleting a remote branch, no commits are pushed to the remote, and
|
||||
# thus there are no signatures to be verified.
|
||||
if [ "$local_hash" != $z40 ]
|
||||
then
|
||||
# Only use the hook when pushing to Savannah.
|
||||
case "$2" in
|
||||
*.gnu.org*)
|
||||
exec make authenticate check-channel-news
|
||||
exit 127
|
||||
;;
|
||||
*)
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
|
||||
exit 0
|
||||
|
|
|
@ -167,7 +167,9 @@
|
|||
(process (fork execmem setrlimit setpgid setsched)))
|
||||
(allow guix_daemon_t
|
||||
guix_daemon_exec_t
|
||||
(file (execute execute_no_trans read open entrypoint map)))
|
||||
(file (execute
|
||||
execute_no_trans read write open entrypoint map
|
||||
getattr link unlink)))
|
||||
|
||||
;; TODO: unknown
|
||||
(allow guix_daemon_t
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
# Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
# Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
|
||||
# Copyright © 2020 Daniel Brooks <db48x@db48x.net>
|
||||
# Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
#
|
||||
# This file is part of GNU Guix.
|
||||
#
|
||||
|
@ -183,9 +184,9 @@ chk_sys_arch()
|
|||
aarch64)
|
||||
local arch=aarch64
|
||||
;;
|
||||
armv7l)
|
||||
local arch=armhf
|
||||
;;
|
||||
armv7l)
|
||||
local arch=armhf
|
||||
;;
|
||||
*)
|
||||
_err "${ERR}Unsupported CPU type: ${arch}"
|
||||
exit 1
|
||||
|
@ -233,7 +234,7 @@ guix_get_bin_list()
|
|||
| sed -n -e 's/.*guix-binary-\([0-9.]*[a-z0-9]*\)\..*.tar.xz.*/\1/p' \
|
||||
| sort -Vu)")
|
||||
|
||||
latest_ver="$(echo "$bin_ver_ls" \
|
||||
latest_ver="$(echo "${bin_ver_ls[0]}" \
|
||||
| grep -oE "([0-9]{1,2}\.){2}[0-9]{1,2}[a-z0-9]*" \
|
||||
| tail -n1)"
|
||||
|
||||
|
@ -247,7 +248,7 @@ guix_get_bin_list()
|
|||
fi
|
||||
|
||||
# Use default to download according to the list and local ARCH_OS.
|
||||
BIN_VER="$default_ver"
|
||||
BIN_VER="${default_ver}"
|
||||
}
|
||||
|
||||
guix_get_bin()
|
||||
|
@ -271,7 +272,7 @@ guix_get_bin()
|
|||
exit 1
|
||||
fi
|
||||
|
||||
pushd $dl_path >/dev/null
|
||||
pushd "${dl_path}" >/dev/null
|
||||
gpg --verify "${bin_ver}.tar.xz.sig" >/dev/null 2>&1
|
||||
if [[ "$?" -eq 0 ]]; then
|
||||
_msg "${PAS}Signature is valid."
|
||||
|
@ -379,15 +380,15 @@ sys_enable_guix_daemon()
|
|||
/etc/systemd/system/;
|
||||
chmod 664 /etc/systemd/system/guix-daemon.service;
|
||||
|
||||
# Work around <https://bugs.gnu.org/36074>, present in 1.0.1.
|
||||
sed -i /etc/systemd/system/guix-daemon.service \
|
||||
-e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/";
|
||||
# Work around <https://bugs.gnu.org/36074>, present in 1.0.1.
|
||||
sed -i /etc/systemd/system/guix-daemon.service \
|
||||
-e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/";
|
||||
|
||||
# Work around <https://bugs.gnu.org/35671>, present in 1.0.1.
|
||||
if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null;
|
||||
then sed -i /etc/systemd/system/guix-daemon.service \
|
||||
-e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8';
|
||||
fi;
|
||||
# Work around <https://bugs.gnu.org/35671>, present in 1.0.1.
|
||||
if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null;
|
||||
then sed -i /etc/systemd/system/guix-daemon.service \
|
||||
-e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8';
|
||||
fi;
|
||||
|
||||
systemctl daemon-reload &&
|
||||
systemctl enable guix-daemon &&
|
||||
|
@ -427,7 +428,7 @@ sys_enable_guix_daemon()
|
|||
ln -sf "${var_guix}/bin/guix" "$local_bin"
|
||||
|
||||
[ -e "$info_path" ] || mkdir -p "$info_path"
|
||||
for i in ${var_guix}/share/info/*; do
|
||||
for i in "${var_guix}"/share/info/*; do
|
||||
ln -sf "$i" "$info_path"
|
||||
done
|
||||
}
|
||||
|
@ -454,14 +455,12 @@ sys_create_init_profile()
|
|||
cat <<"EOF" > /etc/profile.d/guix.sh
|
||||
# _GUIX_PROFILE: `guix pull` profile
|
||||
_GUIX_PROFILE="$HOME/.config/guix/current"
|
||||
if [ -L $_GUIX_PROFILE ]; then
|
||||
export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
|
||||
# Export INFOPATH so that the updated info pages can be found
|
||||
# and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
|
||||
# When INFOPATH is unset, add a trailing colon so that Emacs
|
||||
# searches 'Info-default-directory-list'.
|
||||
export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
|
||||
fi
|
||||
export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH"
|
||||
# Export INFOPATH so that the updated info pages can be found
|
||||
# and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info
|
||||
# When INFOPATH is unset, add a trailing colon so that Emacs
|
||||
# searches 'Info-default-directory-list'.
|
||||
export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH"
|
||||
|
||||
# GUIX_PROFILE: User's default profile
|
||||
GUIX_PROFILE="$HOME/.guix-profile"
|
||||
|
|
86
etc/news.scm
86
etc/news.scm
|
@ -18,9 +18,77 @@
|
|||
(channel-news
|
||||
(version 0)
|
||||
|
||||
(entry (commit "e38d90d497e19e00263fa28961c688a433154386")
|
||||
(title (en "New @option{--with-patch} package transformation option")
|
||||
(de "Neue Paketumwandlungsoption @option{--with-patch}")
|
||||
(fr "Nouvelle option de transformation @option{--with-patch}"))
|
||||
(body
|
||||
(en "The new @option{--with-patch} package transformation option
|
||||
applies patches to the specified packages before building them. The example
|
||||
below builds the GNU Core Utilities against a patched C library (glibc):
|
||||
|
||||
@example
|
||||
guix build coreutils --with-patch=glibc=./glibc-frob.patch
|
||||
@end example
|
||||
|
||||
Run @command{info \"(guix) Package Transformation Options\"} for more info.")
|
||||
(de "Die neue Paketumwandlungsoption @option{--with-patch} wendet
|
||||
Patches auf die angegebenen Pakete an, bevor sie erstellt werden. Das folgende
|
||||
Beispiel lässt die GNU Core Utilities mit einer gepatchten
|
||||
C-Bibliothek (glibc) erstellen:
|
||||
|
||||
@example
|
||||
guix build coreutils --with-patch=glibc=./glibc-frob.patch
|
||||
@end example
|
||||
|
||||
Führen Sie für mehr Informationen @command{info \"(guix.de)
|
||||
Paketumwandlungsoptionen\"} aus.")
|
||||
(fr "La nouvelle option de transformation de paquets
|
||||
@option{--with-patch} applique des modifications (@i{patches}) aux paquets
|
||||
spécifiés avant de les compiler. L'exemple suivant compile les utilitaires de
|
||||
base GNU avec une bibliothèque C (glibc) modifiée :
|
||||
|
||||
@example
|
||||
guix build coreutils --with-patch=glibc=./glibc-frob.patch
|
||||
@end example
|
||||
|
||||
Voir @command{info \"(guix.fr) Options de transformation de paquets\"} pour
|
||||
plus de détails.")))
|
||||
|
||||
(entry (commit "79f9dee3c4c0e6d21066f142116a537207ae7ba4")
|
||||
(title (en "Local substitute servers discovery is now supported")
|
||||
(de "Substitutserver können jetzt im lokalen Netz erkannt werden")
|
||||
(es "Los servidores de sustituciones se pueden descubrir localmente")
|
||||
(fr "La découverte des serveurs de substituts locaux est désormais supportée"))
|
||||
(body
|
||||
(en "The @command{guix-daemon} can now discover local substitute
|
||||
servers when the @option{--discover} option is passed. Only the substitute
|
||||
servers started with the @option{--advertise} option will be discovered. The
|
||||
network discovery is based on mDNS and DNS-SD protocols, using Guile-Avahi
|
||||
library for now.")
|
||||
(de "Mit dem @command{guix-daemon} können jetzt lokal laufende
|
||||
Substitutserver erkannt werden, wenn die Befehlszeilenoption
|
||||
@option{--discover} übergeben wurde. Nur solche Substitutserver werden
|
||||
gefunden, die mit der Befehlszeilenoption @option{--advertise} gestartet
|
||||
wurden. Die Ermittlung im Netzwerk verfügbarer Substitutserver baut auf den
|
||||
Protokollen mDNS und DNS-SD auf. Derzeit wird dazu die Bibliothek Guile-Avahi
|
||||
benutzt.")
|
||||
(es "El daemon @command{guix-daemon} ahora puede descubrir servidores
|
||||
de sustituciones locales cuando se le proporciona la opción
|
||||
@option{--discover}. Únicamente se descubrirán los servidores de
|
||||
sustituciones que se hayan arrancado con la opción @option{--advertise}. La
|
||||
búsqueda en la red se basa en los protocolos mDNS y DNS-SD, actualmente
|
||||
mediante el uso de la biblioteca Guile-Avahi.")
|
||||
(fr "Le @command{guix-daemon} peut désormais découvrir les serveurs
|
||||
de substituts locaux lorsque l'option @option{--discover} est passée. Seuls
|
||||
les serveurs de substituts démarrés avec l'option @option{--advertise} seront
|
||||
découverts. La découverte réseau utilise les protocoles mDNS et DNS-SD, pour
|
||||
l'instant grâce à la librairie Guile-Avahi.")))
|
||||
|
||||
(entry (commit "a9a2fdaabcc78e7a54d9a6bcfa4ee3de308e9a90")
|
||||
(title (en "Logical Volume Manager (LVM) now supported on Guix System")
|
||||
(de "Logical Volume Manager (LVM) wird jetzt auf Guix System unterstützt"))
|
||||
(de "Logical Volume Manager (LVM) wird jetzt auf Guix System unterstützt")
|
||||
(es "El sistema Guix ahora implementa también volúmenes lógicos LVM"))
|
||||
(body
|
||||
(en "On Guix System, the new @code{lvm-device-mapping} variable
|
||||
allows you to declare ``mapped devices'' for LVM, the Linux Logical Volume
|
||||
|
@ -48,7 +116,21 @@ Datenträgergruppe (Volume Group) „vg0“ wie folgt deklariert werden:
|
|||
(type lvm-device-mapping))
|
||||
@end lisp
|
||||
|
||||
Siehe @command{info \"(guix.de) Zugeordnete Geräte\"} für nähere Informationen.")))
|
||||
Siehe @command{info \"(guix.de) Zugeordnete Geräte\"} für nähere Informationen.")
|
||||
(es "En el sistema Guix, la nueva variable @code{lvm-device-mapping}
|
||||
le permite declarar «dispositivos traducidos» para LVM, el gestor de volúmenes
|
||||
lógicos de Linux. A continuación se muestra un ejemplo con la declaración de
|
||||
los volúmenes lógicos «alfa» y «beta» del grupo de volúmenes «vg0»:
|
||||
|
||||
@lisp
|
||||
(mapped-device
|
||||
(source \"vg0\")
|
||||
(target (list \"vg0-alfa\" \"vg0-beta\"))
|
||||
(type lvm-device-mapping))
|
||||
@end lisp
|
||||
|
||||
Véase @command{info \"(guix.es) Dispositivos traducidos\"} para obtener más
|
||||
información.")))
|
||||
|
||||
(entry (commit "3b6e4e5fd05e72b8a32ff1a2d5e21464260e21e6")
|
||||
(title (en "List of substitute keys is now declarative on Guix System")
|
||||
|
|
|
@ -11,20 +11,30 @@
|
|||
"ant-build-system"
|
||||
"asdf-build-system"
|
||||
"cargo-build-system"
|
||||
"clojure-build-system"
|
||||
"cmake-build-system"
|
||||
"copy-build-system"
|
||||
"dub-build-system"
|
||||
"dune-build-system"
|
||||
"emacs-build-system"
|
||||
"font-build-system"
|
||||
"glib-or-gtk-build-system"
|
||||
"gnu-build-system"
|
||||
"go-build-system"
|
||||
"guile-build-system"
|
||||
"haskell-build-system"
|
||||
"julia-build-system"
|
||||
"linux-module-build-system"
|
||||
"maven-build-system"
|
||||
"meson-build-system"
|
||||
"minify-build-system"
|
||||
"node-build-system"
|
||||
"ocaml-build-system"
|
||||
"perl-build-system"
|
||||
"python-build-system"
|
||||
"qt-build-system"
|
||||
"r-build-system"
|
||||
"rakudo-build-system"
|
||||
"ruby-build-system"
|
||||
"scons-build-system"
|
||||
"texlive-build-system"
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
gnu: Add ${1:`(with-temp-buffer
|
||||
(magit-git-wash #'magit-diff-wash-diffs
|
||||
"diff" "--staged")
|
||||
(beginning-of-buffer)
|
||||
(when (search-forward "+(define-public " nil 'noerror)
|
||||
(thing-at-point 'sexp 'no-properties)))`}.
|
||||
(goto-char (point-min))
|
||||
(when (re-search-forward "\\+(define-public \\(\\S-+\\)" nil 'noerror)
|
||||
(match-string-no-properties 1)))`}.
|
||||
|
||||
* `(car (magit-staged-files))` ($1): New variable.
|
|
@ -7,12 +7,12 @@
|
|||
gnu: ${1:`(with-temp-buffer
|
||||
(magit-git-wash #'magit-diff-wash-diffs
|
||||
"diff" "--staged")
|
||||
(beginning-of-buffer)
|
||||
(when (search-forward "(define-public " nil 'noerror)
|
||||
(thing-at-point 'sexp 'no-properties)))`}: Update to ${2:`(with-temp-buffer
|
||||
(goto-char (point-min))
|
||||
(when (re-search-forward "(define-public \\(\\S-+\\)" nil 'noerror)
|
||||
(match-string-no-properties 1)))`}: Update to ${2:`(with-temp-buffer
|
||||
(magit-git-wash #'magit-diff-wash-diffs
|
||||
"diff" "--staged")
|
||||
(beginning-of-buffer)
|
||||
(goto-char (point-min))
|
||||
(search-forward "name" nil 'noerror)
|
||||
(search-forward "+" nil 'noerror) ; first change
|
||||
(when (and (search-forward "version " nil 'noerror)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2019 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
|
||||
;;;
|
||||
|
@ -359,11 +359,14 @@ code."
|
|||
(locale #f)
|
||||
(system (%current-system))
|
||||
(old-entries '())
|
||||
(store-crypto-devices '())
|
||||
store-directory-prefix)
|
||||
"Return the GRUB configuration file corresponding to CONFIG, a
|
||||
<bootloader-configuration> object, and where the store is available at
|
||||
STORE-FS, a <file-system> object. OLD-ENTRIES is taken to be a list of menu
|
||||
entries corresponding to old generations of the system.
|
||||
STORE-CRYPTO-DEVICES contain the UUIDs of the encrypted units that must
|
||||
be unlocked to access the store contents.
|
||||
STORE-DIRECTORY-PREFIX may be used to specify a store prefix, as is required
|
||||
when booting a root file system on a Btrfs subvolume."
|
||||
(define all-entries
|
||||
|
@ -411,6 +414,21 @@ menuentry ~s {
|
|||
(string-join (map string-join '#$modules)
|
||||
"\n module " 'prefix))))))
|
||||
|
||||
(define (crypto-devices)
|
||||
(define (crypto-device->cryptomount dev)
|
||||
(if (uuid? dev)
|
||||
#~(format port "cryptomount -u ~a~%"
|
||||
;; cryptomount only accepts UUID without the hypen.
|
||||
#$(string-delete #\- (uuid->string dev)))
|
||||
;; Other type of devices aren't implemented.
|
||||
#~()))
|
||||
(let ((devices (map crypto-device->cryptomount store-crypto-devices))
|
||||
;; XXX: Add luks2 when grub 2.06 is packaged.
|
||||
(modules #~(format port "insmod luks~%")))
|
||||
(if (null? devices)
|
||||
devices
|
||||
(cons modules devices))))
|
||||
|
||||
(define (sugar)
|
||||
(let* ((entry (first all-entries))
|
||||
(device (menu-entry-device entry))
|
||||
|
@ -474,6 +492,7 @@ keymap ~a~%" #$keymap))))
|
|||
"# This file was generated from your Guix configuration. Any changes
|
||||
# will be lost upon reconfiguration.
|
||||
")
|
||||
#$@(crypto-devices)
|
||||
#$(sugar)
|
||||
#$locale-config
|
||||
#$keyboard-layout-config
|
||||
|
|
|
@ -262,14 +262,16 @@ bytevector."
|
|||
|
||||
(define (check-bcachefs-file-system device)
|
||||
"Return the health of a bcachefs file system on DEVICE."
|
||||
(match (status:exit-val
|
||||
(let ((ignored-bits (logior 2)) ; DEVICE was mounted read-only
|
||||
(status
|
||||
(status:exit-val
|
||||
(apply system* "bcachefs" "fsck" "-p" "-v"
|
||||
;; Make each multi-device member a separate argument.
|
||||
(string-split device #\:)))
|
||||
(0 'pass)
|
||||
(1 'errors-corrected)
|
||||
(2 'reboot-required)
|
||||
(_ 'fatal-error)))
|
||||
(string-split device #\:)))))
|
||||
(match (logand (lognot ignored-bits) status)
|
||||
(0 'pass)
|
||||
(1 'errors-corrected)
|
||||
(_ 'fatal-error))))
|
||||
|
||||
|
||||
;;;
|
||||
|
|
|
@ -140,23 +140,17 @@ given CONFIG file."
|
|||
|
||||
(define* (register-closure prefix closure
|
||||
#:key
|
||||
(deduplicate? #t) (reset-timestamps? #t)
|
||||
(schema (sql-schema))
|
||||
(wal-mode? #t))
|
||||
"Register CLOSURE in PREFIX, where PREFIX is the directory name of the
|
||||
target store and CLOSURE is the name of a file containing a reference graph as
|
||||
produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is
|
||||
true, reset timestamps on store files and, if DEDUPLICATE? is true,
|
||||
deduplicates files common to CLOSURE and the rest of PREFIX. Pass WAL-MODE?
|
||||
to call-with-database."
|
||||
produced by #:references-graphs. Pass WAL-MODE? to call-with-database."
|
||||
(let ((items (call-with-input-file closure read-reference-graph)))
|
||||
(parameterize ((sql-schema schema))
|
||||
(with-database (store-database-file #:prefix prefix) db
|
||||
#:wal-mode? wal-mode?
|
||||
(register-items db items
|
||||
#:prefix prefix
|
||||
#:deduplicate? deduplicate?
|
||||
#:reset-timestamps? reset-timestamps?
|
||||
#:registration-time %epoch)))))
|
||||
|
||||
(define* (initialize-efi-partition root
|
||||
|
@ -188,7 +182,8 @@ rest of the store when registering the closures. SYSTEM-DIRECTORY is the name
|
|||
of the directory of the 'system' derivation. Pass WAL-MODE? to
|
||||
register-closure."
|
||||
(populate-root-file-system system-directory root)
|
||||
(populate-store references-graphs root)
|
||||
(populate-store references-graphs root
|
||||
#:deduplicate? deduplicate?)
|
||||
|
||||
;; Populate /dev.
|
||||
(when make-device-nodes
|
||||
|
@ -196,10 +191,7 @@ register-closure."
|
|||
|
||||
(when register-closures?
|
||||
(for-each (lambda (closure)
|
||||
(register-closure root
|
||||
closure
|
||||
#:reset-timestamps? #t
|
||||
#:deduplicate? deduplicate?
|
||||
(register-closure root closure
|
||||
#:wal-mode? wal-mode?))
|
||||
references-graphs))
|
||||
|
||||
|
|
|
@ -214,7 +214,8 @@ This is used to create the self-contained tarballs with 'guix pack'."
|
|||
(symlink old (scope new)))
|
||||
|
||||
;; Populate the store.
|
||||
(populate-store (list closure) directory)
|
||||
(populate-store (list closure) directory
|
||||
#:deduplicate? #f)
|
||||
|
||||
(when database
|
||||
(install-database-and-gc-roots directory database profile
|
||||
|
|
|
@ -560,7 +560,10 @@ upon error."
|
|||
(load-linux-modules-from-directory linux-modules
|
||||
linux-module-directory)
|
||||
|
||||
(unless (member "noresume" args)
|
||||
(unless (or (member "hibernate=noresume" args)
|
||||
;; Also handle the equivalent old-style argument.
|
||||
;; See Documentation/admin-guide/kernel-parameters.txt.
|
||||
(member "noresume" args))
|
||||
;; Try to resume immediately after loading (storage) modules
|
||||
;; but before any on-disk file systems have been mounted.
|
||||
(false-if-exception ; failure is not fatal
|
||||
|
|
|
@ -127,7 +127,8 @@ REFERENCES-GRAPHS."
|
|||
(mkdir "contents")
|
||||
|
||||
;; Copy the closures of all the items referenced in REFERENCES-GRAPHS.
|
||||
(populate-store references-graphs "contents")
|
||||
(populate-store references-graphs "contents"
|
||||
#:deduplicate? #f)
|
||||
|
||||
(with-directory-excursion "contents"
|
||||
;; Make '/init'.
|
||||
|
|
|
@ -215,20 +215,15 @@ the #:references-graphs parameter of 'derivation'."
|
|||
|
||||
(define* (register-closure prefix closure
|
||||
#:key
|
||||
(deduplicate? #t) (reset-timestamps? #t)
|
||||
(schema (sql-schema)))
|
||||
"Register CLOSURE in PREFIX, where PREFIX is the directory name of the
|
||||
target store and CLOSURE is the name of a file containing a reference graph as
|
||||
produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is
|
||||
true, reset timestamps on store files and, if DEDUPLICATE? is true,
|
||||
deduplicates files common to CLOSURE and the rest of PREFIX."
|
||||
produced by #:references-graphs."
|
||||
(let ((items (call-with-input-file closure read-reference-graph)))
|
||||
(parameterize ((sql-schema schema))
|
||||
(with-database (store-database-file #:prefix prefix) db
|
||||
(register-items db items
|
||||
#:prefix prefix
|
||||
#:deduplicate? deduplicate?
|
||||
#:reset-timestamps? reset-timestamps?
|
||||
#:registration-time %epoch)))))
|
||||
|
||||
|
||||
|
@ -397,7 +392,8 @@ system that is passed to 'populate-root-file-system'."
|
|||
(when copy-closures?
|
||||
;; Populate the store.
|
||||
(populate-store (map (cut string-append "/xchg/" <>) closures)
|
||||
target))
|
||||
target
|
||||
#:deduplicate? deduplicate?))
|
||||
|
||||
;; Populate /dev.
|
||||
(make-device-nodes target)
|
||||
|
@ -413,9 +409,7 @@ system that is passed to 'populate-root-file-system'."
|
|||
(display "registering closures...\n")
|
||||
(for-each (lambda (closure)
|
||||
(register-closure target
|
||||
(string-append "/xchg/" closure)
|
||||
#:reset-timestamps? copy-closures?
|
||||
#:deduplicate? deduplicate?))
|
||||
(string-append "/xchg/" closure)))
|
||||
closures)
|
||||
(unless copy-closures?
|
||||
(umount target-store)))
|
||||
|
|
|
@ -57,6 +57,7 @@
|
|||
#:use-module (gnu system vm)
|
||||
#:use-module (gnu system install)
|
||||
#:use-module (gnu system images hurd)
|
||||
#:use-module (gnu system images novena)
|
||||
#:use-module (gnu system images pine64)
|
||||
#:use-module (gnu system images pinebook-pro)
|
||||
#:use-module (gnu tests)
|
||||
|
@ -208,7 +209,8 @@ SYSTEM."
|
|||
(define %guix-system-images
|
||||
(list hurd-barebones-qcow2-image
|
||||
pine64-barebones-raw-image
|
||||
pinebook-pro-barebones-raw-image))
|
||||
pinebook-pro-barebones-raw-image
|
||||
novena-barebones-raw-image))
|
||||
|
||||
(define (hours hours)
|
||||
(* 3600 hours))
|
||||
|
|
|
@ -266,6 +266,13 @@ selected keymap."
|
|||
(compute (lambda _
|
||||
((installer-network-page current-installer)))))
|
||||
|
||||
;; Ask whether to enable substitute server discovery.
|
||||
(installer-step
|
||||
(id 'substitutes)
|
||||
(description (G_ "Substitute server discovery"))
|
||||
(compute (lambda _
|
||||
((installer-substitutes-page current-installer)))))
|
||||
|
||||
;; Prompt for users (name, group and home directory).
|
||||
(installer-step
|
||||
(id 'user)
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#:use-module (gnu installer newt page)
|
||||
#:use-module (gnu installer newt partition)
|
||||
#:use-module (gnu installer newt services)
|
||||
#:use-module (gnu installer newt substitutes)
|
||||
#:use-module (gnu installer newt timezone)
|
||||
#:use-module (gnu installer newt user)
|
||||
#:use-module (gnu installer newt utils)
|
||||
|
@ -101,6 +102,9 @@ problem. The backtrace is displayed below. Please report it by email to \
|
|||
(define (network-page)
|
||||
(run-network-page))
|
||||
|
||||
(define (substitutes-page)
|
||||
(run-substitutes-page))
|
||||
|
||||
(define (hostname-page)
|
||||
(run-hostname-page))
|
||||
|
||||
|
@ -130,6 +134,7 @@ problem. The backtrace is displayed below. Please report it by email to \
|
|||
(locale-page locale-page)
|
||||
(menu-page menu-page)
|
||||
(network-page network-page)
|
||||
(substitutes-page substitutes-page)
|
||||
(timezone-page timezone-page)
|
||||
(hostname-page hostname-page)
|
||||
(user-page user-page)
|
||||
|
|
43
gnu/installer/newt/substitutes.scm
Normal file
43
gnu/installer/newt/substitutes.scm
Normal file
|
@ -0,0 +1,43 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 Mathieu Othacehe <othacehe@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu installer newt substitutes)
|
||||
#:use-module (gnu installer substitutes)
|
||||
#:use-module (gnu installer utils)
|
||||
#:use-module (guix i18n)
|
||||
#:use-module (newt)
|
||||
#:use-module (ice-9 match)
|
||||
#:export (run-substitutes-page))
|
||||
|
||||
(define* (run-substitutes-page)
|
||||
(match (current-clients)
|
||||
(()
|
||||
(case (choice-window
|
||||
(G_ "Substitute server discovery.")
|
||||
(G_ "Enable") (G_ "Disable")
|
||||
(G_ " By turning this option on, you allow Guix to fetch \
|
||||
substitutes (pre-built binaries) during installation from servers \
|
||||
discovered on your local area network (LAN) in addition to the official \
|
||||
server. This can increase download throughput.
|
||||
|
||||
There are no security risks: only genuine substitutes may be retrieved from \
|
||||
those servers. However, eavesdroppers on your LAN may be able to see what \
|
||||
software you are installing."))
|
||||
((1) (enable-discovery))
|
||||
((2) (disable-discovery))))
|
||||
(_ #f)))
|
|
@ -17,15 +17,11 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu installer proxy)
|
||||
#:use-module (gnu installer utils)
|
||||
#:use-module (gnu services herd)
|
||||
#:export (set-http-proxy
|
||||
clear-http-proxy))
|
||||
|
||||
(define-syntax-rule (with-silent-shepherd exp ...)
|
||||
(parameterize ((shepherd-message-port
|
||||
(%make-void-port "w")))
|
||||
exp ...))
|
||||
|
||||
(define (set-http-proxy proxy)
|
||||
(with-silent-shepherd
|
||||
(with-shepherd-action 'guix-daemon
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
installer-locale-page
|
||||
installer-menu-page
|
||||
installer-network-page
|
||||
installer-substitutes-page
|
||||
installer-timezone-page
|
||||
installer-hostname-page
|
||||
installer-user-page
|
||||
|
@ -73,6 +74,8 @@
|
|||
(menu-page installer-menu-page)
|
||||
;; procedure void -> void
|
||||
(network-page installer-network-page)
|
||||
;; procedure void -> void
|
||||
(substitutes-page installer-substitutes-page)
|
||||
;; procedure (zonetab) -> posix-timezone
|
||||
(timezone-page installer-timezone-page)
|
||||
;; procedure void -> void
|
||||
|
|
41
gnu/installer/substitutes.scm
Normal file
41
gnu/installer/substitutes.scm
Normal file
|
@ -0,0 +1,41 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu installer substitutes)
|
||||
#:use-module (gnu installer utils)
|
||||
#:use-module (gnu services herd)
|
||||
#:export (enable-discovery
|
||||
disable-discovery))
|
||||
|
||||
(define (enable-discovery)
|
||||
(with-silent-shepherd
|
||||
(with-shepherd-action 'guix-daemon
|
||||
('discover "on")
|
||||
result
|
||||
result)))
|
||||
|
||||
(define (disable-discovery)
|
||||
(with-silent-shepherd
|
||||
(with-shepherd-action 'guix-daemon
|
||||
('discover "off")
|
||||
result
|
||||
result)))
|
||||
|
||||
;; Local Variables:
|
||||
;; eval: (put 'with-silent-shepherd 'scheme-indent-function 0)
|
||||
;; End:
|
|
@ -18,6 +18,7 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu installer utils)
|
||||
#:use-module (gnu services herd)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix i18n)
|
||||
|
@ -43,7 +44,9 @@
|
|||
with-server-socket
|
||||
current-server-socket
|
||||
current-clients
|
||||
send-to-clients))
|
||||
send-to-clients
|
||||
|
||||
with-silent-shepherd))
|
||||
|
||||
(define* (read-lines #:optional (port (current-input-port)))
|
||||
"Read lines from PORT and return them as a list."
|
||||
|
@ -233,3 +236,9 @@ accepting socket."
|
|||
|
||||
(current-clients (reverse remainder))
|
||||
exp)
|
||||
|
||||
(define-syntax-rule (with-silent-shepherd exp ...)
|
||||
"Evaluate EXP while discarding shepherd messages."
|
||||
(parameterize ((shepherd-message-port
|
||||
(%make-void-port "w")))
|
||||
exp ...))
|
||||
|
|
48
gnu/local.mk
48
gnu/local.mk
|
@ -39,6 +39,7 @@
|
|||
# Copyright © 2020 Martin Becze <mjbecze@riseup.net>
|
||||
# Copyright © 2020 Malte Frank Gerdes <mate.f.gerdes@gmail.com>
|
||||
# Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
# Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
|
||||
#
|
||||
# This file is part of GNU Guix.
|
||||
#
|
||||
|
@ -203,8 +204,10 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/enlightenment.scm \
|
||||
%D%/packages/entr.scm \
|
||||
%D%/packages/erlang.scm \
|
||||
%D%/packages/esolangs.scm \
|
||||
%D%/packages/fabric-management.scm \
|
||||
%D%/packages/fcitx.scm \
|
||||
%D%/packages/fcitx5.scm \
|
||||
%D%/packages/figlet.scm \
|
||||
%D%/packages/file.scm \
|
||||
%D%/packages/file-systems.scm \
|
||||
|
@ -275,6 +278,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/heads.scm \
|
||||
%D%/packages/hexedit.scm \
|
||||
%D%/packages/hugs.scm \
|
||||
%D%/packages/hunspell.scm \
|
||||
%D%/packages/hurd.scm \
|
||||
%D%/packages/hyperledger.scm \
|
||||
%D%/packages/i2p.scm \
|
||||
|
@ -493,7 +497,6 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/packages/screen.scm \
|
||||
%D%/packages/scribus.scm \
|
||||
%D%/packages/scsi.scm \
|
||||
%D%/packages/sdcc.scm \
|
||||
%D%/packages/sdl.scm \
|
||||
%D%/packages/search.scm \
|
||||
%D%/packages/security-token.scm \
|
||||
|
@ -653,6 +656,7 @@ GNU_SYSTEM_MODULES = \
|
|||
%D%/system/vm.scm \
|
||||
\
|
||||
%D%/system/images/hurd.scm \
|
||||
%D%/system/images/novena.scm \
|
||||
%D%/system/images/pine64.scm \
|
||||
%D%/system/images/pinebook-pro.scm \
|
||||
\
|
||||
|
@ -716,6 +720,7 @@ INSTALLER_MODULES = \
|
|||
%D%/installer/record.scm \
|
||||
%D%/installer/services.scm \
|
||||
%D%/installer/steps.scm \
|
||||
%D%/installer/substitutes.scm \
|
||||
%D%/installer/tests.scm \
|
||||
%D%/installer/timezone.scm \
|
||||
%D%/installer/user.scm \
|
||||
|
@ -732,6 +737,7 @@ INSTALLER_MODULES = \
|
|||
%D%/installer/newt/page.scm \
|
||||
%D%/installer/newt/partition.scm \
|
||||
%D%/installer/newt/services.scm \
|
||||
%D%/installer/newt/substitutes.scm \
|
||||
%D%/installer/newt/timezone.scm \
|
||||
%D%/installer/newt/user.scm \
|
||||
%D%/installer/newt/utils.scm \
|
||||
|
@ -788,7 +794,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/akonadi-not-relocatable.patch \
|
||||
%D%/packages/patches/akonadi-timestamps.patch \
|
||||
%D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \
|
||||
%D%/packages/patches/alsa-modular-synth-fix-vocoder.patch \
|
||||
%D%/packages/patches/amule-crypto-6.patch \
|
||||
%D%/packages/patches/anki-mpv-args.patch \
|
||||
%D%/packages/patches/antiword-CVE-2014-8123.patch \
|
||||
|
@ -800,6 +805,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
|
||||
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
|
||||
%D%/packages/patches/audacity-build-with-system-portaudio.patch \
|
||||
%D%/packages/patches/audacity-add-include.patch \
|
||||
%D%/packages/patches/audiofile-fix-datatypes-in-tests.patch \
|
||||
%D%/packages/patches/audiofile-fix-sign-conversion.patch \
|
||||
%D%/packages/patches/audiofile-CVE-2015-7747.patch \
|
||||
|
@ -820,6 +826,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/avogadro-python-eigen-lib.patch \
|
||||
%D%/packages/patches/avidemux-install-to-lib.patch \
|
||||
%D%/packages/patches/awesome-reproducible-png.patch \
|
||||
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
|
||||
%D%/packages/patches/aws-checksums-cmake-prefix.patch \
|
||||
%D%/packages/patches/azr3.patch \
|
||||
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
|
||||
%D%/packages/patches/bash-completion-directories.patch \
|
||||
|
@ -828,6 +836,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
|
||||
%D%/packages/patches/bc-fix-cross-compilation.patch \
|
||||
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
|
||||
%D%/packages/patches/bear-disable-preinstall-tests.patch \
|
||||
%D%/packages/patches/bsd-games-2.17-64bit.patch \
|
||||
%D%/packages/patches/bsd-games-add-configure-config.patch \
|
||||
%D%/packages/patches/bsd-games-add-wrapper.patch \
|
||||
|
@ -857,7 +866,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
|
||||
%D%/packages/patches/blender-2.79-python-3.8-fix.patch \
|
||||
%D%/packages/patches/bpftrace-disable-bfd-disasm.patch \
|
||||
%D%/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch \
|
||||
%D%/packages/patches/byobu-writable-status.patch \
|
||||
%D%/packages/patches/calibre-no-updates-dialog.patch \
|
||||
%D%/packages/patches/calibre-remove-test-sqlite.patch \
|
||||
|
@ -869,6 +877,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
|
||||
%D%/packages/patches/ceph-disable-cpu-optimizations.patch \
|
||||
%D%/packages/patches/chmlib-inttypes.patch \
|
||||
%D%/packages/patches/cl-asdf-config-directories.patch \
|
||||
%D%/packages/patches/clamav-config-llvm-libs.patch \
|
||||
%D%/packages/patches/clamav-system-tomsfastmath.patch \
|
||||
%D%/packages/patches/clang-3.5-libc-search-path.patch \
|
||||
|
@ -889,7 +898,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/clementine-fix-sqlite.patch \
|
||||
%D%/packages/patches/clementine-remove-crypto++-dependency.patch \
|
||||
%D%/packages/patches/clementine-use-openssl.patch \
|
||||
%D%/packages/patches/clisp-remove-failing-test.patch \
|
||||
%D%/packages/patches/clucene-pkgconfig.patch \
|
||||
%D%/packages/patches/cmake-curl-certificates.patch \
|
||||
%D%/packages/patches/coda-use-system-libs.patch \
|
||||
|
@ -952,7 +960,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
|
||||
%D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \
|
||||
%D%/packages/patches/emacs-libgit-use-system-libgit2.patch \
|
||||
%D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
|
||||
%D%/packages/patches/emacs-source-date-epoch.patch \
|
||||
%D%/packages/patches/emacs-telega-patch-server-functions.patch \
|
||||
%D%/packages/patches/emacs-telega-test-env.patch \
|
||||
|
@ -1056,6 +1063,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/ghc-monad-par-fix-tests.patch \
|
||||
%D%/packages/patches/ghc-pandoc-fix-html-tests.patch \
|
||||
%D%/packages/patches/ghc-pandoc-fix-latex-test.patch \
|
||||
%D%/packages/patches/ghostscript-CVE-2020-15900.patch \
|
||||
%D%/packages/patches/ghostscript-freetype-compat.patch \
|
||||
%D%/packages/patches/ghostscript-no-header-id.patch \
|
||||
%D%/packages/patches/ghostscript-no-header-uuid.patch \
|
||||
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
|
||||
|
@ -1109,8 +1118,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/go-skip-gc-test.patch \
|
||||
%D%/packages/patches/gpm-glibc-2.26.patch \
|
||||
%D%/packages/patches/gpodder-disable-updater.patch \
|
||||
%D%/packages/patches/gpsbabel-minizip.patch \
|
||||
%D%/packages/patches/gpsbabel-qstring.patch \
|
||||
%D%/packages/patches/gpsbabel-fix-i686-test.patch \
|
||||
%D%/packages/patches/grantlee-merge-theme-dirs.patch \
|
||||
%D%/packages/patches/grep-timing-sensitive-test.patch \
|
||||
%D%/packages/patches/grocsvs-dont-use-admiral.patch \
|
||||
|
@ -1162,7 +1170,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/hubbub-sort-entities.patch \
|
||||
%D%/packages/patches/hurd-cross.patch \
|
||||
%D%/packages/patches/hurd-xattr.patch \
|
||||
%D%/packages/patches/hplip-fix-bug-1898438.patch \
|
||||
%D%/packages/patches/hplip-remove-imageprocessor.patch \
|
||||
%D%/packages/patches/hydra-disable-darcs-test.patch \
|
||||
%D%/packages/patches/icecat-makeicecat.patch \
|
||||
|
@ -1208,6 +1215,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \
|
||||
%D%/packages/patches/kdbusaddons-kinit-file-name.patch \
|
||||
%D%/packages/patches/libffi-3.3-powerpc-fixes.patch \
|
||||
%D%/packages/patches/libffi-float128-powerpc64le.patch \
|
||||
%D%/packages/patches/libvirt-create-machine-cgroup.patch \
|
||||
%D%/packages/patches/libziparchive-add-includes.patch \
|
||||
%D%/packages/patches/localed-xorg-keyboard.patch \
|
||||
|
@ -1257,6 +1265,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
|
||||
%D%/packages/patches/libcanberra-wayland-crash.patch \
|
||||
%D%/packages/patches/libcyaml-libyaml-compat.patch \
|
||||
%D%/packages/patches/libexpected-nofetch.patch \
|
||||
%D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \
|
||||
%D%/packages/patches/libgit2-mtime-0.patch \
|
||||
%D%/packages/patches/libgnome-encoding.patch \
|
||||
|
@ -1280,6 +1289,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
|
||||
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
|
||||
%D%/packages/patches/libquicktime-ffmpeg.patch \
|
||||
%D%/packages/patches/libssh2-CVE-2019-17498.patch \
|
||||
%D%/packages/patches/libtar-CVE-2013-4420.patch \
|
||||
%D%/packages/patches/libtgvoip-disable-sse2.patch \
|
||||
%D%/packages/patches/libtgvoip-disable-webrtc.patch \
|
||||
|
@ -1345,6 +1355,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
|
||||
%D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \
|
||||
%D%/packages/patches/mingw-w64-reproducible-gendef.patch \
|
||||
%D%/packages/patches/minimap2-aarch64-support.patch \
|
||||
%D%/packages/patches/minisat-friend-declaration.patch \
|
||||
%D%/packages/patches/minisat-install.patch \
|
||||
%D%/packages/patches/mit-krb5-hurd.patch \
|
||||
|
@ -1428,9 +1439,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
|
||||
%D%/packages/patches/p7zip-remove-unused-code.patch \
|
||||
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
|
||||
%D%/packages/patches/pam-mount-luks2-support.patch \
|
||||
%D%/packages/patches/pango-skip-libthai-test.patch \
|
||||
%D%/packages/patches/pciutils-hurd-configure.patch \
|
||||
%D%/packages/patches/pciutils-hurd-fix.patch \
|
||||
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
|
||||
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
|
||||
%D%/packages/patches/samba-fix-fcntl-hint-detection.patch \
|
||||
|
@ -1441,6 +1452,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/sdl-pango-header-guard.patch \
|
||||
%D%/packages/patches/sdl-pango-matrix_declarations.patch \
|
||||
%D%/packages/patches/sdl-pango-sans-serif.patch \
|
||||
%D%/packages/patches/smalltalk-multiplication-overflow.patch \
|
||||
%D%/packages/patches/sqlite-hurd.patch \
|
||||
%D%/packages/patches/sunxi-tools-remove-sys-io.patch \
|
||||
%D%/packages/patches/patchutils-test-perms.patch \
|
||||
|
@ -1459,7 +1471,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/picard-fix-id3-rename-test.patch \
|
||||
%D%/packages/patches/picprog-non-intel-support.patch \
|
||||
%D%/packages/patches/pidgin-add-search-path.patch \
|
||||
%D%/packages/patches/pidgin-libnm.patch \
|
||||
%D%/packages/patches/pidgin-vv-gst.patch \
|
||||
%D%/packages/patches/pinball-const-fix.patch \
|
||||
%D%/packages/patches/pinball-cstddef.patch \
|
||||
%D%/packages/patches/pinball-missing-separators.patch \
|
||||
|
@ -1490,6 +1502,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/psm-repro.patch \
|
||||
%D%/packages/patches/pulseaudio-fix-mult-test.patch \
|
||||
%D%/packages/patches/pulseaudio-longer-test-timeout.patch \
|
||||
%D%/packages/patches/pulseview-qt515-compat.patch \
|
||||
%D%/packages/patches/purescript-relax-dependencies.patch \
|
||||
%D%/packages/patches/pybugz-encode-error.patch \
|
||||
%D%/packages/patches/pybugz-stty.patch \
|
||||
|
@ -1506,12 +1519,9 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-3-search-paths.patch \
|
||||
%D%/packages/patches/python-3-fix-tests.patch \
|
||||
%D%/packages/patches/python-3-hurd-configure.patch \
|
||||
%D%/packages/patches/python-CVE-2018-14647.patch \
|
||||
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
|
||||
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
|
||||
%D%/packages/patches/python-axolotl-AES-fix.patch \
|
||||
%D%/packages/patches/python-babel-fix-parse-future-test.patch \
|
||||
%D%/packages/patches/python-cairocffi-dlopen-path.patch \
|
||||
%D%/packages/patches/python-cross-compile.patch \
|
||||
%D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
|
||||
%D%/packages/patches/python-configobj-setuptools.patch \
|
||||
|
@ -1537,7 +1547,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/python-robotframework-source-date-epoch.patch \
|
||||
%D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \
|
||||
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
|
||||
%D%/packages/patches/python-tinycss2-flake8-compat.patch \
|
||||
%D%/packages/patches/python-unittest2-python3-compat.patch \
|
||||
%D%/packages/patches/python-unittest2-remove-argparse.patch \
|
||||
%D%/packages/patches/python-waitress-fix-tests.patch \
|
||||
|
@ -1547,7 +1556,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/qrcodegen-cpp-make-install.patch \
|
||||
%D%/packages/patches/qt4-ldflags.patch \
|
||||
%D%/packages/patches/qtbase-absolute-runpath.patch \
|
||||
%D%/packages/patches/qtbase-fix-krita-deadlock.patch \
|
||||
%D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \
|
||||
%D%/packages/patches/qtbase-use-TZDIR.patch \
|
||||
%D%/packages/patches/qtscript-disable-tests.patch \
|
||||
|
@ -1565,6 +1573,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/rct-add-missing-headers.patch \
|
||||
%D%/packages/patches/readline-link-ncurses.patch \
|
||||
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
|
||||
%D%/packages/patches/renpy-use-system-fribidi.patch \
|
||||
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
|
||||
%D%/packages/patches/r-httpuv-1.5.4-unvendor-libuv.patch \
|
||||
%D%/packages/patches/ri-li-modernize_cpp.patch \
|
||||
|
@ -1585,14 +1594,17 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/rust-1.19-mrustc.patch \
|
||||
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
|
||||
%D%/packages/patches/rust-1.45-linker-locale.patch \
|
||||
%D%/packages/patches/rust-1.48-linker-locale.patch \
|
||||
%D%/packages/patches/rust-bootstrap-stage0-test.patch \
|
||||
%D%/packages/patches/rust-coresimd-doctest.patch \
|
||||
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
|
||||
%D%/packages/patches/rust-nettle-disable-vendor.patch \
|
||||
%D%/packages/patches/rust-nettle-sys-disable-vendor.patch \
|
||||
%D%/packages/patches/rust-reproducible-builds.patch \
|
||||
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
|
||||
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \
|
||||
%D%/packages/patches/sbcl-geco-fix-organism-class.patch \
|
||||
%D%/packages/patches/sbc-fix-build-non-x86.patch \
|
||||
%D%/packages/patches/sbcl-clml-fix-types.patch \
|
||||
%D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \
|
||||
%D%/packages/patches/scheme48-tests.patch \
|
||||
%D%/packages/patches/scotch-build-parallelism.patch \
|
||||
|
@ -1601,6 +1613,8 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/sdl-libx11-1.6.patch \
|
||||
%D%/packages/patches/seed-webkit.patch \
|
||||
%D%/packages/patches/seq24-rename-mutex.patch \
|
||||
%D%/packages/patches/serf-python3.patch \
|
||||
%D%/packages/patches/shakespeare-spl-fix-grammar.patch \
|
||||
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
|
||||
%D%/packages/patches/shadow-hurd-pctrl.patch \
|
||||
%D%/packages/patches/shishi-fix-libgcrypt-detection.patch \
|
||||
|
@ -1685,6 +1699,7 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
|
||||
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
|
||||
%D%/packages/patches/vcflib-use-shared-libraries.patch \
|
||||
%D%/packages/patches/vlc-qt-5.15.patch \
|
||||
%D%/packages/patches/vigra-python-compat.patch \
|
||||
%D%/packages/patches/vinagre-newer-freerdp.patch \
|
||||
%D%/packages/patches/vinagre-newer-rdp-parameters.patch \
|
||||
|
@ -1696,7 +1711,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
|
||||
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
|
||||
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
|
||||
%D%/packages/patches/weasyprint-library-paths.patch \
|
||||
%D%/packages/patches/webkitgtk-share-store.patch \
|
||||
%D%/packages/patches/webkitgtk-bind-all-fonts.patch \
|
||||
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
|
||||
;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -346,6 +346,14 @@ by MACHINE."
|
|||
;;; System deployment.
|
||||
;;;
|
||||
|
||||
(define not-config?
|
||||
;; Select (guix …) and (gnu …) modules, except (guix config).
|
||||
(match-lambda
|
||||
(('guix 'config) #f)
|
||||
(('guix _ ...) #t)
|
||||
(('gnu _ ...) #t)
|
||||
(_ #f)))
|
||||
|
||||
(define (machine-boot-parameters machine)
|
||||
"Monadic procedure returning a list of 'boot-parameters' for the generations
|
||||
of MACHINE's system profile, ordered from most recent to oldest."
|
||||
|
@ -354,9 +362,10 @@ of MACHINE's system profile, ordered from most recent to oldest."
|
|||
|
||||
(define remote-exp
|
||||
(with-extensions (list guile-gcrypt)
|
||||
(with-imported-modules (source-module-closure
|
||||
`(((guix config) => ,(make-config.scm))
|
||||
(guix profiles)))
|
||||
(with-imported-modules `(((guix config) => ,(make-config.scm))
|
||||
,@(source-module-closure
|
||||
'((guix profiles))
|
||||
#:select? not-config?))
|
||||
#~(begin
|
||||
(use-modules (guix config)
|
||||
(guix profiles)
|
||||
|
@ -484,6 +493,8 @@ an environment type of 'managed-host."
|
|||
(list (second boot-parameters))))
|
||||
(locale -> (boot-parameters-locale
|
||||
(second boot-parameters)))
|
||||
(crypto-dev -> (boot-parameters-store-crypto-devices
|
||||
(second boot-parameters)))
|
||||
(store-dir -> (boot-parameters-store-directory-prefix
|
||||
(second boot-parameters)))
|
||||
(old-entries -> (map boot-parameters->menu-entry
|
||||
|
@ -496,6 +507,7 @@ an environment type of 'managed-host."
|
|||
bootloader))
|
||||
bootloader entries
|
||||
#:locale locale
|
||||
#:store-crypto-devices crypto-dev
|
||||
#:store-directory-prefix store-dir
|
||||
#:old-entries old-entries)))
|
||||
(remote-result (machine-remote-eval machine remote-exp)))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
|
||||
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
|
@ -95,15 +95,14 @@ terminals.")
|
|||
(define-public brltty
|
||||
(package
|
||||
(name "brltty")
|
||||
(version "6.1")
|
||||
(version "6.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://brltty.app/archive/"
|
||||
name "-" version ".tar.gz"))
|
||||
(string-append "https://brltty.app/archive/brltty-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"))))
|
||||
(base32 "0m0cq3p1cwp52n81si621gij82w3mdqwgr39m6bs652pmk5na72l"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; No target
|
||||
|
@ -138,7 +137,8 @@ terminals.")
|
|||
"PYTHON_ROOT=/"
|
||||
(string-append "TCL_DIR="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib"))
|
||||
"/lib")
|
||||
"INSTALL_WRITABLE_DIRECTORY=no-thanks")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-errors
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
;;; Copyright © 2016, 2017, 2020 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Peter Feigl <peter.feigl@nexoid.at>
|
||||
;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
|
||||
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
|
||||
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
|
||||
|
@ -56,6 +56,7 @@
|
|||
#:use-module (guix build-system emacs)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system perl)
|
||||
#:use-module (guix build-system python)
|
||||
|
@ -106,6 +107,7 @@
|
|||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages mail)
|
||||
#:use-module (gnu packages man)
|
||||
#:use-module (gnu packages mcrypt)
|
||||
#:use-module (gnu packages mpi)
|
||||
|
@ -443,7 +445,7 @@ graphs and can export its output to different formats.")
|
|||
(define-public facter
|
||||
(package
|
||||
(name "facter")
|
||||
(version "4.0.46")
|
||||
(version "4.0.47")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -452,7 +454,7 @@ graphs and can export its output to different formats.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1pi93i1jfpmxxw22b5r4gyx5jzgrammlrjzhjr3q2bpn3kcas91j"))))
|
||||
"1zz5kk3ad1jj8y939369dfvjh7zqwpkcqzzad7yb6wp01rc5sf88"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -514,7 +516,7 @@ or via the @code{facter} Ruby library.")
|
|||
(define-public htop
|
||||
(package
|
||||
(name "htop")
|
||||
(version "3.0.2")
|
||||
(version "3.0.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -522,7 +524,7 @@ or via the @code{facter} Ruby library.")
|
|||
(url "https://github.com/htop-dev/htop")
|
||||
(commit version)))
|
||||
(sha256
|
||||
(base32 "1qmqhbnc5yw4brd24yrp85k09770c1c00nl03mkv5pdz2bvqivk7"))
|
||||
(base32 "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
|
@ -565,7 +567,7 @@ memory, disks, network and processes.")
|
|||
(define-public pies
|
||||
(package
|
||||
(name "pies")
|
||||
(version "1.4")
|
||||
(version "1.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -573,7 +575,7 @@ memory, disks, network and processes.")
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"14jb4pa4zs26d5j2skxbaypnwhsx2lw8jgj1irrgs03c2dnf7gp6"))))
|
||||
"11j168qljsinaj5dwmg7nkm2z1aghi6gc3d0wf0pikflnh2q2wqf"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases (modify-phases %standard-phases
|
||||
|
@ -948,14 +950,14 @@ recursive runs on the generated subnets. (also IPv6)
|
|||
(define-public alive
|
||||
(package
|
||||
(name "alive")
|
||||
(version "2.0.2")
|
||||
(version "2.0.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/alive/alive-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1vrzg51ai68x9yld7vbgl58sxaw5qpx8rbakwcxn4cqq6vpxj38j"))))
|
||||
"053hfp7s66lnilm1ii4jrjmy44wpa2cwwh6f0sl8cyz0mm813x4b"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments '(#:configure-flags '("alive_cv_nice_ping=yes")))
|
||||
(inputs `(("guile" ,guile-2.0)
|
||||
|
@ -1363,9 +1365,11 @@ at once based on a Perl regular expression.")
|
|||
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda _
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "rc/rc"
|
||||
(("/usr/sbin/sendmail") "sendmail"))
|
||||
(("/usr/sbin/sendmail")
|
||||
(string-append (assoc-ref inputs "mailutils")
|
||||
"/bin/mail")))
|
||||
#t))
|
||||
(add-after 'unpack 'fix-configure
|
||||
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||
|
@ -1404,7 +1408,8 @@ at once based on a Perl regular expression.")
|
|||
(native-inputs `(("texinfo" ,texinfo)
|
||||
("automake" ,automake)
|
||||
("util-linux" ,util-linux))) ; for 'cal'
|
||||
(inputs `(("coreutils*" ,coreutils)))
|
||||
(inputs `(("coreutils*" ,coreutils)
|
||||
("mailutils" ,mailutils)))
|
||||
(home-page "https://www.gnu.org/software/rottlog/")
|
||||
(synopsis "Log rotation and management")
|
||||
(description
|
||||
|
@ -1418,7 +1423,7 @@ system administrator.")
|
|||
(define-public sudo
|
||||
(package
|
||||
(name "sudo")
|
||||
(version "1.9.3p1")
|
||||
(version "1.9.4p2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
|
@ -1428,7 +1433,7 @@ system administrator.")
|
|||
version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"17mldsg5d08s23cskmjxfa81ibnqw3slgf3l4023j72ywi9xxffw"))
|
||||
"0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -1875,7 +1880,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
|
|||
(define-public acpica
|
||||
(package
|
||||
(name "acpica")
|
||||
(version "20201113")
|
||||
(version "20201217")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1883,7 +1888,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0fmck3zklc328c8nzvfzm2xyh2i8zszzrd4k8kk8q30y4avnc6z1"))))
|
||||
"06rdpfjmij5nni1x2wi1gnalhsza5yxq1viskjm9r11wmsjnxm2a"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("flex" ,flex)
|
||||
("bison" ,bison)))
|
||||
|
@ -2123,7 +2128,7 @@ various ways that may be running with too much privilege.")
|
|||
(define-public smartmontools
|
||||
(package
|
||||
(name "smartmontools")
|
||||
(version "7.1")
|
||||
(version "7.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -2131,7 +2136,7 @@ various ways that may be running with too much privilege.")
|
|||
version "/smartmontools-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz"))))
|
||||
"1mlc25sd5rgj5xmzcllci47inmfdw7cp185fday6hc9rwqkqmnaw"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("libcap-ng" ,libcap-ng)))
|
||||
(home-page "https://www.smartmontools.org/")
|
||||
|
@ -2206,13 +2211,13 @@ of supported upstream metrics systems simultaneously.")
|
|||
(define-public ansible
|
||||
(package
|
||||
(name "ansible")
|
||||
(version "2.9.11")
|
||||
(version "2.9.16")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ansible" version))
|
||||
(sha256
|
||||
(base32 "1c9ayh61qwasgncmlw7rjx5r4g5n2cpg1d5blgn53zg7xhrx1yc8"))))
|
||||
(base32 "0j1icfqff25zm9sq6j41ipl6gcj3i67mb5bqbjf2f2q1yx6rm8sk"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-bcrypt" ,python-bcrypt)
|
||||
|
@ -3126,7 +3131,7 @@ buffers.")
|
|||
(define-public igt-gpu-tools
|
||||
(package
|
||||
(name "igt-gpu-tools")
|
||||
(version "1.24")
|
||||
(version "1.25")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -3135,27 +3140,22 @@ buffers.")
|
|||
(commit (string-append "igt-gpu-tools-" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1gpdjs5aj6vsnzwcjvw5bb120lgffvvshi4202phr0bzw3b92ky8"))))
|
||||
(build-system gnu-build-system)
|
||||
(base32 "1lvhkdhilw0fn4nzkpfwvrhiv8d92h811qs2v6ac3p5w7v86a9zm"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; many of the tests try to load kernel modules
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
("elfutils" ,elfutils) ; libdw
|
||||
("eudev" ,eudev)
|
||||
("glib" ,glib)
|
||||
("kmod" ,kmod)
|
||||
("libdrm" ,libdrm)
|
||||
("libpciaccess" ,libpciaccess)
|
||||
("libunwind" ,libunwind)
|
||||
("libxrandr" ,libxrandr)
|
||||
("openssl" ,openssl)
|
||||
("procps" ,procps)
|
||||
("util-macros" ,util-macros)))
|
||||
("procps" ,procps)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
`(("bison" ,bison)
|
||||
("flex" ,flex)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://gitlab.freedesktop.org/drm/igt-gpu-tools")
|
||||
(synopsis "Tools for development and testing of the Intel DRM driver")
|
||||
|
@ -3437,7 +3437,7 @@ make it a perfect utility on modern distros.")
|
|||
(define-public thermald
|
||||
(package
|
||||
(name "thermald")
|
||||
(version "2.3")
|
||||
(version "2.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -3446,11 +3446,11 @@ make it a perfect utility on modern distros.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl"))))
|
||||
(base32 "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(let ((out (assoc-ref %outputs "out")))
|
||||
(list (string-append "--with-dbus-sys-dir="
|
||||
out "/etc/dbus-1/system.d")
|
||||
"--localstatedir=/var"))
|
||||
|
@ -3635,7 +3635,7 @@ Python loading in HPC environments.")
|
|||
(let ((real-name "inxi"))
|
||||
(package
|
||||
(name "inxi-minimal")
|
||||
(version "3.1.09-1")
|
||||
(version "3.2.01-1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -3644,7 +3644,7 @@ Python loading in HPC environments.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name real-name version))
|
||||
(sha256
|
||||
(base32 "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5"))))
|
||||
(base32 "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65"))))
|
||||
(build-system trivial-build-system)
|
||||
(inputs
|
||||
`(("bash" ,bash-minimal)
|
||||
|
@ -3737,6 +3737,8 @@ support forum. It runs with the @code{/exec} command in most IRC clients.")
|
|||
("perl-io-socket-ssl" ,perl-io-socket-ssl)
|
||||
("perl-json-xs" ,perl-json-xs)
|
||||
("perl-time-hires" ,perl-time-hires)
|
||||
("lvm2" ,lvm2) ; lvs
|
||||
("mdadm" ,mdadm)
|
||||
;; TODO: Add more inputs:
|
||||
;; ipmi-sensors
|
||||
;; hddtemp
|
||||
|
@ -3955,19 +3957,14 @@ tcpdump and snoop.")
|
|||
(define-public pam-mount
|
||||
(package
|
||||
(name "pam-mount")
|
||||
(version "2.16")
|
||||
(version "2.17")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/pam-mount/pam_mount/"
|
||||
version "/pam_mount-" version ".tar.xz"))
|
||||
"pam_mount-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"))
|
||||
(patches
|
||||
;; Patch adding support for encrypted volumes in LUKS2 format.
|
||||
;; It comes from the Gentoo package definition for sys-auth/pam_mount.
|
||||
(search-patches "pam-mount-luks2-support.patch"))))
|
||||
(base32 "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("perl" ,perl)
|
||||
|
@ -4238,3 +4235,92 @@ to the CPU, memory, swap, disks (including LVM) and network layers, and for
|
|||
every process (and thread) it shows e.g. the CPU utilization, memory growth,
|
||||
disk utilization, priority, username, state, and exit code.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
;; TODO: Unvendor u-root (pkg: forth, golang, testutil).
|
||||
(define fiano
|
||||
(package
|
||||
(name "fiano")
|
||||
(version "5.0.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/linuxboot/fiano.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"03ihdwwhb7g6bihx141cn0924sjs5ps6q3ps58pk1cg0g0srrr9h"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
(delete-file-recursively "vendor/golang.org")
|
||||
(delete-file-recursively "vendor/github.com")
|
||||
#t))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
`(#:import-path "github.com/linuxboot/fiano"
|
||||
#:unpack-path "github.com/linuxboot/fiano"))
|
||||
(native-inputs
|
||||
`())
|
||||
(inputs
|
||||
`(("go-golang-org-x-text" ,go-golang-org-x-text)
|
||||
("go-github.com-ulikunitz-xz" ,go-github.com-ulikunitz-xz)))
|
||||
(synopsis "UEFI image editor")
|
||||
(description "This package provides a command-line UEFI image editor.")
|
||||
(home-page "https://github.com/linuxboot/fiano")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public fiano-utk
|
||||
(package
|
||||
(inherit fiano)
|
||||
(name "fiano-utk")
|
||||
(arguments
|
||||
`(#:import-path "github.com/linuxboot/fiano/cmds/utk"
|
||||
#:unpack-path "github.com/linuxboot/fiano"))))
|
||||
|
||||
(define-public fiano-fmap
|
||||
(package
|
||||
(inherit fiano)
|
||||
(name "fiano-fmap")
|
||||
(arguments
|
||||
`(#:import-path "github.com/linuxboot/fiano/cmds/fmap"
|
||||
#:unpack-path "github.com/linuxboot/fiano"))))
|
||||
|
||||
(define-public novena-eeprom
|
||||
(package
|
||||
(name "novena-eeprom")
|
||||
(version "2.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/xobs/novena-eeprom.git")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (string-append name "-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"00pd71mg0g20v0820ggp3ghf9nyj5s4wavaz9mkmrmsr91hcnf7i"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; No tests exist
|
||||
#:make-flags
|
||||
(list (string-append "CC=" ,(cc-for-target)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(out-bin (string-append out "/bin"))
|
||||
(out-share-man (string-append out "/share/man/man8")))
|
||||
(install-file "novena-eeprom" out-bin)
|
||||
(install-file "novena-eeprom.8" out-share-man)))))))
|
||||
(inputs
|
||||
`(("i2c-tools" ,i2c-tools)))
|
||||
(synopsis "Novena EEPROM editor")
|
||||
(description "This package provides an editor for the Novena EEPROM.
|
||||
Novena boards contain a device-dependent descriptive EEPROM that defines
|
||||
various parameters such as serial number, MAC address, and featureset.
|
||||
This program allows you to view and manipulate this EEPROM list.")
|
||||
(home-page "https://github.com/xobs/novena-eeprom/")
|
||||
(supported-systems '("armhf-linux"))
|
||||
(license license:bsd-3)))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2014, 2018 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
|
@ -276,7 +276,7 @@ PARI is also available as a C library to allow for faster computations.")
|
|||
(define-public gp2c
|
||||
(package
|
||||
(name "gp2c")
|
||||
(version "0.0.11pl4")
|
||||
(version "0.0.12")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -284,7 +284,7 @@ PARI is also available as a C library to allow for faster computations.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1cnnh7diqc97q76q5pyhpbljbhc0sz8mlrbqgiwi0sjkgh8iqsj0"))))
|
||||
"039ip7qkwwv46wrcdrz7y12m30kazzkjr44kqbc0h137g4wzd7zf"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("perl" ,perl)))
|
||||
(inputs `(("pari-gp" ,pari-gp)))
|
||||
|
@ -355,7 +355,7 @@ precision.")
|
|||
(define-public giac
|
||||
(package
|
||||
(name "giac")
|
||||
(version "1.6.0-31")
|
||||
(version "1.6.0-41")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -367,7 +367,7 @@ precision.")
|
|||
"~parisse/debian/dists/stable/main/source/"
|
||||
"giac_" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1dr1y88sx2gzldn0zl6p8b1ngjjcmh89iv4kzyhi2cf74j3yw85m"))))
|
||||
(base32 "1z5b3jm6ffxk3yvdqzwn9icbna68brkrz5kspgacq823d03jfklc"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:modules ((ice-9 ftw)
|
||||
|
@ -410,7 +410,7 @@ precision.")
|
|||
(inputs
|
||||
;; TODO: Add libnauty, unbundle "libmicropython.a".
|
||||
`(("fltk" ,fltk)
|
||||
("glpk" ,glpk)
|
||||
("glpk" ,glpk-4)
|
||||
("gmp" ,gmp)
|
||||
("gsl" ,gsl)
|
||||
("lapack" ,lapack)
|
||||
|
@ -533,14 +533,14 @@ fast arithmetic.")
|
|||
(string-append "--with-flint=" flint)
|
||||
(string-append "--with-gmp=" gmp)
|
||||
(string-append "--with-mpfr=" mpfr))))))))
|
||||
(home-page "https://arblib.org")
|
||||
(synopsis "Arbitrary precision floating-point ball arithmetic")
|
||||
(description
|
||||
"Arb is a C library for arbitrary-precision floating-point ball
|
||||
arithmetic. It supports efficient high-precision computation with
|
||||
polynomials, power series, matrices and special functions over the
|
||||
real and complex numbers, with automatic, rigorous error control.")
|
||||
(license license:lgpl2.1+)
|
||||
(home-page "http://arblib.org")))
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public python-flint
|
||||
(package
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Christopher Andersson <christopher@8bits.nu>
|
||||
;;; Copyright © 2016 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2016, 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016, 2017, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
|
||||
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
|
||||
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
|
||||
|
@ -476,15 +476,14 @@ under permissive licensing terms. See the 'Copyright' file."))))
|
|||
(define-public ispell
|
||||
(package
|
||||
(name "ispell")
|
||||
(version "3.4.00")
|
||||
(version "3.4.01")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"))))
|
||||
(base32 "103vscg4bc7x2q84y18x1l75k54yhkw8lpza3qh8xxhcz5b0w7jb"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:parallel-build? #f
|
||||
|
|
|
@ -261,7 +261,7 @@ runtime")
|
|||
(define-public rgbds
|
||||
(package
|
||||
(name "rgbds")
|
||||
(version "0.4.1")
|
||||
(version "0.4.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -270,7 +270,7 @@ runtime")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"05djzl3h18zg2z5p2a881wjbmgikzkhf67cgk00frhw4v05sq0lf"))))
|
||||
"0lygj7jzjlq4w0mkiir7ycysrd1p1akyvzrppjcchja05mi8wy9p"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 by Amar Singh <nly@disroot.org>
|
||||
;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
|
||||
|
@ -159,7 +159,7 @@ programs for the manipulation and analysis of astronomical data.")
|
|||
(define-public stellarium
|
||||
(package
|
||||
(name "stellarium")
|
||||
(version "0.20.3")
|
||||
(version "0.20.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -167,7 +167,7 @@ programs for the manipulation and analysis of astronomical data.")
|
|||
"/releases/download/v" version
|
||||
"/stellarium-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0z5r7b1ac43l330xphxnw54xg7jm87ajix8yl4hkq82cs5ja7097"))))
|
||||
(base32 "1253zlr0mi4kdbj119spxk7spg4rkahb4rlpd0hz1d81mnv3n0v3"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("qtbase" ,qtbase)
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
|
||||
;;; Copyright © 2016 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2018 okapi <okapi@firemail.cc>
|
||||
;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
|
@ -301,7 +301,7 @@ Linux kernel.")
|
|||
(define-public libopenmpt
|
||||
(package
|
||||
(name "libopenmpt")
|
||||
(version "0.5.3")
|
||||
(version "0.5.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -309,7 +309,7 @@ Linux kernel.")
|
|||
(string-append "https://download.openmpt.org/archive/libopenmpt/src/"
|
||||
"libopenmpt-" version "+release.autotools.tar.gz"))
|
||||
(sha256
|
||||
(base32 "1f155yf5v57dwhzb7z0kh67lckr3yq4x8040dm54qgbxw582la77"))))
|
||||
(base32 "0h7gpjx1221jwsq3k91p8zhf1h77qaxyasakc88s3g57vawhckgk"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -476,41 +476,15 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
|
|||
(define-public alsa-modular-synth
|
||||
(package
|
||||
(name "alsa-modular-synth")
|
||||
(version "2.1.2")
|
||||
(version "2.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/alsamodular/alsamodular"
|
||||
"/" version "/ams-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1azbrhpfk4nnybr7kgmc7w6al6xnzppg853vas8gmkh185kk11l0"))
|
||||
(patches
|
||||
(search-patches "alsa-modular-synth-fix-vocoder.patch"))))
|
||||
"056dn6b9c5nsw2jdww7z1kxrjqqfvxjzxhsd5x9gi4wkwyiv21nz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
'("--enable-qt5"
|
||||
"CXXFLAGS=-std=gnu++11")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'set-paths 'hide-default-gcc
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((gcc (assoc-ref inputs "gcc")))
|
||||
;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent
|
||||
;; conflicts with the GCC 5 input.
|
||||
(setenv "CPLUS_INCLUDE_PATH"
|
||||
(string-join
|
||||
(delete (string-append gcc "/include/c++")
|
||||
(string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
|
||||
":"))
|
||||
#t)))
|
||||
;; Insert an extra space between linker flags.
|
||||
(add-before 'configure 'add-missing-space
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("LIBS\\+=\\$LIBSsave") "LIBS+=\" $LIBSsave\"")
|
||||
(("CFLAGS\\+=\\$CFLAGSsave") "CFLAGS+=\" $CFLAGSsave\""))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("alsa-lib" ,alsa-lib)
|
||||
;; We cannot use zita-alsa-pcmi (the successor of clalsadrv) due to
|
||||
|
@ -523,8 +497,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband
|
|||
("qtbase" ,qtbase)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("qttools" ,qttools)
|
||||
("gcc@5" ,gcc-5)))
|
||||
("qttools" ,qttools)))
|
||||
(home-page "http://alsamodular.sourceforge.net/")
|
||||
(synopsis "Realtime modular synthesizer and effect processor")
|
||||
(description
|
||||
|
@ -703,7 +676,7 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
(define-public audacity
|
||||
(package
|
||||
(name "audacity")
|
||||
(version "2.4.1")
|
||||
(version "2.4.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -713,8 +686,9 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"))
|
||||
(patches (search-patches "audacity-build-with-system-portaudio.patch"))
|
||||
"0lklcvqkxrr2gkb9gh3422iadzl2rv9v0a8s76rwq43lj2im7546"))
|
||||
(patches (search-patches "audacity-build-with-system-portaudio.patch"
|
||||
"audacity-add-include.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
|
@ -724,7 +698,7 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
(delete-file-recursively (string-append "lib-src/" dir)))
|
||||
'("expat" "ffmpeg" "lame" "libflac" "libid3tag" "libmad" "libogg"
|
||||
"libsndfile" "libsoxr" "libvamp" "libvorbis" "lv2"
|
||||
"portaudio-v19" "portmidi" "soundtouch" "twolame"
|
||||
"portmidi" "soundtouch" "twolame"
|
||||
;; FIXME: these libraries have not been packaged yet:
|
||||
;; "libnyquist"
|
||||
;; "libscorealign"
|
||||
|
@ -738,7 +712,7 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
;; "sbsms"
|
||||
))
|
||||
#t))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("wxwidgets" ,wxwidgets)
|
||||
("gtk+" ,gtk+)
|
||||
|
@ -760,7 +734,6 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
("lv2" ,lv2)
|
||||
("lilv" ,lilv) ;for lv2
|
||||
("suil" ,suil) ;for lv2
|
||||
("portaudio" ,portaudio)
|
||||
("portmidi" ,portmidi)))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
|
@ -772,52 +745,18 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
("which" ,which)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(let ((libid3tag (assoc-ref %build-inputs "libid3tag"))
|
||||
(libmad (assoc-ref %build-inputs "libmad"))
|
||||
(portmidi (assoc-ref %build-inputs "portmidi")))
|
||||
(list
|
||||
;; Loading FFmpeg dynamically is problematic.
|
||||
"--disable-dynamic-loading"
|
||||
;; SSE instructions are available on Intel systems only.
|
||||
,@(if (any (cute string-prefix? <> (or (%current-target-system)
|
||||
(%current-system)))
|
||||
'("x86_64" "i686"))
|
||||
'()
|
||||
'("--enable-sse=no"))
|
||||
;; portmidi, libid3tag and libmad provide no .pc files, so
|
||||
;; pkg-config fails to find them. Force their inclusion.
|
||||
(string-append "ID3TAG_CFLAGS=-I" libid3tag "/include")
|
||||
(string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz")
|
||||
(string-append "LIBMAD_CFLAGS=-I" libmad "/include")
|
||||
(string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad")
|
||||
(string-append "PORTMIDI_CFLAGS=-I" portmidi "/include")
|
||||
(string-append "PORTMIDI_LIBS=-L" portmidi "/lib -lportmidi")
|
||||
"EXPAT_USE_SYSTEM=yes"
|
||||
"FFMPEG_USE_SYSTEM=yes"
|
||||
"LAME_USE_SYSTEM=yes"
|
||||
"LIBFLAC_USE_SYSTEM=yes"
|
||||
"LIBID3TAG_USE_SYSTEM=yes"
|
||||
"LIBMAD_USE_SYSTEM=yes"
|
||||
"USE_LOCAL_LIBNYQUIST=" ;not packaged yet
|
||||
;;"LIBSBSMS_USE_SYSTEM=yes" ;bundled version is patched
|
||||
"LIBSNDFILE_USE_SYSTEM=yes"
|
||||
"LIBSOUNDTOUCH_USE_SYSTEM=yes"
|
||||
"LIBSOXR_USE_SYSTEM=yes"
|
||||
"LIBTWOLAME_USE_SYSTEM=yes"
|
||||
"LIBVAMP_USE_SYSTEM=yes"
|
||||
"LIBVORBIS_USE_SYSTEM=yes"
|
||||
"LV2_USE_SYSTEM=yes"
|
||||
"PORTAUDIO_USE_SYSTEM=yes"))
|
||||
(list
|
||||
;; Loading FFmpeg dynamically is problematic.
|
||||
"-Daudacity_use_ffmpeg=linked"
|
||||
"-Daudacity_use_lame=system"
|
||||
"-Daudacity_use_portsmf=system")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-sbsms-check
|
||||
(add-after 'unpack 'comment-out-revision-ident
|
||||
(lambda _
|
||||
;; This check is wrong: there is no 2.2.0 release; not even the
|
||||
;; bundled sources match this release string.
|
||||
(substitute* '("m4/audacity_checklib_libsbsms.m4"
|
||||
"configure")
|
||||
(("sbsms >= 2.2.0") "sbsms >= 2.0.0"))
|
||||
#t))
|
||||
(substitute* "src/AboutDialog.cpp"
|
||||
(("(.*RevisionIdent\\.h.*)" include-line)
|
||||
(string-append "// " include-line)))))
|
||||
(add-after 'unpack 'use-upstream-headers
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* '("src/NoteTrack.cpp"
|
||||
|
@ -827,12 +766,11 @@ engineers, musicians, soundtrack editors and composers.")
|
|||
(("../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")
|
||||
(("../lib-src/portmidi/porttime/porttime.h") "porttime.h"))
|
||||
(substitute* "src/prefs/MidiIOPrefs.cpp"
|
||||
(("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h"))
|
||||
#t)))
|
||||
;; The test suite is not "well exercised" according to the developers,
|
||||
;; and fails with various errors. See
|
||||
;; <http://sourceforge.net/p/audacity/mailman/message/33524292/>.
|
||||
#:tests? #f))
|
||||
(("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")))))
|
||||
;; The test suite is not "well exercised" according to the developers,
|
||||
;; and fails with various errors. See
|
||||
;; <http://sourceforge.net/p/audacity/mailman/message/33524292/>.
|
||||
#:tests? #f))
|
||||
(home-page "https://www.audacityteam.org/")
|
||||
(synopsis "Software for recording and editing sounds")
|
||||
(description
|
||||
|
@ -1969,8 +1907,15 @@ well suited to all musical instruments and vocals.")
|
|||
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
(string-append "INSTDIR="
|
||||
(assoc-ref %outputs "out") "/lib/lv2"))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure)))) ; no configure script
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
;; See https://github.com/tomszilagyi/ir.lv2/pull/20
|
||||
(add-after 'unpack 'fix-type
|
||||
(lambda _
|
||||
(substitute* '("ir_gui.cc" "lv2_ui.h")
|
||||
(("_LV2UI_Descriptor") "LV2UI_Descriptor"))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("libsndfile" ,libsndfile)
|
||||
("libsamplerate" ,libsamplerate)
|
||||
|
@ -2398,14 +2343,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.")
|
|||
(define-public lilv
|
||||
(package
|
||||
(name "lilv")
|
||||
(version "0.24.8")
|
||||
(version "0.24.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.drobilla.net/lilv-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a"))))
|
||||
"1565zy0yz46cf2f25pi46msdnzkj6bbhml9gfigdpjnsdlyskfyi"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target
|
||||
|
@ -2694,14 +2639,14 @@ different audio devices such as ALSA or PulseAudio.")
|
|||
(define-public qjackctl
|
||||
(package
|
||||
(name "qjackctl")
|
||||
(version "0.6.3")
|
||||
(version "0.9.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/qjackctl/qjackctl/"
|
||||
version "/qjackctl-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zbb4jlx56qvcqyhx34mbagkqf3wbxgj84hk0ppf5cmcrxv67d4x"))))
|
||||
"1gaabf2ncd5xd846fjm3k5d0kzphlyc33k9pralc2j3r3g0cb5ji"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no check target
|
||||
|
@ -2758,7 +2703,7 @@ background file post-processing.")
|
|||
(define-public supercollider
|
||||
(package
|
||||
(name "supercollider")
|
||||
(version "3.11.0")
|
||||
(version "3.11.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -2769,7 +2714,7 @@ background file post-processing.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"02v911w2kdbg3kfl593lb2ig4sjbfxzv20a0vbcymhfzpvp1x6xp"))
|
||||
"1gi7nrmjmbnjndqkmhfrkk0jchrzvnhl3f6gp6n5wgdd4mxbgxgw"))
|
||||
(modules '((guix build utils)
|
||||
(ice-9 ftw)))
|
||||
(snippet
|
||||
|
@ -2799,7 +2744,8 @@ link REQUIRED)"))
|
|||
(arguments
|
||||
`(#:configure-flags '("-DSYSTEM_BOOST=on" "-DSYSTEM_YAMLCPP=on"
|
||||
"-DSC_QT=ON" "-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DFORTIFY=ON" "-DLIBSCSYNTH=ON"
|
||||
"-DFORTIFY=ON"
|
||||
;"-DLIBSCSYNTH=ON" ; TODO: Re-enable?
|
||||
"-DSC_EL=off") ;scel is packaged individually as
|
||||
;emacs-scel
|
||||
#:phases
|
||||
|
@ -3015,14 +2961,14 @@ input/output.")
|
|||
(define-public sratom
|
||||
(package
|
||||
(name "sratom")
|
||||
(version "0.6.4")
|
||||
(version "0.6.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.drobilla.net/sratom-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l"))))
|
||||
"178v90qvsp6lw4sqdmdz0bzyjkgwhv9m75ph1d1z8say5bv0p4gv"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments `(#:tests? #f)) ;no check target
|
||||
(propagated-inputs
|
||||
|
@ -3042,14 +2988,14 @@ the Turtle syntax.")
|
|||
(define-public suil
|
||||
(package
|
||||
(name "suil")
|
||||
(version "0.10.6")
|
||||
(version "0.10.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.drobilla.net/suil-"
|
||||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"))))
|
||||
"0h0ghk1s0lrj4gh12r7390b0ybaw7awnj0vhchyy9ll0gvhqgkci"))))
|
||||
(build-system waf-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ;no check target
|
||||
|
@ -3102,7 +3048,7 @@ for loudness normalisation.")
|
|||
(define-public timidity++
|
||||
(package
|
||||
(name "timidity++")
|
||||
(version "2.14.0")
|
||||
(version "2.15.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/timidity/TiMidity++"
|
||||
|
@ -3110,7 +3056,7 @@ for loudness normalisation.")
|
|||
"/TiMidity++-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"))))
|
||||
"1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
|
@ -4237,7 +4183,7 @@ representations.")
|
|||
(define-public cava
|
||||
(package
|
||||
(name "cava")
|
||||
(version "0.6.1")
|
||||
(version "0.7.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -4246,7 +4192,7 @@ representations.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy"))))
|
||||
"04j5hb29hivcbk542sfsx9m57dbnj2s6qpvy9fs488zvgjbgxrai"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
|
@ -4887,16 +4833,15 @@ edited, converted, compressed and saved.")
|
|||
(define-public lsp-dsp-lib
|
||||
(package
|
||||
(name "lsp-dsp-lib")
|
||||
(version "0.5.8")
|
||||
(version "0.5.11")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/sadko4u/lsp-dsp-lib/"
|
||||
"releases/download/lsp-dsp-lib-" version
|
||||
"releases/download/" version
|
||||
"/lsp-dsp-lib-" version "-src.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07w3d2i0z0xmvi1ngcgs7lc5a0da8jvf7rv4dnjk01md43b7fkh1"))))
|
||||
(base32 "0lkar6r9jfrrqswi8nnndlm5a9kfwqjn92d81gp2yhc3p46xsswz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
|
@ -4904,6 +4849,11 @@ edited, converted, compressed and saved.")
|
|||
(list (string-append "CC=" ,(cc-for-target)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'omit-static-library
|
||||
(lambda _
|
||||
(substitute* "src/Makefile"
|
||||
((".*@.*ARTIFACT_SLIB.*") "") ; don't install it
|
||||
((" \\$\\(ARTIFACT_SLIB\\)") "")))) ; don't build it
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(invoke "make" "config"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -33,14 +33,14 @@
|
|||
(define-public oath-toolkit
|
||||
(package
|
||||
(name "oath-toolkit")
|
||||
(version "2.6.4")
|
||||
(version "2.6.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.savannah.nongnu.org/releases/"
|
||||
name "/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "116na9nncpwshl3ww8w3llzwk49igilplxcjy1k6jzl3mmg2bimz"))))
|
||||
(base32 "06f21smb412xads4lygvyb47fcpvhdns0k6h880m9pbzgq6141yj"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures.
|
||||
|
@ -115,3 +115,28 @@ and the time-based @dfn{TOTP} algorithm (RFC6238).")
|
|||
(description "The Yubico PAM module provides an easy way to integrate the
|
||||
YubiKey into your existing user authentication infrastructure.")
|
||||
(license license:bsd-2))))
|
||||
|
||||
(define-public pamtester
|
||||
(package
|
||||
(name "pamtester")
|
||||
(version "0.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://sourceforge/pamtester/pamtester/"
|
||||
version "/pamtester-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1mdj1wj0adcnx354fs17928yn2xfr1hj5mfraq282dagi873sqw3"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("linux-pam" ,linux-pam)))
|
||||
(home-page "http://pamtester.sourceforge.net/")
|
||||
(synopsis "Utility for testing pluggable authentication modules (PAM) facility")
|
||||
(description
|
||||
"Pamtester is a tiny utility program to test the pluggable authentication
|
||||
modules (PAM) facility, specifically designed to help PAM module authors to
|
||||
intensively test their own modules.")
|
||||
(license license:bsd-3)))
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#:use-module (ice-9 match)
|
||||
#:export (autoconf-wrapper))
|
||||
|
||||
(define-public autoconf
|
||||
(define-public autoconf-2.69
|
||||
(package
|
||||
(name "autoconf")
|
||||
(version "2.69")
|
||||
|
@ -103,6 +103,39 @@ scripts are self-contained and portable, freeing the user from needing to
|
|||
know anything about Autoconf or M4.")
|
||||
(license gpl3+))) ; some files are under GPLv2+
|
||||
|
||||
(define-public autoconf-2.70
|
||||
(package
|
||||
(inherit autoconf-2.69)
|
||||
(version "2.70")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/autoconf/autoconf-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments autoconf-2.69)
|
||||
((#:tests? _ #f)
|
||||
;; FIXME: To run the test suite, fix all the instances where scripts
|
||||
;; generates "#! /bin/sh" shebangs.
|
||||
#f)
|
||||
((#:phases phases '%standard-phases)
|
||||
`(modify-phases ,phases
|
||||
(add-before 'check 'prepare-tests
|
||||
(lambda _
|
||||
(for-each patch-shebang
|
||||
(append (find-files "tests"
|
||||
(lambda (file stat)
|
||||
(executable-file? file)))
|
||||
(find-files "bin"
|
||||
(lambda (file stat)
|
||||
(executable-file? file)))))
|
||||
#t))))))))
|
||||
|
||||
(define-public autoconf autoconf-2.69)
|
||||
|
||||
(define-public autoconf-2.68
|
||||
(package (inherit autoconf)
|
||||
(version "2.68")
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/* GNU Guix --- Functional package management for GNU
|
||||
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018
|
||||
Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020
|
||||
Free Software Foundation, Inc.
|
||||
Copyright (C) 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
|
||||
|
@ -19,14 +19,47 @@
|
|||
along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
/* This file implements a variant of the 'guile' executable that does not
|
||||
complain about locale issues. */
|
||||
complain about locale issues and arranges to reduce startup time by
|
||||
ignoring GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH until it has
|
||||
booted. */
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <locale.h>
|
||||
#include <libguile.h>
|
||||
|
||||
/* Saved values of GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH. */
|
||||
static const char *load_path, *load_compiled_path;
|
||||
|
||||
static void
|
||||
inner_main (void *unused, int argc, char **argv)
|
||||
{
|
||||
if (load_path != NULL)
|
||||
{
|
||||
setenv ("GUILE_LOAD_PATH", load_path, 1);
|
||||
SCM load_path_var =
|
||||
scm_c_public_lookup ("guile", "%load-path");
|
||||
SCM addition =
|
||||
scm_parse_path (scm_from_locale_string (load_path), SCM_EOL);
|
||||
scm_variable_set_x (load_path_var,
|
||||
scm_append
|
||||
(scm_list_2 (scm_variable_ref (load_path_var),
|
||||
addition)));
|
||||
}
|
||||
|
||||
if (load_compiled_path != NULL)
|
||||
{
|
||||
setenv ("GUILE_LOAD_COMPILED_PATH", load_compiled_path, 1);
|
||||
SCM load_compiled_path_var =
|
||||
scm_c_public_lookup ("guile", "%load-compiled-path");
|
||||
SCM addition =
|
||||
scm_parse_path (scm_from_locale_string (load_compiled_path), SCM_EOL);
|
||||
scm_variable_set_x (load_compiled_path_var,
|
||||
scm_append
|
||||
(scm_list_2 (scm_variable_ref (load_compiled_path_var),
|
||||
addition)));
|
||||
}
|
||||
|
||||
scm_shell (argc, argv);
|
||||
}
|
||||
|
||||
|
@ -40,6 +73,15 @@ main (int argc, char **argv)
|
|||
which is always preferable over the C locale. */
|
||||
setlocale (LC_ALL, "en_US.utf8");
|
||||
|
||||
const char *str;
|
||||
str = getenv ("GUILE_LOAD_PATH");
|
||||
load_path = str != NULL ? strdup (str) : NULL;
|
||||
str = getenv ("GUILE_LOAD_COMPILED_PATH");
|
||||
load_compiled_path = str ? strdup (str) : NULL;
|
||||
|
||||
unsetenv ("GUILE_LOAD_PATH");
|
||||
unsetenv ("GUILE_LOAD_COMPILED_PATH");
|
||||
|
||||
scm_install_gmp_memory_functions = 1;
|
||||
scm_boot_guile (argc, argv, inner_main, 0);
|
||||
return 0; /* never reached */
|
||||
|
|
7
gnu/packages/aux-files/guix.vim
Normal file
7
gnu/packages/aux-files/guix.vim
Normal file
|
@ -0,0 +1,7 @@
|
|||
" This appends all of the vim plugins to the end of Vim's runtimepath.
|
||||
for directory in ["/run/current-system/profile", $HOME . "/.guix-profile", $GUIX_PROFILE, $GUIX_ENVIRONMENT]
|
||||
let vimplugins = directory . "/share/vim/vimfiles"
|
||||
if isdirectory(vimplugins)
|
||||
let &rtp = join([&rtp,vimplugins], ',')
|
||||
endif
|
||||
endfor
|
9877
gnu/packages/aux-files/linux-libre/5.10-arm.conf
Normal file
9877
gnu/packages/aux-files/linux-libre/5.10-arm.conf
Normal file
File diff suppressed because it is too large
Load diff
10037
gnu/packages/aux-files/linux-libre/5.10-arm64.conf
Normal file
10037
gnu/packages/aux-files/linux-libre/5.10-arm64.conf
Normal file
File diff suppressed because it is too large
Load diff
10732
gnu/packages/aux-files/linux-libre/5.10-i686.conf
Normal file
10732
gnu/packages/aux-files/linux-libre/5.10-i686.conf
Normal file
File diff suppressed because it is too large
Load diff
10726
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf
Normal file
10726
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf
Normal file
File diff suppressed because it is too large
Load diff
|
@ -17,6 +17,7 @@
|
|||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl>
|
||||
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -148,7 +149,7 @@ spying and/or modification by the server.")
|
|||
(define-public par2cmdline
|
||||
(package
|
||||
(name "par2cmdline")
|
||||
(version "0.8.0")
|
||||
(version "0.8.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -157,7 +158,7 @@ spying and/or modification by the server.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0f1jsd5sw2wynjzi7yjqjaf13yhyjfdid91p8yh0jn32y03kjyrz"))))
|
||||
"11mx8q29cr0sryd11awab7y4mhqgbamb1ss77rffjj6in8pb4hdk"))))
|
||||
(native-inputs
|
||||
`(("automake" ,automake)
|
||||
("autoconf" ,autoconf)))
|
||||
|
@ -569,13 +570,13 @@ detection, and lossless compression.")
|
|||
(define-public borg
|
||||
(package
|
||||
(name "borg")
|
||||
(version "1.1.14")
|
||||
(version "1.1.15")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "borgbackup" version))
|
||||
(sha256
|
||||
(base32 "1fpdj73cgp96xwasdcifxl7q2pr1my2f4vfdjpv771llri3hgfvx"))
|
||||
(base32 "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -593,7 +594,8 @@ detection, and lossless compression.")
|
|||
"src/borg/platform/darwin.c"
|
||||
"src/borg/platform/freebsd.c"
|
||||
"src/borg/platform/linux.c"
|
||||
"src/borg/platform/posix.c"))
|
||||
"src/borg/platform/posix.c"
|
||||
"src/borg/platform/syncfilerange.c"))
|
||||
;; Remove bundled shared libraries.
|
||||
(with-directory-excursion "src/borg/algorithms"
|
||||
(for-each delete-file-recursively
|
||||
|
@ -653,6 +655,7 @@ detection, and lossless compression.")
|
|||
"and not test_access_acl "
|
||||
"and not test_default_acl "
|
||||
"and not test_non_ascii_acl "
|
||||
"and not test_create_stdin "
|
||||
;; This test needs the unpackaged pytest-benchmark.
|
||||
"and not benchmark "
|
||||
;; These tests assume the kernel supports FUSE.
|
||||
|
@ -670,6 +673,19 @@ detection, and lossless compression.")
|
|||
"docs/misc/internals-picture.txt"
|
||||
"docs/misc/prune-example.txt"))
|
||||
(copy-recursively "docs/man" man)
|
||||
#t)))
|
||||
(add-after 'install-docs 'install-shell-completions
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(etc (string-append out "/etc"))
|
||||
(share (string-append out "/share")))
|
||||
(with-directory-excursion "scripts/shell_completions"
|
||||
(install-file "bash/borg"
|
||||
(string-append etc "/bash_completion.d"))
|
||||
(install-file "zsh/_borg"
|
||||
(string-append share "/zsh/site-functions"))
|
||||
(install-file "fish/borg.fish"
|
||||
(string-append share "/fish/vendor_completions.d")))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("python-cython" ,python-cython)
|
||||
|
@ -696,50 +712,6 @@ to not fully trusted targets. Borg is a fork of Attic.")
|
|||
(home-page "https://www.borgbackup.org/")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public attic
|
||||
(package
|
||||
(name "attic")
|
||||
(version "0.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "Attic" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0b5skd36r4c0915lwpkqg5hxm49gls9pprs1b7hc40910wlcsl36"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(;; The tests assume they are run as root:
|
||||
;; https://github.com/jborg/attic/issues/7
|
||||
#:tests? #f
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before
|
||||
'build 'set-openssl-prefix
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "ATTIC_OPENSSL_PREFIX" (assoc-ref inputs "openssl"))
|
||||
#t)))))
|
||||
(inputs
|
||||
`(("acl" ,acl)
|
||||
("openssl" ,openssl)
|
||||
("python-msgpack" ,python-msgpack)
|
||||
|
||||
;; Attic is probably incompatible with llfuse > 0.41.
|
||||
;; These links are to discussions of llfuse compatibility from
|
||||
;; the borg project. Borg is a recent fork of attic, and attic
|
||||
;; has not been updated since the fork, so it's likely that
|
||||
;; llfuse compatibility requirements are still the same.
|
||||
;; https://github.com/borgbackup/borg/issues/642
|
||||
;; https://github.com/borgbackup/borg/issues/643
|
||||
("python-llfuse" ,python-llfuse-0.41)))
|
||||
(synopsis "Deduplicating backup program")
|
||||
(description "Attic is a deduplicating backup program. The main goal of
|
||||
Attic is to provide an efficient and secure way to backup data. The data
|
||||
deduplication technique used makes Attic suitable for daily backups since only
|
||||
changes are stored.")
|
||||
(home-page "https://attic-backup.org/")
|
||||
(license license:bsd-3)
|
||||
(properties `((superseded . ,borg)))))
|
||||
|
||||
(define-public wimlib
|
||||
(package
|
||||
(name "wimlib")
|
||||
|
|
|
@ -54,13 +54,16 @@
|
|||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (guix i18n)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (ice-9 format)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 optargs)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:export (glibc
|
||||
|
@ -1099,9 +1102,16 @@ to the @code{share/locale} sub-directory of this package.")
|
|||
,(version-major+minor
|
||||
(package-version glibc)))))))))))
|
||||
|
||||
(define-public (make-glibc-utf8-locales glibc)
|
||||
(define %default-utf8-locales
|
||||
;; These are the locales commonly used for tests---e.g., in Guile's i18n
|
||||
;; tests.
|
||||
'("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
|
||||
(define*-public (make-glibc-utf8-locales glibc #:key
|
||||
(locales %default-utf8-locales)
|
||||
(name "glibc-utf8-locales"))
|
||||
(define default-locales? (equal? locales %default-utf8-locales))
|
||||
(package
|
||||
(name "glibc-utf8-locales")
|
||||
(name name)
|
||||
(version (package-version glibc))
|
||||
(source #f)
|
||||
(build-system trivial-build-system)
|
||||
|
@ -1135,17 +1145,22 @@ to the @code{share/locale} sub-directory of this package.")
|
|||
(symlink (string-append locale ".utf8")
|
||||
(string-append localedir "/"
|
||||
locale ".UTF-8")))
|
||||
|
||||
;; These are the locales commonly used for
|
||||
;; tests---e.g., in Guile's i18n tests.
|
||||
'("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
|
||||
',locales)
|
||||
#t))))
|
||||
(native-inputs `(("glibc" ,glibc)
|
||||
("gzip" ,gzip)))
|
||||
(synopsis "Small sample of UTF-8 locales")
|
||||
(synopsis (if default-locales?
|
||||
(P_ "Small sample of UTF-8 locales")
|
||||
(P_ "Customized sample of UTF-8 locales")))
|
||||
(description
|
||||
"This package provides a small sample of UTF-8 locales mostly useful in
|
||||
(if default-locales?
|
||||
(P_ "This package provides a small sample of UTF-8 locales mostly useful in
|
||||
test environments.")
|
||||
(format #f (P_ "This package provides the following UTF-8 locales:
|
||||
@itemize
|
||||
~{@item ~a~%~}
|
||||
@end itemize~%")
|
||||
locales)))
|
||||
(home-page (package-home-page glibc))
|
||||
(license (package-license glibc))))
|
||||
|
||||
|
@ -1221,7 +1236,7 @@ command.")
|
|||
(define-public tzdata
|
||||
(package
|
||||
(name "tzdata")
|
||||
(version "2020d")
|
||||
(version "2020f")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -1229,7 +1244,7 @@ command.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1wxskk9mh1x2073n99qna2mq58mgi648mbq5dxlqfcrnvrbkk0cd"))))
|
||||
"10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
@ -1288,7 +1303,7 @@ command.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mgsckixmmk9qxzsflfxnp3999qi3ls72bgksclk01g852x51w3c"))))))
|
||||
"1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng"))))))
|
||||
(home-page "https://www.iana.org/time-zones")
|
||||
(synopsis "Database of current and historical time zones")
|
||||
(description "The Time Zone Database (often called tz or zoneinfo)
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -31,6 +33,7 @@
|
|||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
|
@ -40,6 +43,7 @@
|
|||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-science)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages storage)
|
||||
#:use-module (ice-9 match))
|
||||
|
@ -47,14 +51,14 @@
|
|||
(define-public fio
|
||||
(package
|
||||
(name "fio")
|
||||
(version "3.24")
|
||||
(version "3.25")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://brick.kernel.dk/snaps/"
|
||||
"fio-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0qshbyqpvm01hmpkmk0v0jhjz23sngqhy291kiz38z04s2df4vxn"))))
|
||||
"16r734an459cz1ax3jyhxc269i3syzdkll4qbv18wqaxpm5y34v6"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:test-target "test"
|
||||
|
@ -128,7 +132,7 @@ is to write a job file matching the I/O load one wants to simulate.")
|
|||
(if (string=? (package-name mpi) "openmpi")
|
||||
""
|
||||
(string-append "-" (package-name mpi)))))
|
||||
(version "2019.3")
|
||||
(version "2019.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -137,7 +141,16 @@ is to write a job file matching the I/O load one wants to simulate.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0si5xi6ilhd3w0gbsg124589pvp094hvf366rvjjb9pi7pdk5p4i"))))
|
||||
"02hxbk9g9nl59bk5qcfl3djj7b58vsqys340m1xdbyqwcrbnahh9"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Some source configuration files in the original tarball
|
||||
;; have inappropriate execute permissions, which interferes
|
||||
;; with the install phase below.
|
||||
(for-each (lambda (file) (chmod file #o444))
|
||||
(find-files "WINDOWS" "."))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("mpi" ,mpi)))
|
||||
|
@ -267,3 +280,66 @@ benchmark how your file systems perform with respect to data read and write
|
|||
speed, the number of seeks that can be performed per second, and the number of
|
||||
file metadata operations that can be performed per second.")
|
||||
(license license:gpl2))) ;GPL 2 only, see copyright.txt
|
||||
|
||||
(define-public python-locust
|
||||
(package
|
||||
(name "python-locust")
|
||||
(version "1.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "locust" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1q2nza37fwsqf8qdmisfz6bmjpss90shi1bajrclf6gkbslhryxl"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'check 'extend-PATH
|
||||
;; Add the 'locust' script to PATH, which is used in the test
|
||||
;; suite.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(setenv "PATH" (string-append out "/bin:"
|
||||
(getenv "PATH"))))
|
||||
#t))
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "python" "-m" "pytest"
|
||||
"-k" (string-join
|
||||
(list
|
||||
;; These tests return "non-zero exit status 1".
|
||||
"not test_default_headless_spawn_options"
|
||||
"not test_default_headless_spawn_options_with_shape"
|
||||
"not test_headless_spawn_options_wo_run_time"
|
||||
;; This test depends on networking.
|
||||
"not test_web_options"
|
||||
;; This test fails because of the warning "System open
|
||||
;; file limit '1024' is below minimum setting '10000'".
|
||||
"not test_skip_logging") " and "))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
`(("python-configargparse" ,python-configargparse)
|
||||
("python-flask" ,python-flask)
|
||||
("python-flask-basicauth" ,python-flask-basicauth)
|
||||
("python-gevent" ,python-gevent)
|
||||
("python-geventhttpclient" ,python-geventhttpclient)
|
||||
("python-msgpack" ,python-msgpack)
|
||||
("python-psutil" ,python-psutil)
|
||||
("python-pyzmq" ,python-pyzmq)
|
||||
("python-requests" ,python-requests)
|
||||
("python-werkzeug" ,python-werkzeug)))
|
||||
(native-inputs
|
||||
`(("python-mock" ,python-mock)
|
||||
("python-pyquery" ,python-pyquery)
|
||||
("python-pytest" ,python-pytest))) ;for more easily skipping tests
|
||||
(home-page "https://locust.io/")
|
||||
(synopsis "Distributed load testing framework")
|
||||
(description "Locust is a performance testing tool that aims to be easy to
|
||||
use, scriptable and scalable. The test scenarios are described in plain
|
||||
Python. It provides a web-based user interface to visualize the results in
|
||||
real-time, but can also be run non-interactively. Locust is primarily geared
|
||||
toward testing HTTP-based applications or services, but it can be customized to
|
||||
test any system or protocol.")
|
||||
(license license:expat)))
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -424,7 +424,7 @@ menu to select one of the installed operating systems.")
|
|||
(define-public dtc
|
||||
(package
|
||||
(name "dtc")
|
||||
(version "1.5.1")
|
||||
(version "1.6.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -432,7 +432,7 @@ menu to select one of the installed operating systems.")
|
|||
"dtc-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07q3mdsvl4smbiakriq3hnsyyd0q344lsm306q0kgz4hjq1p82v6"))))
|
||||
"0bf8801z6fpd1gz9mxd5pqqj8nq101x393cyw8rpkc712w13nl0h"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
|
@ -898,7 +898,14 @@ to Novena upstream, does not load u-boot.img from the first partition.")
|
|||
(substitute-keyword-arguments (package-arguments base)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'set-environment
|
||||
(add-after 'unpack 'patch-rockpro64-config
|
||||
;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled.
|
||||
;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4
|
||||
(lambda _
|
||||
(substitute* "configs/rockpro64-rk3399_defconfig"
|
||||
(("CONFIG_USE_PREBOOT=y") "CONFIG_USE_PREBOOT=n"))
|
||||
#t))
|
||||
(add-after 'patch-rockpro64-config 'set-environment
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "BL31" (string-append (assoc-ref inputs "firmware")
|
||||
"/bl31.elf"))
|
||||
|
|
|
@ -49,7 +49,7 @@ supported content to the Kodi media center.")
|
|||
(make-chromium-extension play-to-kodi))
|
||||
|
||||
(define uassets
|
||||
(let ((commit "0cef83c9fc68fdad8f3ee9dc07f6356ebc12791c"))
|
||||
(let ((commit "8e79f25fceb7c27960753de6f4d21491257741ab"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -58,12 +58,12 @@ supported content to the Kodi media center.")
|
|||
(file-name (git-file-name "uAssets" (string-take commit 9)))
|
||||
(sha256
|
||||
(base32
|
||||
"13mjql3rr5f3zilx05i8r7slnp7xyj6zn43dcfl3gdgi8ik483dd")))))
|
||||
"19ymyv6qpmmyw4lnpx6adm6mzf8ygfj0c9ljw24wl239v9vzn46w")))))
|
||||
|
||||
(define ublock-origin
|
||||
(package
|
||||
(name "ublock-origin")
|
||||
(version "1.31.0")
|
||||
(version "1.32.4")
|
||||
(home-page "https://github.com/gorhill/uBlock")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
@ -71,7 +71,7 @@ supported content to the Kodi media center.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1wfg1g061l83fqwllp8q1jr1kvwxy2kbbzfk6ynlf18kjng9v3h5"))))
|
||||
"0v5phzsrav1z0gd7rirmsy7k500xhibw73ffk61754hkqd0l635v"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("xpi" "firefox" "chromium"))
|
||||
(arguments
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
|
||||
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
|
||||
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
|
||||
;;; Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org>
|
||||
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
|
||||
;;; Copyright © 2020 Yuval Kogman <nothingmuch@woobling.org>
|
||||
|
@ -36,18 +36,27 @@
|
|||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages adns)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cpp)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages logging)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages package-management)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pretty-print)
|
||||
#:use-module (gnu packages protobuf)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages python-web)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages regex)
|
||||
#:use-module (gnu packages rpc)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages tls)
|
||||
#:use-module (gnu packages ninja)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python))
|
||||
|
@ -90,19 +99,46 @@ makes a few sacrifices to acquire fast full and incremental build times.")
|
|||
(define-public bear
|
||||
(package
|
||||
(name "bear")
|
||||
(version "2.4.4")
|
||||
(version "3.0.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/rizsotto/Bear")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(patches (search-patches
|
||||
"bear-disable-preinstall-tests.patch"))
|
||||
(sha256
|
||||
(base32
|
||||
"184dqjcpxiwcfziyi67zzran2c4fal1r3j8nhjdjadcmfxf4389d"))))
|
||||
"15r22sbk5bibrhf54lf0shiqw1gnsik24fr5as96w3hnj6iahgwn"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
(add-before 'check 'set-build-environment
|
||||
(lambda _
|
||||
(setenv "CC" "gcc")
|
||||
#t))
|
||||
;; TODO: Test Configuration is Incomplete
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "ctest"))))))
|
||||
(inputs
|
||||
`(("python" ,python-wrapper)))
|
||||
`(("c-ares" ,c-ares)
|
||||
("fmt" ,fmt)
|
||||
("grpc" ,grpc)
|
||||
("json-modern-cxx" ,json-modern-cxx)
|
||||
("protobuf" ,protobuf)
|
||||
("python" ,python-wrapper)
|
||||
("re2" ,re2)
|
||||
("spdlog" ,spdlog)))
|
||||
(native-inputs
|
||||
`(("abseil-cpp" ,abseil-cpp)
|
||||
("gcc-9" ,gcc-9) ; for <filesystem>, #44896
|
||||
("googletest" ,googletest)
|
||||
("openssl" ,openssl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-lit" ,python-lit)
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://github.com/rizsotto/Bear")
|
||||
(synopsis "Tool for generating a compilation database")
|
||||
(description "A JSON compilation database is used in the Clang project to
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -22,6 +22,7 @@
|
|||
#:use-module (guix licenses)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
|
@ -32,7 +33,7 @@
|
|||
(define-public busybox
|
||||
(package
|
||||
(name "busybox")
|
||||
(version "1.31.1")
|
||||
(version "1.32.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -40,10 +41,7 @@
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh"))
|
||||
(patches
|
||||
(search-patches
|
||||
"busybox-1.31.1-fix-build-with-glibc-2.31.patch"))))
|
||||
"12g63zsvzfz04wbyga8riyl8ils05riw4xf26cyiaasbs3qqfpf3"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
|
@ -90,7 +88,7 @@
|
|||
;; true in guix build environment
|
||||
(substitute* "testsuite/pidof.tests"
|
||||
(("-s init") "-s $(cat /proc/1/comm)"))
|
||||
|
||||
|
||||
;; This test cannot possibly pass.
|
||||
;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set.
|
||||
;; However, this relies on /bin/ls existing. Which it does not in guix.
|
||||
|
@ -135,11 +133,11 @@ any small or embedded system.")
|
|||
"00aw9d809wj1bqlb2fsssdgz7rj0363ya14py0gfdm0rkp98zcpa"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:phases
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'set-environment-variables
|
||||
(lambda _
|
||||
(setenv "CC" (which "gcc"))
|
||||
(setenv "CC" ,(cc-for-target))
|
||||
(setenv "HOSTCC" (which "gcc"))
|
||||
#t))
|
||||
(replace 'configure
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
|
||||
|
@ -10,6 +10,7 @@
|
|||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -32,8 +33,10 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages bootstrap)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages check)
|
||||
|
@ -186,15 +189,18 @@ language with thin bindings for other languages.")
|
|||
(name "udunits")
|
||||
;; Four-part version numbers are development snapshots, not releases. See
|
||||
;; <https://github.com/Unidata/UDUNITS-2/issues/99#issuecomment-732323472>.
|
||||
(version "2.2.26")
|
||||
(version "2.2.28")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.unidata.ucar.edu/pub/udunits/"
|
||||
"udunits-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v9mqw4drnkzkm57331ail6yvs9485jmi37s40lhvmf7r5lli3rn"))))
|
||||
"17jpbp6f0rr132jn2gqy8ry8mv1w27v6dyhfq1igv8v1674aw2sr"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list "--disable-static")))
|
||||
(inputs
|
||||
`(("expat" ,expat)))
|
||||
(home-page "https://www.unidata.ucar.edu/software/udunits/")
|
||||
|
@ -536,3 +542,75 @@ avoiding distractions when studying code that uses @code{#ifdef} heavily for
|
|||
portability.")
|
||||
(license (list license:bsd-2 ;all files except...
|
||||
license:bsd-3)))) ;...the unidef.1 manual page
|
||||
|
||||
(define-public aws-c-common
|
||||
(package
|
||||
(name "aws-c-common")
|
||||
(version "0.4.63")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url (string-append "https://github.com/awslabs/" name))
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9"))))
|
||||
(build-system cmake-build-system)
|
||||
(synopsis "Amazon Web Services core C library")
|
||||
(description
|
||||
"This library provides common C99 primitives, configuration, data
|
||||
structures, and error handling for the @acronym{AWS,Amazon Web Services} SDK.")
|
||||
(home-page "https://github.com/awslabs/aws-c-common")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public aws-checksums
|
||||
(package
|
||||
(name "aws-checksums")
|
||||
(version "0.1.10")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url (string-append "https://github.com/awslabs/" name))
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb"))
|
||||
(patches (search-patches "aws-checksums-cmake-prefix.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("aws-c-common" ,aws-c-common)))
|
||||
(synopsis "Amazon Web Services checksum library")
|
||||
(description
|
||||
"This library provides cross-Platform hardware accelerated CRC32c and CRC32
|
||||
with fallback to efficient C99 software implementations.")
|
||||
(home-page "https://github.com/awslabs/aws-checksums")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public aws-c-event-stream
|
||||
(package
|
||||
(name "aws-c-event-stream")
|
||||
(version "0.1.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url (string-append "https://github.com/awslabs/" name))
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1vl9ainc4klv0g9gk1iv4833bsllni6jxn6mwb0fnv2dnlz7zv9q"))
|
||||
(patches (search-patches "aws-c-event-stream-cmake-prefix.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(propagated-inputs
|
||||
`(("aws-c-common" ,aws-c-common)))
|
||||
(inputs
|
||||
`(("aws-checksums" ,aws-checksums)))
|
||||
(synopsis "Amazon Web Services client-server message format library")
|
||||
(description
|
||||
"This library is a C99 implementation for @acronym{AWS,Amazon Web Services}
|
||||
event stream encoding, a binary format for bidirectional client-server
|
||||
communication.")
|
||||
(home-page "https://github.com/awslabs/aws-c-event-stream")
|
||||
(license license:asl2.0)))
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
(define-public nss-certs
|
||||
(package
|
||||
(name "nss-certs")
|
||||
(version "3.57")
|
||||
(version "3.59")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((version-with-underscores
|
||||
|
@ -87,7 +87,7 @@
|
|||
"nss-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"10n3pncg6k81ikjz12la147rppwqn57bkrdl9gb820w6pq0nra2m"))))
|
||||
"096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"))
|
||||
(native-inputs
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
;;; Copyright © 2020 Josh Marshall <joshua.r.marshall.1991@gmail.com>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -81,7 +82,8 @@
|
|||
#:use-module (guix build-system go)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system trivial))
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public pedansee
|
||||
(package
|
||||
|
@ -264,14 +266,14 @@ with a flexible variety of user interfaces.")
|
|||
(define-public cppunit
|
||||
(package
|
||||
(name "cppunit")
|
||||
(version "1.14.0")
|
||||
(version "1.15.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://dev-www.libreoffice.org/src/"
|
||||
name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"))))
|
||||
"19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9"))))
|
||||
;; Explicitly link with libdl. This is expected to be done by packages
|
||||
;; relying on cppunit for their tests. However, not all of them do.
|
||||
;; If we added the linker flag to such packages, we would pollute all
|
||||
|
@ -440,7 +442,7 @@ format.")
|
|||
(define-public cppcheck
|
||||
(package
|
||||
(name "cppcheck")
|
||||
(version "1.90")
|
||||
(version "2.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -448,7 +450,7 @@ format.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0h7ir2x0k005fm586dxmaphgv5cyz25k3k4sh02p7zb78gzx398h"))))
|
||||
(base32 "03ic5mig3ryzkf85r95ryagf84s7y5nd6sqr915l3zj30apnifvz"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("-DBUILD_TESTS=ON")))
|
||||
|
@ -509,7 +511,7 @@ and it supports a very flexible form of test discovery.")
|
|||
(define-public doctest
|
||||
(package
|
||||
(name "doctest")
|
||||
(version "2.4.1")
|
||||
(version "2.4.4")
|
||||
(home-page "https://github.com/onqtam/doctest")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
|
@ -517,7 +519,7 @@ and it supports a very flexible form of test discovery.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"17g7n6rjs90i0b231x5s934qnr8m80ga2yg1z344bnsdiqcjd63w"))))
|
||||
"0xldd6cr1w3bn33rdb7yc6p57w143cgnjb48ig1b99iwvvkw599n"))))
|
||||
(build-system cmake-build-system)
|
||||
(synopsis "C++ test framework")
|
||||
(description
|
||||
|
@ -931,6 +933,45 @@ and many external plugins.")
|
|||
(license license:expat)
|
||||
(properties `((python2-variant . ,(delay python2-pytest))))))
|
||||
|
||||
(define-public python-pytest-6
|
||||
(package
|
||||
(inherit (strip-python2-variant python-pytest))
|
||||
(version "6.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0gl2sdm322vzmsh5k4f8kj9raiq2y7kdinnca4m45ifvii5fk9y0"))))
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda* (#:key (tests? #t) #:allow-other-keys)
|
||||
(setenv "TERM" "dumb") ;attempt disabling markup tests
|
||||
(if tests?
|
||||
(invoke "pytest" "-vv" "-k"
|
||||
(string-append
|
||||
;; This test involve the /usr directory, and fails.
|
||||
" not test_argcomplete"
|
||||
;; These test do not honor the isatty detection and
|
||||
;; fail.
|
||||
" and not test_code_highlight"
|
||||
" and not test_color_yes"))
|
||||
(format #t "test suite not run~%"))
|
||||
#t)))))
|
||||
(propagated-inputs
|
||||
(append (alist-delete "python-py"
|
||||
(package-propagated-inputs python-pytest))
|
||||
`(("python-py" ,python-py-next))))
|
||||
(native-inputs
|
||||
(append (alist-delete "python-pytest"
|
||||
(package-native-inputs python-pytest))
|
||||
`(("python-pytest" ,python-pytest-6-bootstrap)
|
||||
("python-toml" ,python-toml)
|
||||
("python-iniconfig" ,python-iniconfig))))))
|
||||
|
||||
;; Pytest 4.x are the last versions that support Python 2.
|
||||
(define-public python2-pytest
|
||||
(package
|
||||
|
@ -975,6 +1016,15 @@ and many external plugins.")
|
|||
(arguments `(#:tests? #f))
|
||||
(properties `((python2-variant . ,(delay python2-pytest-bootstrap))))))
|
||||
|
||||
(define-public python-pytest-6-bootstrap
|
||||
(package
|
||||
(inherit (strip-python2-variant python-pytest-6))
|
||||
(name "python-pytest-bootstrap")
|
||||
(arguments `(#:tests? #f))
|
||||
(native-inputs
|
||||
`(("python-setuptools-scm" ,python-setuptools-scm)
|
||||
("python-toml" ,python-toml)))))
|
||||
|
||||
(define-public python2-pytest-bootstrap
|
||||
(hidden-package
|
||||
(package/inherit
|
||||
|
@ -1148,14 +1198,14 @@ same arguments.")
|
|||
(define-public python-pytest-xdist
|
||||
(package
|
||||
(name "python-pytest-xdist")
|
||||
(version "1.25.0")
|
||||
(version "2.1.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest-xdist" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1d812apvcmshh2l8f38spqwb3bpp0x43yy7lyfpxxzc99h4r7y4n"))
|
||||
"0wh6pn66nncfs6ay0n863bgyriwsgppn8flx5l7551j1lbqkinc2"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
|
||||
;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -42,29 +43,29 @@
|
|||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define nanopass
|
||||
(let ((version "1.9"))
|
||||
(let ((version "1.9.1"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/nanopass/nanopass-framework-scheme")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri"))
|
||||
(sha256 (base32 "1synadgaycca39jfx525975ss9y0lkl516sdrc62wrrllamm8n21"))
|
||||
(file-name (git-file-name "nanopass" version)))))
|
||||
|
||||
(define stex
|
||||
(let ((version "1.2.1"))
|
||||
(let ((version "1.2.2"))
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/dybvig/stex")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n"))
|
||||
(sha256 (base32 "1q5i8pf4cdfjsj6r2k1rih7ljbfggyxdng2p2fvsgarzihpsin2i"))
|
||||
(file-name (git-file-name "stex" version)))))
|
||||
|
||||
(define-public chez-scheme
|
||||
(package
|
||||
(name "chez-scheme")
|
||||
(version "9.5.2")
|
||||
(version "9.5.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -72,13 +73,15 @@
|
|||
(url "https://github.com/cisco/ChezScheme")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "1hagrqdp649n2g0wq2a9gfnz7mjcjakkw7ziplbj3db412bb7kx5"))
|
||||
(base32 "0prgn2z9l888j93ydxaf04ph424g0fi3a8w7f8m0b2r7fr1v7388"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("ncurses" ,ncurses)
|
||||
("libuuid" ,util-linux "lib")
|
||||
("libx11" ,libx11)
|
||||
("lz4" ,lz4)
|
||||
("lz4:static" ,lz4 "static")
|
||||
("xorg-rgb" ,xorg-rgb)
|
||||
("nanopass" ,nanopass)
|
||||
("zlib" ,zlib)
|
||||
|
@ -118,7 +121,7 @@
|
|||
(let ((out (assoc-ref outputs "out"))
|
||||
(nanopass (assoc-ref inputs "nanopass"))
|
||||
(stex (assoc-ref inputs "stex"))
|
||||
(zlib (assoc-ref inputs "zlib"))
|
||||
(lz4-static (assoc-ref inputs "lz4:static"))
|
||||
(zlib-static (assoc-ref inputs "zlib:static"))
|
||||
(unpack (assoc-ref %standard-phases 'unpack))
|
||||
(patch-source-shebangs
|
||||
|
@ -137,13 +140,6 @@
|
|||
;; and manually patch the needed modules for compilation.
|
||||
(substitute* "configure"
|
||||
(("! -f '") "-d '")) ; working around CURL.
|
||||
(substitute* (find-files "./c" "Mf-[a-zA-Z0-9.]+")
|
||||
(("\\$\\{Kernel\\}: \\$\\{kernelobj\\} \\.\\./zlib/libz\\.a")
|
||||
"${Kernel}: ${kernelobj}")
|
||||
(("ld ([-a-zA-Z0-9_${} ]+) \\.\\./zlib/libz\\.a" all args)
|
||||
(string-append "ld " args " " zlib-static "/lib/libz.a"))
|
||||
(("\\(cd \\.\\./zlib; ([-a-zA-Z0-9=./ ]+))")
|
||||
(which "true")))
|
||||
(substitute* (find-files "mats" "Mf-.*")
|
||||
(("^[[:space:]]+(cc ) *") "\tgcc "))
|
||||
(substitute*
|
||||
|
@ -155,16 +151,21 @@
|
|||
"|stex\\.stex"
|
||||
"|newrelease"
|
||||
"|workarea"
|
||||
"|unix\\.ms"
|
||||
"|^6\\.ms"
|
||||
;;"|[a-zA-Z0-9.]+\\.ms" ; guile can't read
|
||||
")"))
|
||||
(("/bin/rm") (which "rm"))
|
||||
(("/bin/ln") (which "ln"))
|
||||
(("/bin/cp") (which "cp")))
|
||||
(("/bin/cp") (which "cp"))
|
||||
(("/bin/echo") (which "echo")))
|
||||
(substitute* "makefiles/installsh"
|
||||
(("/bin/true") (which "true")))
|
||||
(substitute* "stex/Makefile"
|
||||
(("PREFIX=/usr") (string-append "PREFIX=" out)))
|
||||
(invoke "./configure" "--threads"
|
||||
(string-append "ZLIB=" zlib-static "/lib/libz.a")
|
||||
(string-append "LZ4=" lz4-static "/lib/liblz4.a")
|
||||
(string-append "--installprefix=" out)))))
|
||||
;; Installation of the documentation requires a running "chez".
|
||||
(add-after 'install 'install-doc
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
|
||||
;;; Copyright © 2020 Evan Hanson <evhan@foldling.org>
|
||||
;;; Copyright © 2020 raingloom <raingloom@riseup.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -20,11 +21,14 @@
|
|||
(define-module (gnu packages chicken)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix build-system chicken)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix svn-download)
|
||||
#:use-module (gnu packages commencement)
|
||||
#:use-module ((guix licenses)
|
||||
#:select (bsd-3)))
|
||||
#:prefix license:))
|
||||
|
||||
(define-public chicken
|
||||
(package
|
||||
|
@ -59,6 +63,11 @@
|
|||
|
||||
;; Parallel builds are not supported, as noted in README.
|
||||
#:parallel-build? #f))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "CHICKEN_REPOSITORY_PATH")
|
||||
;; TODO extract binary version into a module level definition.
|
||||
(files (list "var/lib/chicken/11")))))
|
||||
(propagated-inputs `(("gcc-toolchain" ,gcc-toolchain)))
|
||||
(home-page "https://www.call-cc.org/")
|
||||
(synopsis "R5RS Scheme implementation that compiles native code via C")
|
||||
|
@ -66,4 +75,209 @@
|
|||
"CHICKEN is a compiler for the Scheme programming language. CHICKEN
|
||||
produces portable and efficient C, supports almost all of the R5RS Scheme
|
||||
language standard, and includes many enhancements and extensions.")
|
||||
(license bsd-3)))
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public chicken-srfi-1
|
||||
(package
|
||||
(name "chicken-srfi-1")
|
||||
(version "0.5.1")
|
||||
(source
|
||||
(origin
|
||||
(method svn-fetch)
|
||||
(uri (svn-reference
|
||||
(url (string-append
|
||||
"https://code.call-cc.org/svn/chicken-eggs/"
|
||||
"release/5/srfi-1/tags/"
|
||||
version))
|
||||
(revision 39055)
|
||||
(user-name "anonymous")
|
||||
(password "")))
|
||||
(file-name (string-append "chicken-srfi-1" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"02940zsjrmn7c34rnp1rllm2nahh9jvszlzrw8ak4pf31q09cmq1"))))
|
||||
(build-system chicken-build-system)
|
||||
(arguments '(#:egg-name "srfi-1"))
|
||||
(inputs
|
||||
`(("chicken-test" ,chicken-test)))
|
||||
(home-page "https://wiki.call-cc.org/eggref/5/srfi-1")
|
||||
(synopsis "SRFI-1 list library")
|
||||
(description
|
||||
"The list library defined in
|
||||
@uref{https://srfi.schemers.org/srfi-1/srfi-1.html, SRFI-1} contains a lot of
|
||||
useful list processing procedures for construction, examining, destructuring
|
||||
and manipulating lists and pairs.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public chicken-srfi-14
|
||||
(package
|
||||
(name "chicken-srfi-14")
|
||||
(version "0.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method svn-fetch)
|
||||
(uri (svn-reference
|
||||
(url (string-append "https://code.call-cc.org/svn/chicken-eggs/"
|
||||
"release/5/srfi-14/tags/" version))
|
||||
(revision 39057)
|
||||
(user-name "anonymous")
|
||||
(password "")))
|
||||
(file-name (string-append "chicken-srfi-14-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0wjsqfwawh9bx6vvii1gwag166bxkflc0ib374fbws14914g2ac1"))))
|
||||
(build-system chicken-build-system)
|
||||
(arguments '(#:egg-name "srfi-14"))
|
||||
(home-page "https://wiki.call-cc.org/eggref/5/srfi-14")
|
||||
(synopsis "Character set library")
|
||||
(description
|
||||
"Character sets can be created, extended, tested for the membership of
|
||||
a characters and be compared to other character sets")
|
||||
(license (license:non-copyleft
|
||||
"http://wiki.call-cc.org/eggref/5/srfi-14#license"))))
|
||||
|
||||
(define-public chicken-srfi-69
|
||||
(package
|
||||
(name "chicken-srfi-69")
|
||||
(version "0.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method svn-fetch)
|
||||
(uri (svn-reference
|
||||
(url (string-append "https://code.call-cc.org/svn/chicken-eggs/"
|
||||
"release/5/srfi-69/tags/"
|
||||
version))
|
||||
(revision 39057)
|
||||
(user-name "anonymous")
|
||||
(password "")))
|
||||
(file-name (string-append "chicken-srfi-69-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z0m9vmg9bj9z0a941pls6igvg8nmhq4mj5psjjidbp0fac572mp"))))
|
||||
(arguments '(#:egg-name "srfi-69"))
|
||||
(build-system chicken-build-system)
|
||||
(home-page "https://wiki.call-cc.org/eggref/5/srfi-69")
|
||||
(synopsis "Implementation of SRFI 69 with SRFI 90 extensions")
|
||||
(description
|
||||
"This package provides an implementation of
|
||||
@uref{https://srfi.schemers.org/srfi-69/srfi-69.html, SRFI-69 hash tables} for
|
||||
CHICKEN Scheme, along with
|
||||
@uref{https://srfi.schemers.org/srfi-90/srfi-90.html, SRFI-90} extensions.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public chicken-agrep
|
||||
(package
|
||||
(name "chicken-agrep")
|
||||
(version "1.7")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/iraikov/chicken-agrep")
|
||||
(commit version)))
|
||||
(file-name (string-append "chicken-agrep-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0z05x7f154n9bgmainrsmncf5i6dil43r9ymr3rdgwbg4wnxmz4s"))))
|
||||
;; TODO do we really have to make these propagated?
|
||||
;; I don't know Chicken's module system well enough to tell
|
||||
(propagated-inputs
|
||||
`(("chicken-datatype" ,chicken-datatype)
|
||||
("chicken-srfi-1" ,chicken-srfi-1)
|
||||
("chicken-srfi-14" ,chicken-srfi-14)))
|
||||
(inputs
|
||||
`(("chicken-test" ,chicken-test)))
|
||||
(build-system chicken-build-system)
|
||||
(arguments '(#:egg-name "agrep"))
|
||||
(synopsis "Approximate string matching library")
|
||||
(home-page "https://wiki.call-cc.org/eggref/5/agrep")
|
||||
(description
|
||||
"This library implements the Wu-Manber algorithm for approximate string
|
||||
searching with errors, popularized by the agrep Unix command and the glimpse
|
||||
file indexing tool.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public chicken-datatype
|
||||
(package
|
||||
(name "chicken-datatype")
|
||||
(version "1.6")
|
||||
(source
|
||||
(origin
|
||||
(method svn-fetch)
|
||||
(uri (svn-reference
|
||||
(url (string-append "https://code.call-cc.org/svn/chicken-eggs/"
|
||||
"release/5/datatype/tags/" version))
|
||||
(revision 39266)
|
||||
(user-name "anonymous")
|
||||
(password "")))
|
||||
(file-name (string-append "chicken-datatype-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"1a58q8ypjkjz6wdv25247wixds4179239d36nnvsfn6gp70s9jfq"))))
|
||||
(build-system chicken-build-system)
|
||||
(arguments '(#:egg-name "datatype"))
|
||||
(inputs
|
||||
`(("chicken-srfi-1" ,chicken-srfi-1)
|
||||
("chicken-test" ,chicken-test)))
|
||||
(home-page "https://wiki.call-cc.org/eggref/5/datatype")
|
||||
(synopsis "Facility for creating and using variant records")
|
||||
(description
|
||||
"This CHICKEN Scheme library provides a facility for creating and using
|
||||
variant records, as described in the book @i{Essentials of Programming
|
||||
Languages} by Friedman, Wand, and Haynes.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public chicken-iset
|
||||
(package
|
||||
(name "chicken-iset")
|
||||
(version "2.2")
|
||||
(source
|
||||
(origin
|
||||
(method svn-fetch)
|
||||
(uri (svn-reference
|
||||
(url (string-append "https://code.call-cc.org/svn/chicken-eggs/"
|
||||
"release/5/iset/tags/" version))
|
||||
(revision 39057)
|
||||
(user-name "anonymous")
|
||||
(password "")))
|
||||
(file-name (string-append "chicken-iset-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gz50n5i561n5sk9prry0lrxz6bfrq9if5bclaq6a0f7lzinhnzb"))))
|
||||
(inputs
|
||||
`(("chicken-test" ,chicken-test)))
|
||||
(build-system chicken-build-system)
|
||||
(arguments '(#:egg-name "iset"))
|
||||
(synopsis "Integer set library")
|
||||
(home-page "https://wiki.call-cc.org/eggref/5/iset")
|
||||
(description
|
||||
"This ``integer set'' CHICKEN Scheme library implements bit vectors.
|
||||
Bit-vectors provide an abstract interface to bitwise operations typically done
|
||||
with integers.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public chicken-test
|
||||
(package
|
||||
(name "chicken-test")
|
||||
(version "1.1")
|
||||
(source
|
||||
(origin
|
||||
(method svn-fetch)
|
||||
(uri (svn-reference
|
||||
(url (string-append "https://code.call-cc.org/svn/chicken-eggs/"
|
||||
"release/5/test/tags/" version))
|
||||
(revision 39263)
|
||||
(user-name "anonymous")
|
||||
(password "")))
|
||||
(file-name (string-append "chicken-test-" version "-checkout"))
|
||||
(sha256
|
||||
(base32
|
||||
"14i91cxsn6hjkx6kqf7i9syck73cw71jik61jmhg87vpxx5kfnzx"))))
|
||||
(build-system chicken-build-system)
|
||||
(arguments '(#:egg-name "test"))
|
||||
(home-page "https://wiki.call-cc.org/eggref/5/test")
|
||||
(synopsis "Yet another testing utility")
|
||||
(description
|
||||
"This package provides a simple testing utility for CHICKEN Scheme.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
|
|
|
@ -302,8 +302,8 @@
|
|||
(string-append "ungoogled-chromium-" category "-" name))))
|
||||
(sha256 (base32 hash))))
|
||||
|
||||
(define %chromium-version "87.0.4280.66")
|
||||
(define %ungoogled-revision "1f7cdef6dfa8f612afde8f988131f210612333e0")
|
||||
(define %chromium-version "87.0.4280.88")
|
||||
(define %ungoogled-revision "b78cb927fa8beaee0ddfb4385277edb96444c40f")
|
||||
(define %debian-revision "debian/84.0.4147.105-1")
|
||||
|
||||
(define %debian-patches
|
||||
|
@ -321,7 +321,7 @@
|
|||
(string-take %ungoogled-revision 7)))
|
||||
(sha256
|
||||
(base32
|
||||
"1cka9h7znkmilz9ld4s8pw1jjq2p7br03g3agcnqrk591y5h141i"))))
|
||||
"0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg"))))
|
||||
|
||||
(define %guix-patches
|
||||
(list (local-file
|
||||
|
@ -443,7 +443,7 @@
|
|||
%chromium-version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19"))
|
||||
"1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet (force ungoogled-chromium-snippet))))
|
||||
(build-system gnu-build-system)
|
||||
|
@ -466,7 +466,7 @@
|
|||
"is_official_build=true"
|
||||
(string-append "max_jobs_per_link="
|
||||
;; Respect the default cap of 8 jobs.
|
||||
(number->string (max 8 (parallel-job-count))))
|
||||
(number->string (min 8 (parallel-job-count))))
|
||||
"clang_use_chrome_plugins=false"
|
||||
"chrome_pgo_phase=0"
|
||||
"use_sysroot=false"
|
||||
|
|
|
@ -68,8 +68,8 @@
|
|||
(file-name (string-append name "-" version "-checkout")))))))
|
||||
|
||||
(define-public cuirass
|
||||
(let ((commit "fd432b8e8f449d691773e96e7d90f44761e01aa3")
|
||||
(revision "55"))
|
||||
(let ((commit "697fa14584551d9595cd042f1ffeba240e45a127")
|
||||
(revision "56"))
|
||||
(package
|
||||
(name "cuirass")
|
||||
(version (git-version "0.0.1" revision commit))
|
||||
|
@ -81,7 +81,7 @@
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"10j3w3px0250avwry2x8wsa0m0plvm957g4qqgnajsbc9gvka554"))))
|
||||
"0gw9cja8fiyra9vnn3y384gwanvsqdq6gwjcvmz91sy5lvfwv34m"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:modules ((guix build utils)
|
||||
|
@ -94,7 +94,7 @@
|
|||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'disable-repo-tests
|
||||
(λ _
|
||||
(lambda _
|
||||
;; Disable tests that use a connection to the Guix daemon.
|
||||
(substitute* "Makefile.am"
|
||||
(("tests/repo.scm \\\\") "\\"))
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw>
|
||||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
|
@ -39,7 +39,7 @@
|
|||
(define-public drbd-utils
|
||||
(package
|
||||
(name "drbd-utils")
|
||||
(version "9.15.0")
|
||||
(version "9.15.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
;; Older releases are moved to /archive. List it first because in
|
||||
|
@ -51,7 +51,7 @@
|
|||
"/utils/drbd-utils-" version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0jh7zdxpbjkq53pmrn0jfn33abi4vs8axp55h5256czwc2gfb6z8"))
|
||||
"1q92bwnprqkkj9iy6fxcybcfpxvvjw5clis0igrbxqnq869kwp1i"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2016, 2019, 2020 Kei Kebreau <kkebreau@posteo.net>
|
||||
;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
|
@ -621,14 +621,14 @@ archiving. Lzip is a clean implementation of the LZMA algorithm.")
|
|||
(define-public lziprecover
|
||||
(package
|
||||
(name "lziprecover")
|
||||
(version "1.21")
|
||||
(version "1.22")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/lzip/lziprecover/"
|
||||
"lziprecover-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"094w2z8fz41yaq0gkyr61cl7pb1d7kchpl5dka7rvm3qvbb7ncd2"))))
|
||||
"0qh8dnhr5rly2k9dnx43qqynqwqzi5kfb15pyd29qwppfl4qm5gx"))))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "https://www.nongnu.org/lzip/lziprecover.html")
|
||||
(synopsis "Recover and decompress data from damaged lzip files")
|
||||
|
@ -1614,6 +1614,55 @@ recreates the stored directory structure by default.")
|
|||
(license (license:non-copyleft "file://LICENSE"
|
||||
"See LICENSE in the distribution."))))
|
||||
|
||||
(define-public ziptime
|
||||
(let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "ziptime")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://android.googlesource.com/platform/build")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0hrn61b3a97dlc4iqc28rwx8k8zf7ycbwzqqp93vj34zy5a541kn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no test suite
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'change-directory
|
||||
(lambda _
|
||||
(chdir "tools/ziptime")))
|
||||
(delete 'configure) ; nothing to configure
|
||||
(replace 'build
|
||||
;; There is no Makefile, only an ‘Android.bp’ file. Ignore it.
|
||||
(lambda _
|
||||
(let ((c++ ,(cxx-for-target)))
|
||||
(apply invoke c++ "-O2" "-o" "ziptime"
|
||||
(find-files "." "\\.cpp$")))))
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/bin"))
|
||||
(doc (string-append out "/share/doc/" ,name "-" ,version)))
|
||||
(install-file "ziptime" bin)
|
||||
(install-file "README.txt" doc)))))))
|
||||
;; There is no separate home page for this tiny bundled build tool.
|
||||
(home-page (string-append "https://android.googlesource.com/platform/build/"
|
||||
"+/master/tools/ziptime/README.txt"))
|
||||
(synopsis "Normalize @file{.zip} archive header timestamps")
|
||||
(description
|
||||
"Ziptime helps make @file{.zip} archives reproducible by replacing
|
||||
timestamps in the file header with a fixed time (1 January 2008).
|
||||
|
||||
``Extra fields'' are not changed, so you'll need to use the @code{-X} option to
|
||||
@command{zip} to prevent it from storing the ``universal time'' field.")
|
||||
(license license:asl2.0))))
|
||||
|
||||
(define-public zziplib
|
||||
(package
|
||||
(name "zziplib")
|
||||
|
@ -1799,14 +1848,14 @@ corrupted input.")
|
|||
(define-public plzip
|
||||
(package
|
||||
(name "plzip")
|
||||
(version "1.8")
|
||||
(version "1.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://savannah/lzip/plzip/"
|
||||
"plzip-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "04indil809qgfmz776imb3dnhkysh7zk28jcv3mw0ahl2lyaxbzd"))))
|
||||
(base32 "19zinpx7hssl6r3vilpvq2s7wha3545xan8b0vcvsxnyipdx3n0l"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("lzlib" ,lzlib)))
|
||||
|
@ -1854,7 +1903,7 @@ non-Windows systems without running the actual installer using wine.")
|
|||
(define-public google-brotli
|
||||
(package
|
||||
(name "google-brotli")
|
||||
(version "1.0.7")
|
||||
(version "1.0.9")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1863,7 +1912,15 @@ non-Windows systems without running the actual installer using wine.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"))))
|
||||
(base32 "1fikasxf7r2dwlk8mv8w7nmjkn0jw5ic31ky3mvpkdzwgd4xfndl"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Cherry-picked from upstream since the latest release
|
||||
;; https://github.com/google/brotli/commit/09b0992b6acb7faa6fd3b23f9bc036ea117230fc
|
||||
(substitute* (find-files "scripts" "^lib.*pc\\.in")
|
||||
(("-R\\$\\{libdir\\} ") ""))
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -2150,7 +2207,7 @@ file compression algorithm.")
|
|||
(define-public xarchiver
|
||||
(package
|
||||
(name "xarchiver")
|
||||
(version "0.5.4.15")
|
||||
(version "0.5.4.16")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -2159,7 +2216,7 @@ file compression algorithm.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0a3y54r5zp2c0cqm77r07qrl1vh200wvqmbhm35diy22fvkq5mwc"))))
|
||||
(base32 "0nblyk65w1in0zpfbyzy6dw4x0fzx3q7xs85dby5ap4w0gjz9s44"))))
|
||||
(build-system glib-or-gtk-build-system)
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
|
|
|
@ -114,7 +114,7 @@ performance).
|
|||
(define-public picom
|
||||
(package
|
||||
(name "picom")
|
||||
(version "7.5")
|
||||
(version "8.2")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -123,7 +123,7 @@ performance).
|
|||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"1l48fxl04vkzr4r94sl37nbbw7a621rn8sxmkbdv4252i1gjxd4z"))
|
||||
"0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"))
|
||||
(file-name (string-append "picom-" version))))
|
||||
(build-system meson-build-system)
|
||||
(inputs
|
||||
|
|
|
@ -43,10 +43,12 @@
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages c)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages code)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages libunwind)
|
||||
|
@ -332,7 +334,8 @@ as ordering relation.")
|
|||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
(list (string-append "-DJSON_TestDataDirectory="
|
||||
(list "-DJSON_MultipleHeaders=ON" ; For json_fwd.hpp.
|
||||
(string-append "-DJSON_TestDataDirectory="
|
||||
(assoc-ref %build-inputs "json_test_data")))
|
||||
#:phases (modify-phases %standard-phases
|
||||
;; XXX: When tests are enabled, the install phase will cause
|
||||
|
@ -374,7 +377,7 @@ intuitive syntax and trivial integration.")
|
|||
(define-public xtl
|
||||
(package
|
||||
(name "xtl")
|
||||
(version "0.6.21")
|
||||
(version "0.6.23")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
|
@ -383,7 +386,7 @@ intuitive syntax and trivial integration.")
|
|||
(commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"08xhyy9fm2ddkdrgb1qyd2bs371a2xr7xzar482pwphz27vr035w"))
|
||||
"1kd9zl4h6nrsg29hq13vwp4zhfj8sa90vj40726lpw6vxz48k4di"))
|
||||
(file-name (git-file-name name version))))
|
||||
(native-inputs
|
||||
`(("googletest" ,googletest)
|
||||
|
@ -731,3 +734,77 @@ of C++14 components that complements @code{std} and Boost.")
|
|||
;; 32-bit is not supported: https://github.com/facebook/folly/issues/103
|
||||
(supported-systems '("aarch64-linux" "x86_64-linux"))
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public aws-sdk-cpp
|
||||
(package
|
||||
(name "aws-sdk-cpp")
|
||||
(version "1.8.102")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/aws/aws-sdk-cpp")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1w8x2vakg5ngjyyg08n4g3dqy8wqnz0k3gkrlqrh460s2pvdivba"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(;; Tests are run during the build phase.
|
||||
#:tests? #f
|
||||
#:configure-flags
|
||||
'("-DBUILD_SHARED_LIBS=OFF"
|
||||
"-DBUILD_DEPS=OFF")))
|
||||
(propagated-inputs
|
||||
`(("aws-c-common" ,aws-c-common)
|
||||
("aws-c-event-stream" ,aws-c-event-stream)))
|
||||
(inputs
|
||||
`(("aws-checksums" ,aws-checksums)
|
||||
("curl" ,curl)
|
||||
("openssl" ,openssl)
|
||||
("zlib" ,zlib)))
|
||||
(synopsis "Amazon Web Services SDK for C++")
|
||||
(description
|
||||
"The AWS SDK for C++ provides a C++11 interface to the @acronym{AWS,Amazon
|
||||
Web Services} API. AWS provides on-demand computing infrastructure and software
|
||||
services including database, analytic, and machine learning technologies.")
|
||||
(home-page "https://github.com/aws/aws-sdk-cpp")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public libexpected
|
||||
(package
|
||||
(name "libexpected")
|
||||
(version "1.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/TartanLlama/expected")
|
||||
(commit (string-append "v" version))
|
||||
;; NOTE: Requires TL_CMAKE from custom
|
||||
;; repository. Should not affect reproducibility.
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
;; NOTE: This patch will be unnecessary on subsequent tags.
|
||||
(patches (search-patches "libexpected-nofetch.patch"))
|
||||
(sha256
|
||||
(base32 "1ckzfrljzzdw9wf8hvdfjz4wjx5na57iwxc48mbv9rf5067m21a5"))))
|
||||
(build-system cmake-build-system)
|
||||
;; TODO: Clean up install phase.
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _
|
||||
(invoke "./tests"))))))
|
||||
(native-inputs
|
||||
`(("catch2" ,catch-framework2)))
|
||||
(synopsis "C++11/14/17 std::expected with functional-style extensions")
|
||||
(description "@code{std::expected} is proposed as the preferred way to
|
||||
represent objects which will either have an expected value, or an unexpected
|
||||
value giving information about why something failed. Unfortunately, chaining
|
||||
together many computations which may fail can be verbose, as error-checking
|
||||
code will be mixed in with the actual programming logic. This implementation
|
||||
provides a number of utilities to make coding with expected cleaner.")
|
||||
(home-page "https://tl.tartanllama.xyz/")
|
||||
(license license:cc0)))
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -8,6 +8,8 @@
|
|||
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -166,8 +168,38 @@ text or blue underlined text, on ANSI terminals.")
|
|||
"1xif1bh938qpfc3d0f9xgidibpm65xix11w9gszwqnia00q7rb13"))))
|
||||
(arguments `())))
|
||||
|
||||
(define-public rust-aom-sys-0.2
|
||||
(package
|
||||
(name "rust-aom-sys")
|
||||
(version "0.2.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (crate-uri "aom-sys" version))
|
||||
(file-name
|
||||
(string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"03a0xhaafjn0hlpcf9ba73hv557m0jqnmj9wl57wzrcnka96zvgj"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-bindgen" ,rust-bindgen-0.54)
|
||||
("rust-metadeps" ,rust-metadeps-1.1))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libaom" ,libaom)
|
||||
("clang" ,clang)
|
||||
("llvm" ,llvm)))
|
||||
(home-page "https://github.com/rust-av/aom-rs")
|
||||
(synopsis "FFI bindings to aom")
|
||||
(description "This package provides FFI bindings to aom.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-aom-sys-0.1
|
||||
(package
|
||||
(inherit rust-aom-sys-0.2)
|
||||
(name "rust-aom-sys")
|
||||
(version "0.1.4")
|
||||
(source
|
||||
|
@ -189,11 +221,7 @@ text or blue underlined text, on ANSI terminals.")
|
|||
(inputs
|
||||
`(("libaom" ,libaom)
|
||||
("clang" ,clang)
|
||||
("llvm" ,llvm)))
|
||||
(home-page "https://github.com/rust-av/aom-rs")
|
||||
(synopsis "FFI bindings to aom")
|
||||
(description "This package provides FFI bindings to aom.")
|
||||
(license license:expat)))
|
||||
("llvm" ,llvm)))))
|
||||
|
||||
(define-public rust-ascii-canvas-2
|
||||
(package
|
||||
|
@ -2268,7 +2296,7 @@ protocol extensions. Look at the crate wayland-client for usable bindings.")
|
|||
(define-public rust-x11-2
|
||||
(package
|
||||
(name "rust-x11")
|
||||
(version "2.18.1")
|
||||
(version "2.18.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -2276,17 +2304,16 @@ protocol extensions. Look at the crate wayland-client for usable bindings.")
|
|||
(file-name
|
||||
(string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dg2d0yrqmwg6prpxkw3vpmwzwxnaki2cn0v64ylh5gp4cqpws9r"))))
|
||||
(base32 "0wz7l6dlbraa9zalh9i45v9wibvkir9m2m1sg0jnzcbcaj9d1v3p"))))
|
||||
(build-system cargo-build-system)
|
||||
(arguments
|
||||
`(#:cargo-inputs
|
||||
(("rust-libc" ,rust-libc-0.2)
|
||||
("rust-pkg-config" ,rust-pkg-config-0.3))))
|
||||
(home-page "https://github.com/erlepereira/x11-rs.git")
|
||||
(home-page "https://github.com/erlepereira/x11-rs")
|
||||
(synopsis "X11 library bindings for Rust")
|
||||
(description "X11 library bindings for Rust.")
|
||||
(license license:cc0)))
|
||||
(description "This crate provides X11 library bindings for Rust.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public rust-x11-clipboard-0.4
|
||||
(package
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -3,7 +3,7 @@
|
|||
;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net>
|
||||
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
|
@ -444,14 +444,14 @@ total number of shares generated.")
|
|||
(define-public tomb
|
||||
(package
|
||||
(name "tomb")
|
||||
(version "2.8")
|
||||
(version "2.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://files.dyne.org/tomb/releases/"
|
||||
"Tomb-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bggzzqmpfiknr76lyl8iszybrcpyqlbgiqk47fxq08h2b5ln1ic"))))
|
||||
"136nfnpaz29hngwwnzrmc858gpnvnb977gf4ldbpapw1h1k3r8mk"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("sudo" ,sudo))) ;presence needed for 'check' phase
|
||||
(inputs
|
||||
|
@ -717,7 +717,7 @@ data on your platform, so the seed itself will be as random as possible.
|
|||
(define-public crypto++
|
||||
(package
|
||||
(name "crypto++")
|
||||
(version "8.2.0")
|
||||
(version "8.4.0")
|
||||
(source (origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append "https://cryptopp.com/cryptopp"
|
||||
|
@ -725,7 +725,7 @@ data on your platform, so the seed itself will be as random as possible.
|
|||
".zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0n40hlz5jkvlcp9vxrj0fsrcfp7dm0zmmv6h52dx3f8i5qjf5w03"))))
|
||||
"16kvfm11xv7j9a3yykzysjgw38a9b7lnc5n5x5h82g395k6ybxf0"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
@ -1028,10 +1028,10 @@ trivial to build for local use. Portability is emphasized over performance.")
|
|||
(license license:unlicense)))
|
||||
|
||||
(define-public libsecp256k1
|
||||
(let ((commit "d644dda5c9dbdecee52d1aa259235510fdc2d4ee"))
|
||||
(let ((commit "dbd41db16a0e91b2566820898a3ab2d7dad4fe00"))
|
||||
(package
|
||||
(name "libsecp256k1")
|
||||
(version (git-version "20191213" "1" commit))
|
||||
(version (git-version "20200615" "1" commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -1039,9 +1039,14 @@ trivial to build for local use. Portability is emphasized over performance.")
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"0zmx32746khsm2cx0p3pdy3j2vkwmafvf7axiixijhgcg0xjv93i"))
|
||||
"1fcpnksq5cqwqzshn5f0lq94b73p3frwbp04hgmmbnrndpqg6mpy"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--enable-module-recovery"
|
||||
"--enable-experimental"
|
||||
"--enable-module-ecdh"
|
||||
"--enable-shared")))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
|
|
|
@ -418,17 +418,16 @@ should only be used as part of the Guix cups-pk-helper service.")
|
|||
(define-public hplip
|
||||
(package
|
||||
(name "hplip")
|
||||
(version "3.20.9")
|
||||
(version "3.20.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
|
||||
"/hplip-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1prdbp410405xrfggjc7y34nzljg7jnbgjzalgv4khwwma4i299n"))
|
||||
"04fvdyjyjbkviy3awgm7g43p3lrvrsmgaqz8bwra22g7v2rpa5hb"))
|
||||
(modules '((guix build utils)))
|
||||
(patches (search-patches "hplip-fix-bug-1898438.patch"
|
||||
"hplip-remove-imageprocessor.patch"))
|
||||
(patches (search-patches "hplip-remove-imageprocessor.patch"))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete non-free blobs: .so files, pre-compiled
|
||||
|
@ -449,6 +448,7 @@ should only be used as part of the Guix cups-pk-helper service.")
|
|||
"locatedriverdir = $(pkglibexecdir)\n"))
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs (list "out" "ppd"))
|
||||
(home-page "https://developers.hp.com/hp-linux-imaging-and-printing")
|
||||
(synopsis "HP printer drivers")
|
||||
(description
|
||||
|
@ -476,6 +476,8 @@ should only be used as part of the Guix cups-pk-helper service.")
|
|||
(assoc-ref %outputs "out") "/lib/cups/filter")
|
||||
,(string-append "--with-cupsbackenddir="
|
||||
(assoc-ref %outputs "out") "/lib/cups/backend")
|
||||
,(string-append "--with-hpppddir="
|
||||
(assoc-ref %outputs "ppd") "/share/ppd/HP")
|
||||
,(string-append "--with-icondir="
|
||||
(assoc-ref %outputs "out") "/share/applications")
|
||||
,(string-append "--with-systraydir="
|
||||
|
@ -537,7 +539,7 @@ should only be used as part of the Guix cups-pk-helper service.")
|
|||
(add-before 'configure 'fix-build-with-python-3.8
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((python (assoc-ref inputs "python")))
|
||||
;; XXX: The configure script of looks for Python headers in the
|
||||
;; XXX: The configure script looks for Python headers in the
|
||||
;; wrong places as of version 3.20.3. Help it by adding the
|
||||
;; include directory on C_INCLUDE_PATH.
|
||||
(when python
|
||||
|
@ -717,6 +719,41 @@ printer/driver specific, but spooler-independent PPD file.")
|
|||
(("^MODTIME[[:blank:]]*=.*$")
|
||||
"MODTIME = echo Thu Jan 01 01:00:00 1970\n"))
|
||||
#t))
|
||||
(add-before 'install 'make-install-dirs
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Make missing install dirs
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(dirs '("/share/cups/model"
|
||||
"/share/foomatic/db/source/opt"
|
||||
"/share/foomatic/db/source/printer"
|
||||
"/share/foomatic/db/source/driver"
|
||||
"/lib/cups/filter")))
|
||||
(for-each (lambda (dir)
|
||||
(mkdir-p (string-append out dir)))
|
||||
dirs))))
|
||||
(add-after 'install 'wrap-wrappers
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(ghostscript (assoc-ref inputs "ghostscript"))
|
||||
(coreutils (assoc-ref inputs "coreutils"))
|
||||
(sed (assoc-ref inputs "sed")))
|
||||
(for-each (lambda (file)
|
||||
(wrap-program file
|
||||
`("PATH" ":" prefix
|
||||
(,(string-append ghostscript "/bin:"
|
||||
coreutils "/bin:"
|
||||
sed "/bin")))))
|
||||
(find-files (string-append
|
||||
out "/bin") "wrapper$")))))
|
||||
(add-after 'install 'install-cups-filters-symlinks
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(for-each
|
||||
(lambda (file)
|
||||
(symlink file
|
||||
(string-append out "/lib/cups/filter/"
|
||||
(basename file))))
|
||||
(find-files (string-append out "/bin"))))))
|
||||
(add-after 'install 'remove-pdf
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Remove 'manual.pdf' which is (1) useless (it's a
|
||||
|
@ -730,7 +767,9 @@ printer/driver specific, but spooler-independent PPD file.")
|
|||
#:tests? #f ;no tests
|
||||
#:make-flags '("CC=gcc")))
|
||||
(inputs
|
||||
`(("ghostscript" ,ghostscript)
|
||||
`(("coreutils" ,coreutils)
|
||||
("sed" ,sed)
|
||||
("ghostscript" ,ghostscript)
|
||||
("foomatic-filters" ,foomatic-filters))) ;for 'foomatic-rip'
|
||||
(native-inputs
|
||||
`(("bc" ,bc)
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
||||
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2020 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2020 Dale Mellor <guix-devel-0brg6b@rdmp.org>
|
||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
|
@ -53,15 +53,15 @@
|
|||
(define-public curl
|
||||
(package
|
||||
(name "curl")
|
||||
(version "7.73.0")
|
||||
(version "7.74.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12j0qaij1ppgspray8xvs2qk3h3m23wdqh27x87y1aw8xaj7qk3w"))
|
||||
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://curl.haxx.se/download/curl-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr"))
|
||||
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out"
|
||||
"doc")) ;1.2 MiB of man3 pages
|
||||
|
@ -192,43 +192,68 @@ not offer a replacement for libcurl.")
|
|||
(define-public guile-curl
|
||||
(package
|
||||
(name "guile-curl")
|
||||
(version "0.6")
|
||||
(version "0.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.lonelycactus.com/tarball/"
|
||||
"guile_curl-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pxdhnk288ky6gkpad8i60m0p6404rdvls43lr1b5d3csrklyc70"))))
|
||||
"1zk0ijx6bj212k0j0ma84cpvpvn0x6raaxnby3wdx3w4wnhnscn7"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list (string-append
|
||||
`(#:modules (((guix build guile-build-system)
|
||||
#:select (target-guile-effective-version))
|
||||
,@%gnu-build-system-modules)
|
||||
#:imported-modules ((guix build guile-build-system)
|
||||
,@%gnu-build-system-modules)
|
||||
#:configure-flags (list (string-append
|
||||
"--with-guilesitedir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/guile/site/2.2")
|
||||
"/share/guile/site/"
|
||||
(target-guile-effective-version
|
||||
(assoc-ref %build-inputs "guile")))
|
||||
(string-append
|
||||
"-with-guileextensiondir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib/guile/2.2/extensions"))
|
||||
"/lib/guile/"
|
||||
(target-guile-effective-version
|
||||
(assoc-ref %build-inputs "guile"))
|
||||
"/extensions"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-undefined-references
|
||||
(lambda* _
|
||||
(substitute* "src/curl.scm"
|
||||
;; The following #defines are missing from our curl package
|
||||
;; and therefore result in the evaluation of undefined symbols.
|
||||
((",CURLOPT_HAPROXYPROTOCOL") "#f")
|
||||
((",CURLOPT_DISALLOW_USERNAME_IN_URL") "#f")
|
||||
((",CURLOPT_TIMEVALUE_LARGE") "#f")
|
||||
((",CURLOPT_DNS_SHUFFLE_ADDRESSES") "#f")
|
||||
((",CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS") "#f"))))
|
||||
(add-after 'install 'patch-extension-path
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(curl.scm (string-append
|
||||
out "/share/guile/site/2.2/curl.scm"))
|
||||
(curl.go (string-append
|
||||
out "/lib/guile/2.2/site-ccache/curl.go"))
|
||||
(ext (string-append out "/lib/guile/2.2/"
|
||||
"extensions/libguile-curl")))
|
||||
(substitute* curl.scm (("libguile-curl") ext))
|
||||
;; The build system does not actually compile the Scheme module.
|
||||
;; So we can compile it and put it in the right place in one go.
|
||||
(invoke "guild" "compile" curl.scm "-o" curl.go)))))))
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(curl.scm (string-append
|
||||
out "/share/guile/site/"
|
||||
(target-guile-effective-version)
|
||||
"/curl.scm"))
|
||||
(curl.go (string-append
|
||||
out "/lib/guile/"
|
||||
(target-guile-effective-version)
|
||||
"/site-ccache/curl.go"))
|
||||
(ext (string-append out "/lib/guile/"
|
||||
(target-guile-effective-version)
|
||||
"/extensions/libguile-curl")))
|
||||
(substitute* curl.scm (("libguile-curl") ext))
|
||||
;; The build system does not actually compile the Scheme module.
|
||||
;; So we can compile it and put it in the right place in one go.
|
||||
(invoke "guild" "compile" curl.scm "-o" curl.go)))))))
|
||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
("guile" ,guile-2.2)))
|
||||
("guile" ,guile-3.0)))
|
||||
(home-page "http://www.lonelycactus.com/guile-curl.html")
|
||||
(synopsis "Curl bindings for Guile")
|
||||
(description "@code{guile-curl} is a project that has procedures that allow
|
||||
|
@ -236,6 +261,14 @@ Guile to do client-side URL transfers, like requesting documents from HTTP or
|
|||
FTP servers. It is based on the curl library.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public guile2.2-curl
|
||||
(package
|
||||
(inherit guile-curl)
|
||||
(name "guile2.2-curl")
|
||||
(inputs
|
||||
`(("curl" ,curl)
|
||||
("guile" ,guile-2.2)))))
|
||||
|
||||
(define-public curlpp
|
||||
(package
|
||||
(name "curlpp")
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -26,13 +27,13 @@
|
|||
(define-public ropgadget
|
||||
(package
|
||||
(name "ropgadget")
|
||||
(version "6.3")
|
||||
(version "6.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "ROPGadget" version))
|
||||
(sha256
|
||||
(base32 "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9"))))
|
||||
(base32 "1hz6y5a8d4gc2sryz5alpz9mivrk8kj4l3dw00zkz2xca7gwpmsi"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-capstone" ,python-capstone)))
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
|
||||
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -516,14 +517,14 @@ mapping from string keys to string values.")
|
|||
(define-public memcached
|
||||
(package
|
||||
(name "memcached")
|
||||
(version "1.5.20")
|
||||
(version "1.6.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://memcached.org/files/memcached-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1r511qr95q0ywdaql3pdjiwzkfqxhhfzb13ilvl7mznfm4iv1myg"))))
|
||||
(base32 "1lcjy1b9krnb2gk72qd1fvivlfiyfvknfi3wngyvyk9ifzijr9nm"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
`(("libevent" ,libevent)
|
||||
|
@ -898,7 +899,7 @@ Language.")
|
|||
(define-public mariadb
|
||||
(package
|
||||
(name "mariadb")
|
||||
(version "10.5.6")
|
||||
(version "10.5.8")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://downloads.mariadb.com/MariaDB"
|
||||
|
@ -906,7 +907,7 @@ Language.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1i257h0zdypdfj5wkg6ck9pxlkph0jvjs92k22pjr6gnx5lxs1gz"))
|
||||
"1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -956,6 +957,10 @@ Language.")
|
|||
"-DDEFAULT_COLLATION=utf8_general_ci"
|
||||
"-DMYSQL_DATADIR=/var/lib/mysql"
|
||||
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
|
||||
|
||||
;; Do not install the benchmark suite.
|
||||
"-DINSTALL_SQLBENCHDIR=false"
|
||||
|
||||
(string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "lib"))
|
||||
(string-append "-DCMAKE_INSTALL_RPATH=" (assoc-ref %outputs "lib")
|
||||
"/lib")
|
||||
|
@ -985,14 +990,26 @@ Language.")
|
|||
;; to other variables such as $INSTALL_INCLUDEDIR, which does
|
||||
;; not work when the latter uses an absolute file name.
|
||||
(substitute* "libmariadb/mariadb_config/mariadb_config.c.in"
|
||||
(("@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@")
|
||||
"@INSTALL_INCLUDEDIR@"))
|
||||
(("%s/@INSTALL_INCLUDEDIR@")
|
||||
(string-append "@INSTALL_INCLUDEDIR@"))
|
||||
;; As of 10.5.8, the mariadb_config program tries to be
|
||||
;; clever and computes the installation directory relative
|
||||
;; to /proc/self/exe when running on Linux. Make it fall
|
||||
;; back to the old behaviour.
|
||||
(("defined\\(__linux__\\)")
|
||||
"0"))
|
||||
(substitute* "libmariadb/mariadb_config/libmariadb.pc.in"
|
||||
(("\\$\\{prefix\\}/@INSTALL_INCLUDEDIR@")
|
||||
"@INSTALL_INCLUDEDIR@"))
|
||||
(substitute* "support-files/mariadb.pc.in"
|
||||
(("^(include|bin|script|doc|man)dir=\\$\\{prefix\\}/" _ dir)
|
||||
(string-append dir "dir=")))
|
||||
(substitute* "include/CMakeLists.txt"
|
||||
(("\\\\\\$\\{CMAKE_INSTALL_PREFIX\\}/\\$\\{INSTALL_INCLUDEDIR\\}")
|
||||
"${INSTALL_INCLUDEDIR}"))
|
||||
(substitute* "cmake/mariadb_connector_c.cmake"
|
||||
(("\\\\\\$\\{CMAKE_INSTALL_PREFIX\\}/\\$\\{INSTALL_BINDIR\\}")
|
||||
"${INSTALL_BINDIR}"))
|
||||
#t))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda _
|
||||
|
@ -1005,8 +1022,21 @@ Language.")
|
|||
"main.explain_non_select"
|
||||
"main.stat_tables"
|
||||
"main.stat_tables_innodb"
|
||||
"main.upgrade_MDEV-19650"
|
||||
"roles.acl_statistics"
|
||||
|
||||
;; FIXME: This test checks various table encodings and
|
||||
;; fails because Guix defaults to UTF8 instead of the
|
||||
;; upstream default latin1_swedish_ci. It's not easily
|
||||
;; substitutable because several encodings are tested.
|
||||
"main.sp2"
|
||||
|
||||
;; XXX: This test occasionally fails on i686-linux:
|
||||
;; <https://jira.mariadb.org/browse/MDEV-24458>
|
||||
,@(if (string-prefix? "i686" (%current-system))
|
||||
'("main.myisampack")
|
||||
'())
|
||||
|
||||
;; This file contains a time bomb which makes it fail after
|
||||
;; 2030-12-31. See <https://bugs.gnu.org/34351> for details.
|
||||
"main.mysqldump"))
|
||||
|
@ -1077,12 +1107,12 @@ Language.")
|
|||
(("\\$basedir/share/mysql")
|
||||
(string-append lib "/share/mysql")))
|
||||
|
||||
;; Remove unneeded files for testing.
|
||||
(with-directory-excursion lib
|
||||
(for-each delete-file-recursively
|
||||
'("mysql-test" "sql-bench"))
|
||||
;; And static libraries.
|
||||
;; Remove tests.
|
||||
(delete-file-recursively "mysql-test")
|
||||
;; Remove static libraries.
|
||||
(for-each delete-file (find-files "lib" "\\.a$")))
|
||||
|
||||
(with-directory-excursion out
|
||||
(delete-file "share/man/man1/mysql-test-run.pl.1")
|
||||
;; Delete huge and unnecessary executables.
|
||||
|
@ -1158,21 +1188,26 @@ developed in C/C++ to MariaDB and MySQL databases.")
|
|||
(license license:lgpl2.1+)))
|
||||
|
||||
;; Don't forget to update the other postgresql packages when upgrading this one.
|
||||
(define-public postgresql
|
||||
(define-public postgresql-13
|
||||
(package
|
||||
(name "postgresql")
|
||||
(version "10.13")
|
||||
(version "13.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d"))
|
||||
"07z6zwr58dckaa97yl9ml240z83d1lhgaxw9aq49i8lsp21mqd0j"))
|
||||
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-uuid=e2fs" "--with-openssl")
|
||||
`(#:configure-flags '("--with-uuid=e2fs" "--with-openssl"
|
||||
;; PostgreSQL installs its own Makefile (should it?).
|
||||
;; Prevent it from retaining needless references to
|
||||
;; the build tools in order to save size.
|
||||
"MKDIR_P=mkdir -p" "INSTALL_BIN=install -c"
|
||||
"LD=ld" "TAR=tar")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-/bin/sh
|
||||
|
@ -1204,34 +1239,45 @@ TIMESTAMP. It also supports storage of binary large objects, including
|
|||
pictures, sounds, or video.")
|
||||
(license (license:x11-style "file://COPYRIGHT"))))
|
||||
|
||||
(define-public postgresql-10 postgresql)
|
||||
|
||||
(define-public postgresql-11
|
||||
(package
|
||||
(inherit postgresql)
|
||||
(inherit postgresql-13)
|
||||
(name "postgresql")
|
||||
(version "11.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(inherit (package-source postgresql-13))
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9"))))))
|
||||
|
||||
(define-public postgresql-10
|
||||
(package
|
||||
(inherit postgresql-11)
|
||||
(version "10.13")
|
||||
(source (origin
|
||||
(inherit (package-source postgresql-11))
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d"))))))
|
||||
|
||||
(define-public postgresql-9.6
|
||||
(package
|
||||
(inherit postgresql)
|
||||
(name "postgresql")
|
||||
(inherit postgresql-10)
|
||||
(version "9.6.16")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(inherit (package-source postgresql-10))
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w"))))))
|
||||
|
||||
(define-public postgresql postgresql-13)
|
||||
|
||||
(define-public python-pymysql
|
||||
(package
|
||||
(name "python-pymysql")
|
||||
|
@ -2117,19 +2163,43 @@ similar to BerkeleyDB, LevelDB, etc.")
|
|||
(define-public redis
|
||||
(package
|
||||
(name "redis")
|
||||
(version "5.0.7")
|
||||
(version "6.0.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.redis.io/releases/redis-"
|
||||
version".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0ax8sf3vw0yadr41kzc04917scrg5wir1d94zmbz00b8pzm79nv1"))))
|
||||
"1pc6gyiylrcazlc559dp5mxqj733pk9qabnirw4ry3k23kwdqayw"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Delete bundled jemalloc, as the package will use the libc one
|
||||
'(begin (delete-file-recursively "deps/jemalloc")
|
||||
#t))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("procps" ,procps) ; for tests
|
||||
("tcl" ,tcl))) ; for tests
|
||||
(arguments
|
||||
'(#:tests? #f ; tests related to master/slave and replication fail
|
||||
#:phases (modify-phases %standard-phases
|
||||
(delete 'configure))
|
||||
'(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)
|
||||
(add-after 'unpack 'use-correct-tclsh
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "runtest"
|
||||
(("^TCLSH=.*")
|
||||
(string-append "TCLSH="
|
||||
(assoc-ref inputs "tcl")
|
||||
"/bin/tclsh")))
|
||||
#t))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda _
|
||||
;; Disable failing tests
|
||||
(substitute* "tests/test_helper.tcl"
|
||||
((" integration/replication[^-]") "")
|
||||
((" integration/replication-4") "")
|
||||
((" integration/replication-psync") ""))
|
||||
#t)))
|
||||
#:make-flags `("CC=gcc"
|
||||
"MALLOC=libc"
|
||||
"LDFLAGS=-ldl"
|
||||
|
@ -2340,7 +2410,25 @@ database.")
|
|||
(chdir "libraries/liblmdb")
|
||||
(substitute* "Makefile"
|
||||
(("/usr/local") (assoc-ref outputs "out")))
|
||||
#t)))))
|
||||
#t))
|
||||
(add-after 'install 'create-pkg-config-file
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(mkdir-p (string-append out "/lib/pkgconfig"))
|
||||
(with-output-to-file (string-append out "/lib/pkgconfig/liblmdb.pc")
|
||||
(lambda _
|
||||
(format #t "prefix=~a~@
|
||||
exec_prefix=~a~@
|
||||
libdir=~a/lib~@
|
||||
includedir=~a/include~@
|
||||
~@
|
||||
Name: liblmdb~@
|
||||
Version: ~a~@
|
||||
Description: Lightning Memory-Mapped Database library~@
|
||||
Libs: -L${libdir} -llmdb~@
|
||||
Cflags: -I${includedir}~%"
|
||||
out out out out ,version)))
|
||||
#t))))))
|
||||
(home-page "https://symas.com/lmdb/")
|
||||
(synopsis "Lightning Memory-Mapped Database library")
|
||||
(description
|
||||
|
@ -3751,9 +3839,6 @@ implementation, along with tools for interoperability with pandas, NumPy, and
|
|||
other traditional Python scientific computing packages.")
|
||||
(license license:asl2.0)))
|
||||
|
||||
(define-public python2-pyarrow
|
||||
(package-with-python2 python-pyarrow))
|
||||
|
||||
(define-public python-crate
|
||||
(package
|
||||
(name "python-crate")
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
;;; Copyright © 2018 Meiyo Peng <meiyo.peng@gmail.com>
|
||||
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2020 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -24,13 +25,15 @@
|
|||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages build-tools) ;for meson-0.55
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu))
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system meson))
|
||||
|
||||
(define-public gdsl
|
||||
(package
|
||||
|
@ -280,6 +283,28 @@ complexity of an operation performed on the classical data structure and the
|
|||
equivalent succinct data structure are (most of the time) identical.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public tllist
|
||||
(package
|
||||
(name "tllist")
|
||||
(version "1.0.4")
|
||||
(home-page "https://codeberg.org/dnkl/tllist")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1a26vwb7ll6mv3h8rbafsdx4vic1f286hiqn8s359sw8b7yjkvzs"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:meson ,meson-0.55))
|
||||
(synopsis "Typed link list for C")
|
||||
(description
|
||||
"@code{tllist} is a @dfn{typed linked list} C header file only library
|
||||
implemented using pre-processor macros. It supports primitive data types as
|
||||
well as aggregated ones such as structs, enums and unions.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public libdivsufsort
|
||||
(package
|
||||
(name "libdivsufsort")
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
(define-public radicale
|
||||
(package
|
||||
(name "radicale")
|
||||
(version "3.0.4")
|
||||
(version "3.0.6")
|
||||
(source
|
||||
(origin
|
||||
;; There are no tests in the PyPI tarball.
|
||||
|
@ -49,7 +49,7 @@
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0hj9mmhrj32mzhxlnjcfijb7768cyjsn603nalp54clgb2gkmvw8"))))
|
||||
(base32 "1xlsvrmx6jhi71j6j8z9sli5vwxasivzjyqf8zq8r0l5p7350clf"))))
|
||||
(build-system python-build-system)
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest)
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2020 Lu hux <luhux@outlook.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -32,6 +33,7 @@
|
|||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix build-system copy)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
|
@ -39,7 +41,10 @@
|
|||
#:use-module (gnu packages emacs)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages fribidi)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
|
@ -211,14 +216,14 @@ It comes with a German-English dictionary with approximately 270,000 entries.")
|
|||
(define-public grammalecte
|
||||
(package
|
||||
(name "grammalecte")
|
||||
(version "1.12.2")
|
||||
(version "2.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch/zipbomb)
|
||||
(uri (string-append "https://grammalecte.net/grammalecte/zip/"
|
||||
"Grammalecte-fr-v" version ".zip"))
|
||||
(sha256
|
||||
(base32 "1qny2l5dr08pfj2dnzmvm5gmwqz8m879ryxfaw4k8dhaacrrrf62"))))
|
||||
(base32 "1mcpqglndcafiz9bnz69vjxncl5k98yzcy8pr8rmn738hgpzb53v"))))
|
||||
(build-system python-build-system)
|
||||
(home-page "https://grammalecte.net")
|
||||
(synopsis "French spelling and grammar checker")
|
||||
|
@ -304,15 +309,15 @@ translation engines from your terminal.")
|
|||
(define-public lttoolbox
|
||||
(package
|
||||
(name "lttoolbox")
|
||||
(version "3.5.1")
|
||||
(version "3.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://github.com/apertium/lttoolbox/releases/download/v"
|
||||
version "/lttoolbox-" version ".tar.gz"))
|
||||
version "/lttoolbox-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "14yyrkzyqlsrii3v3ggg4dyvwlrcqcqc0aprphz5781a44jsrcwz"))))
|
||||
(base32 "109l91ailish1a3vya5zmfg3kb67cwyzl36ndnh8f59chsbm6n2f"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -392,3 +397,55 @@ second on ordinary desktop computers) and, in spite of the errors, reasonably
|
|||
intelligible and easily correctable.")
|
||||
(license (list license:gpl2 ; main license
|
||||
license:expat)))) ; utf8/*
|
||||
|
||||
(define-public sdcv
|
||||
(package
|
||||
(name "sdcv")
|
||||
(version "0.5.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/Dushistov/sdcv/")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-DBUILD_TESTS=YES")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'build 'build-lang
|
||||
(lambda _
|
||||
(invoke "make" "lang")))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
(setenv "HOME" (getcwd))
|
||||
#t))
|
||||
(add-after 'unpack 'remove-jq-requirement
|
||||
(lambda _
|
||||
;; We don't want to bring in jq for one test.
|
||||
(substitute* "tests/t_json"
|
||||
(("jq") "echo"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("gettext" ,gettext-minimal)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("ncurses" ,ncurses)
|
||||
("readline" ,readline)
|
||||
("zlib" ,zlib)))
|
||||
;; If you use Guix to package and install dictionary data,
|
||||
;; you need this variable to load them.
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "STARDICT_DATA_DIR")
|
||||
(files '("share/stardict/dic")))))
|
||||
(home-page "https://dushistov.github.io/sdcv/")
|
||||
(synopsis "Console version of StarDict")
|
||||
(description "sdcv is simple text-based utility for work with dictionaries
|
||||
in StarDict's format.")
|
||||
(license license:gpl2+)))
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
(define-public diffoscope
|
||||
(package
|
||||
(name "diffoscope")
|
||||
(version "161")
|
||||
(version "162")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -81,7 +81,7 @@
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1c9afc0s8p2wh7pw7xclr8j06ma3fjk6r1dnfaf1gdfk05hdxi78"))))
|
||||
"02wjjbmdbyqpyizw384j50bc2ar4g5m40amz9q102gqbw6sflwbf"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases (modify-phases %standard-phases
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2021 Ryan Prior <rprior@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -21,9 +22,44 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
(define-public wyhash
|
||||
(package
|
||||
(name "wyhash")
|
||||
(version "5")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/wangyi-fudan/wyhash")
|
||||
(commit (string-append "wyhash_v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "03ljs5iw9zrm3bydwggjvpwrcwmsd75h3dv1j4am4hw3h22cjdjc"))))
|
||||
(build-system trivial-build-system) ;; source-only package
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
#:builder
|
||||
(begin
|
||||
(use-modules (guix build utils))
|
||||
(let* ((out (string-append (assoc-ref %outputs "out")))
|
||||
(include (string-append out "/include"))
|
||||
(doc (string-append out "/share/doc/" ,name "-" ,version))
|
||||
(source (assoc-ref %build-inputs "source")))
|
||||
(with-directory-excursion source
|
||||
(install-file "wyhash.h" include)
|
||||
(install-file "LICENSE" doc)
|
||||
(install-file "README.md" doc))
|
||||
#t))))
|
||||
(home-page "https://github.com/wangyi-fudan/wyhash")
|
||||
(synopsis "Embeddable hash function and random number generator")
|
||||
(description "This package provides a portable hash function and random
|
||||
number generator suitable for use in data structures. Provided by default in
|
||||
Zig, V, and Nim programming language standard libraries.")
|
||||
(license license:unlicense)))
|
||||
|
||||
(define-public xxhash
|
||||
(package
|
||||
(name "xxhash")
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2015 Mathieu Lirzin <mthl@gnu.org>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2016, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016, 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2016, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
|
||||
|
@ -89,6 +89,73 @@
|
|||
#:use-module (guix packages)
|
||||
#:use-module (guix utils))
|
||||
|
||||
(define-public bcache-tools
|
||||
;; The 1.1 release is a year old and missing new features & documentation.
|
||||
(let ((commit "096d205a9f1be8540cbc5a468c0da8203023de70")
|
||||
(revision "0"))
|
||||
(package
|
||||
(name "bcache-tools")
|
||||
(version (git-version "1.1" revision commit))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url (string-append "https://git.kernel.org/pub/scm/"
|
||||
"linux/kernel/git/colyli/bcache-tools.git"))
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0r0vwg4vacz5zgsafk360xn7gi2scy01c79mkmjrdyxjfij5z3iy"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; no test suite
|
||||
#:make-flags
|
||||
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
|
||||
(string-append "UDEVLIBDIR=" (assoc-ref %outputs "out")
|
||||
"/lib/udev")
|
||||
(string-append "DRACUTLIBDIR=" (assoc-ref %outputs "out")
|
||||
"/lib/dracut")
|
||||
(string-append "CC=" ,(cc-for-target)))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure) ; no configure script
|
||||
(add-before 'install 'fix-hard-coded-file-names
|
||||
(lambda _
|
||||
;; Some rules still hard-code /usr.
|
||||
(substitute* "Makefile"
|
||||
(("/usr") "${PREFIX}"))
|
||||
#t))
|
||||
(add-before 'install 'create-target-directories
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out")))
|
||||
(for-each (lambda (dir)
|
||||
(mkdir-p (string-append out dir)))
|
||||
(list "/lib/udev/rules.d"
|
||||
"/sbin"
|
||||
"/share/man/man8"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("util-linux:lib" ,util-linux "lib"))) ; libblkid
|
||||
(home-page "https://bcache.evilpiepirate.org")
|
||||
(synopsis "Tools for the Linux kernel block layer cache")
|
||||
(description
|
||||
"This package contains user-space utilities to create and inspect bcache
|
||||
partitions. It's rather minimal as bcache is designed to work well without
|
||||
configuration on any system.
|
||||
|
||||
Linux's @acronym{bcache, block layer cache} lets one or more fast block devices,
|
||||
such as flash-based @acronym{SSDs, solid state drives}, to act as a cache for
|
||||
one or more slower (and inexpensive) devices, such as hard disk drives or
|
||||
redundant storage arrays. In fact, bcache intends to be a superior alternative
|
||||
to battery-backed RAID controllers.
|
||||
|
||||
Bcache is designed around the performance characteristics of SSDs and tries to
|
||||
minimize write inflation. It's file-system agnostic and does both write-through
|
||||
and write-back caching.")
|
||||
(license license:gpl2))))
|
||||
|
||||
(define-public udevil
|
||||
(package
|
||||
(name "udevil")
|
||||
|
@ -692,7 +759,7 @@ passphrases.")
|
|||
(define-public ndctl
|
||||
(package
|
||||
(name "ndctl")
|
||||
(version "70.1")
|
||||
(version "71.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
|
@ -701,7 +768,7 @@ passphrases.")
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"09ymdibcr18vpmyf2n0xrnzgccfvr7iy3p2l5lbh7cgz7djyl5wq"))))
|
||||
"1vi61bm9wyawklswh9mj9zdp28ar7r97qckwnhgiyila73fb3jx2"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("asciidoc" ,asciidoc)
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 L p R n d n <guix@lprndn.info>
|
||||
;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -57,7 +58,7 @@
|
|||
(define-public sddm
|
||||
(package
|
||||
(name "sddm")
|
||||
(version "0.18.1")
|
||||
(version "0.19.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -66,7 +67,7 @@
|
|||
"sddm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh"))))
|
||||
"0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
|
|
|
@ -317,7 +317,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||
(package
|
||||
(name "bind")
|
||||
;; When updating, check whether isc-dhcp's bundled copy should be as well.
|
||||
(version "9.16.9")
|
||||
(version "9.16.10")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
|
@ -325,7 +325,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
|
|||
"/bind-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0nja60jxb8d2m5fi6xd55xjpfkzmxhjsmbxqphy6x91qsz295cmw"))))
|
||||
"1cv26gzbyk3ahidr1fip0pgj28s7l52cafdqpykfc1b2kh0zqixw"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs `("out" "utils"))
|
||||
(inputs
|
||||
|
@ -533,14 +533,14 @@ asynchronous fashion.")
|
|||
(define-public nsd
|
||||
(package
|
||||
(name "nsd")
|
||||
(version "4.3.3")
|
||||
(version "4.3.4")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0lgdiqnkfvy245h6kkiqic586qjwmg51lsfs86vlc0kwjwddiijz"))))
|
||||
(base32 "0l4ba80ihwg3s2ifhnkmk7rjabrcy5zw6sz4hn0vm9sif6lk9s1v"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
|
@ -603,14 +603,14 @@ to result in system-wide compromise.")
|
|||
(define-public unbound
|
||||
(package
|
||||
(name "unbound")
|
||||
(version "1.10.1")
|
||||
(version "1.13.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.unbound.net/downloads/unbound-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0dnmh9jjh2v274f0hl31bgv40pl77mmfgky8bkqr5kvi3b17fdmp"))))
|
||||
(base32 "18dj7migq6379hps59793457l81s3z7dll3y0fj6qcmhjlx08m59"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" "python"))
|
||||
(native-inputs
|
||||
|
@ -760,16 +760,16 @@ served by AS112. Stub and forward zones are supported.")
|
|||
(define-public yadifa
|
||||
(package
|
||||
(name "yadifa")
|
||||
(version "2.4.0")
|
||||
(version "2.4.1")
|
||||
(source
|
||||
(let ((build "9809"))
|
||||
(let ((build "9916"))
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "https://www.yadifa.eu/sites/default/files/releases/"
|
||||
"yadifa-" version "-" build ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "114a1y4pzzzq0s9hyn65nd4fg19xijsqpfhsd0wkvjndsazg63ky")))))
|
||||
(base32 "1m1j7q1f0682xig8qign5ms52igix8pd45fds7p5j285dvrfa4xd")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("which" ,which)))
|
||||
|
@ -807,7 +807,7 @@ Extensions} (DNSSEC).")
|
|||
(define-public knot
|
||||
(package
|
||||
(name "knot")
|
||||
(version "3.0.2")
|
||||
(version "3.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -816,7 +816,7 @@ Extensions} (DNSSEC).")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1cinzz8p86fzknnr2z6b49yqr4y05mmnr0l2q3lwzcfhc6dcl8di"))
|
||||
(base32 "0xzig9l91wj6x23mh75vw2r51ihrgx916c7wxvpcfnwrqsv4f3hy"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -937,15 +937,16 @@ synthesis, and on-the-fly re-configuration.")
|
|||
(define-public knot-resolver
|
||||
(package
|
||||
(name "knot-resolver")
|
||||
(version "5.1.3")
|
||||
(version "5.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://secure.nic.cz/files/knot-resolver/"
|
||||
"knot-resolver-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"12s5070nqqf599s1mb6rjas2as481rjf751qk5yrz6p34y885k90"))))
|
||||
"09jqy23q1pgj76y2qd1xfk72wwmypnyawm3span3gx00qi2bfdxa"))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "doc"))
|
||||
(arguments
|
||||
'(#:configure-flags '("-Ddoc=enabled")
|
||||
#:phases
|
||||
|
@ -960,6 +961,20 @@ synthesis, and on-the-fly re-configuration.")
|
|||
(add-after 'build 'build-doc
|
||||
(lambda _
|
||||
(invoke "ninja" "doc")))
|
||||
(add-after 'install 'move-doc
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Move the manual and the example configuration files to the
|
||||
;; "doc" output.
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(doc (assoc-ref outputs "doc")))
|
||||
(mkdir-p (string-append doc "/share/doc/knot-resolver"))
|
||||
(for-each
|
||||
(lambda (dir)
|
||||
(rename-file (string-append out "/share/" dir)
|
||||
(string-append doc "/share/" dir)))
|
||||
'("doc/knot-resolver/examples"
|
||||
"doc/knot-resolver/html"
|
||||
"info")))))
|
||||
(add-after 'install 'wrap-binary
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
|
@ -982,7 +997,8 @@ synthesis, and on-the-fly re-configuration.")
|
|||
("pkg-config" ,pkg-config)
|
||||
("python-breathe" ,python-breathe)
|
||||
("python-sphinx" ,python-sphinx)
|
||||
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
|
||||
("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
|
||||
("texinfo" ,texinfo)))
|
||||
(inputs
|
||||
`(("fstrm" ,fstrm)
|
||||
("gnutls" ,gnutls)
|
||||
|
@ -991,7 +1007,8 @@ synthesis, and on-the-fly re-configuration.")
|
|||
("lmdb" ,lmdb)
|
||||
("luajit" ,luajit)
|
||||
;; TODO: Add optional lua modules: basexx and psl.
|
||||
("lua-bitop" ,lua5.1-bitop)))
|
||||
("lua-bitop" ,lua5.1-bitop)
|
||||
("nghttp2" ,nghttp2 "lib")))
|
||||
(home-page "https://www.knot-resolver.cz/")
|
||||
(synopsis "Caching validating DNS resolver")
|
||||
(description
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -29,6 +30,7 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix build-system python)
|
||||
|
@ -149,7 +151,7 @@
|
|||
("python2-css-parser" ,python2-css-parser)
|
||||
("python2-dateutil" ,python2-dateutil)
|
||||
("python2-dbus" ,python2-dbus)
|
||||
("python2-dnspython" ,python2-dnspython)
|
||||
("python2-dnspython" ,python2-dnspython-1.16)
|
||||
("python2-dukpy" ,python2-dukpy)
|
||||
("python2-feedparser" ,python2-feedparser)
|
||||
("python2-html2text" ,python2-html2text)
|
||||
|
@ -314,6 +316,32 @@ e-books for convenient reading.")
|
|||
license:silofl1.1
|
||||
license:cc-by-sa3.0))))
|
||||
|
||||
(define-public ebook-tools
|
||||
(package
|
||||
(name "ebook-tools")
|
||||
(version "0.2.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/ebook-tools/ebook-tools/"
|
||||
version "/ebook-tools-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"))))
|
||||
(arguments
|
||||
`(#:tests? #f)) ; No 'test' target
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("libzip" ,libzip)
|
||||
("libxml2" ,libxml2)))
|
||||
(home-page "http://ebook-tools.sourceforge.net")
|
||||
(synopsis "Tools and library for dealing with various ebook file formats")
|
||||
(description "This package provides command-line tools and a library for
|
||||
accessing and converting various ebook file formats.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public liblinebreak
|
||||
(package
|
||||
(name "liblinebreak")
|
||||
|
@ -415,7 +443,7 @@ following formats:
|
|||
(define-public cozy
|
||||
(package
|
||||
(name "cozy")
|
||||
(version "0.7.6")
|
||||
(version "0.7.8")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -424,7 +452,7 @@ following formats:
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1pg0djhg4p32vxfwf6bfals31zf93m56fx1x4q5jhhdwmll7xl6w"))))
|
||||
(base32 "0z2wj9g32aa5g9pw81q49iv1smb6yvlv9zs0vrzbx6mw8cj3c5d2"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:glib-or-gtk? #t
|
||||
|
|
|
@ -273,7 +273,7 @@ easy.")
|
|||
(define-public snap
|
||||
(package
|
||||
(name "snap")
|
||||
(version "6.3.3")
|
||||
(version "6.5.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -282,7 +282,7 @@ easy.")
|
|||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0zlyk241s6sh5zaqrvfpg4lx7jdifajsdf6c9qhh77vxxh5gwzrc"))))
|
||||
(base32 "0sqd4ddkfc7f7gx02wffvwbqgfbhpkcgyv7v5rh3gx60jca02p4w"))))
|
||||
(build-system trivial-build-system)
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
|
@ -611,14 +611,14 @@ Portuguese, Spanish and Italian.")
|
|||
(define-public fet
|
||||
(package
|
||||
(name "fet")
|
||||
(version "5.48.0")
|
||||
(version "5.48.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.lalescu.ro/liviu/fet/download/"
|
||||
"fet-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "12bd53r841r8zsn3v1kzws2qar908p6g6mlnm50kmjkxramr63ga"))))
|
||||
(base32 "0k728l6zi0lkhzyipsb0f2jw53s4xicm7arp33ikhrvc4jlwcp4v"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -677,15 +677,15 @@ language and very flexible regarding to new or unknown keyboard layouts.")
|
|||
(define-public ktouch
|
||||
(package
|
||||
(name "ktouch")
|
||||
(version "19.08.3")
|
||||
(version "20.12.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kde/stable/applications/"
|
||||
(uri (string-append "mirror://kde/stable/release-service/"
|
||||
version "/src/ktouch-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0dqxb3xsjc2rwc9779l5fnr4crhq51bc8ln4azbgnnkzldvq6a4a"))))
|
||||
"1s8pcwakx94aygfyjmyps5b43j4kv6dmfw7n12japcka2yfp9bi2"))))
|
||||
(build-system qt-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -32,6 +33,7 @@
|
|||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages embedded)
|
||||
#:use-module (gnu packages gawk)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages graphviz)
|
||||
|
@ -39,8 +41,7 @@
|
|||
#:use-module (gnu packages libusb)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages sdcc))
|
||||
#:use-module (gnu packages qt))
|
||||
|
||||
(define-public libserialport
|
||||
(package
|
||||
|
@ -239,15 +240,16 @@ format support.")
|
|||
(define-public pulseview
|
||||
(package
|
||||
(name "pulseview")
|
||||
(version "0.4.1")
|
||||
(version "0.4.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://sigrok.org/download/source/pulseview/pulseview-"
|
||||
"https://sigrok.org/download/source/pulseview/pulseview-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"))))
|
||||
"1jxbpz1h3m1mgrxw74rnihj8vawgqdpf6c33cqqbyd8v7rxgfhph"))
|
||||
(patches (search-patches "pulseview-qt515-compat.patch"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-DENABLE_TESTS=y")
|
||||
|
@ -262,7 +264,8 @@ format support.")
|
|||
(rmdir "doc"))
|
||||
#t))))))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("qttools" ,qttools)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("glib" ,glib)
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Mark Wielaard <mark@klomp.org>
|
||||
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
||||
;;;
|
||||
|
@ -46,14 +46,14 @@
|
|||
(define-public elfutils
|
||||
(package
|
||||
(name "elfutils")
|
||||
(version "0.176")
|
||||
(version "0.182")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://sourceware.org/elfutils/ftp/"
|
||||
version "/elfutils-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"08qhrl4g6qqr4ga46jhh78y56a47p3msa5b2x1qhzbxhf71lfmzb"))
|
||||
"0n48dcadjy0wiilddzav2zaxdi30qkkfp160gw5mycyz9s8hdi7c"))
|
||||
(patches (search-patches "elfutils-tests-ptrace.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
|
||||
|
@ -68,7 +68,16 @@
|
|||
;; know where to find each other.
|
||||
`(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
|
||||
(assoc-ref %outputs "out")
|
||||
"/lib"))
|
||||
"/lib")
|
||||
;; TODO: Enable the debuginfo server. It
|
||||
;; increases the closure size significantly
|
||||
;; and presents bootstrapping problems, so
|
||||
;; we disable it for now. See
|
||||
;; https://issues.guix.gnu.org/38803 and
|
||||
;; https://sourceware.org/bugzilla/show_bug.cgi?id=25509
|
||||
;; for more information.
|
||||
"--disable-libdebuginfod"
|
||||
"--disable-debuginfod")
|
||||
|
||||
;; Disable tests on MIPS and PowerPC (without changing
|
||||
;; the arguments list on other systems).
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -314,7 +314,7 @@ languages.")
|
|||
(files '("share/info"))))))))
|
||||
|
||||
(define-public emacs-next-pgtk
|
||||
(let ((commit "3df4ca451d41a5f1036713277ef55ca9734c6fa7")
|
||||
(let ((commit "d46a223d8595e8edb67c6361033625797503cacf")
|
||||
(revision "0"))
|
||||
(package/inherit emacs-next
|
||||
(name "emacs-next-pgtk")
|
||||
|
@ -323,12 +323,12 @@ languages.")
|
|||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/masm11/emacs")
|
||||
(url "https://git.savannah.gnu.org/git/emacs.git/")
|
||||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1c677c97b9avhlzysg09cvf6bd69iz41ggppnszw8chhphk3knfc"))))
|
||||
"1fhkgqsdpy3qkf8wyjvavnfyh8byxh0h80n0448rkg9k0lrkl4wf"))))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments emacs-next)
|
||||
((#:configure-flags flags ''())
|
||||
|
|
|
@ -34,12 +34,14 @@
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system python)
|
||||
#:use-module (guix build-system trivial)
|
||||
#:use-module ((guix build utils) #:select (alist-replace))
|
||||
#:use-module ((guix build utils) #:select (alist-replace delete-file-recursively))
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages admin)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module ((gnu packages base) #:prefix base:)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages cross-base)
|
||||
#:use-module (gnu packages dejagnu)
|
||||
#:use-module (gnu packages flex)
|
||||
|
@ -554,7 +556,8 @@ language.")
|
|||
("libusb-compat" ,libusb-compat)))
|
||||
(arguments
|
||||
'(#:configure-flags
|
||||
(append (list "--disable-werror"
|
||||
(append (list "LIBS=-lutil"
|
||||
"--disable-werror"
|
||||
"--enable-sysfsgpio"
|
||||
"--disable-internal-jimtcl"
|
||||
"--disable-internal-libjaylink")
|
||||
|
@ -1175,14 +1178,14 @@ SPI, I2C, JTAG.")
|
|||
(define-public fc-host-tools
|
||||
(package
|
||||
(name "fc-host-tools")
|
||||
(version "13")
|
||||
(version "14")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "ftp://ftp.freecalypso.org/pub/GSM/"
|
||||
"FreeCalypso/fc-host-tools-r" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0bpxz4y0z3hmlirzvfwq0k45yzn9fzgqs9r1fpkrhn48gr2zrpa8"))))
|
||||
"09ccd76khfvlx4dwi9dhrzl5mm68402mlych0g7f9ncfr5jzyf26"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ; No tests exist.
|
||||
|
@ -1419,3 +1422,101 @@ handling communication with eBUS devices connected to a 2-wire bus system
|
|||
(\"energy bus\" used by numerous heating systems).")
|
||||
(home-page "https://ebusd.eu/")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public ucsim
|
||||
(package
|
||||
(name "ucsim")
|
||||
(version "0.6-pre67")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"http://mazsola.iit.uni-miskolc.hu/ucsim/download/unix/"
|
||||
"devel/ucsim-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0aahj9pbfjphjrm4hgs9pfmp6d5aikaq4yvxlrvhywjinnnf0qp1"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--enable-avr-port"
|
||||
"--enable-m6809-port"
|
||||
"--enable-p1516-port"
|
||||
"--enable-st7-port")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-makefiles
|
||||
(lambda _
|
||||
(substitute* (find-files "." "(\\.mk$|\\.in$)")
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t))
|
||||
(add-after 'install 'remove-empty-directory
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(delete-file-recursively
|
||||
(string-append (assoc-ref outputs "out") "/share/man"))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
("flex" ,flex)))
|
||||
(home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/")
|
||||
(synopsis "Simulators for various microcontroller families")
|
||||
(description "μCsim is a collection of software simulators for
|
||||
microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 68HC08 and
|
||||
6809; P1516; Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8;
|
||||
and Zilog Z80 families, plus many of their variants.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public sdcc
|
||||
(package
|
||||
(name "sdcc")
|
||||
(version "4.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"mirror://sourceforge/sdcc/sdcc"
|
||||
"/" version "/sdcc-src-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove non-free source files
|
||||
(delete-file-recursively "device/non-free")
|
||||
;; Remove bundled μCsim source
|
||||
(delete-file-recursively "sim")
|
||||
#t))
|
||||
(patches (search-patches "sdcc-disable-non-free-code.patch"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
("boost" ,boost)
|
||||
("flex" ,flex)
|
||||
("python-2" ,python-2)
|
||||
("texinfo" ,texinfo)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(;; GPUTILS is required for the PIC ports, but the licensing status of
|
||||
;; some of the files contained in its distribution is unclear (see
|
||||
;; https://issues.guix.gnu.org/44557). For this reason it is not yet
|
||||
;; available as a package in Guix.
|
||||
#:configure-flags
|
||||
'("--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-makefiles
|
||||
(lambda _
|
||||
(substitute* (find-files "." "(\\.mk$|\\.in$)")
|
||||
(("/bin/sh") (which "sh")))
|
||||
#t)))))
|
||||
(home-page "http://sdcc.sourceforge.net")
|
||||
(synopsis "C compiler suite for 8-bit microcontrollers")
|
||||
(description "SDCC is a retargetable, optimizing Standard C compiler suite
|
||||
that targets 8-bit microcontrollers in the Intel MCS-51 (8051); Motorola
|
||||
68HC08; Padauk PDK13, PDK14 and PDK15; STMicroelectronics STM8; and Zilog Z80
|
||||
families, plus many of their variants.")
|
||||
(license (list license:gpl2+
|
||||
license:gpl3+
|
||||
license:lgpl2.0+
|
||||
license:lgpl2.1+
|
||||
license:lgpl3+
|
||||
license:public-domain
|
||||
license:zlib))))
|
||||
|
|
|
@ -7,11 +7,12 @@
|
|||
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||
;;; Copyright © 2019 David Wilson <david@daviwil.com>
|
||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||
;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -39,6 +40,7 @@
|
|||
#:use-module (gnu packages algebra)
|
||||
#:use-module (gnu packages assembly)
|
||||
#:use-module (gnu packages audio)
|
||||
#:use-module (gnu packages autogen)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages boost)
|
||||
|
@ -1330,7 +1332,7 @@ multi-system game/emulator system.")
|
|||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.scummvm.org/frs/scummvm/" version
|
||||
(uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
|
||||
"/scummvm-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "11vknasm5dna2vqr6gk343qynh7nhsq3kf60zayarn1vb5z6as8l"))))
|
||||
|
@ -1380,10 +1382,177 @@ just replaces the executables shipped with the games, allowing you to
|
|||
play them on systems for which they were never designed!")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public libticables2
|
||||
(package
|
||||
(name "libticables2")
|
||||
(version "1.3.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
"07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "--enable-libusb10")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda* (#:key source #:allow-other-keys)
|
||||
(invoke "tar" "xvkf" source)
|
||||
(invoke "tar" "xvkf"
|
||||
(string-append "tilibs2/libticables2-"
|
||||
,version ".tar.bz2"))
|
||||
(chdir (string-append "libticables2-" ,version))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("autogen" ,autogen)
|
||||
("automake" ,automake)
|
||||
("gettext" ,gnu-gettext)
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("libusb" ,libusb)))
|
||||
(synopsis "Link cable library for TI calculators")
|
||||
(description
|
||||
"This package contains libticables, a library for operations on
|
||||
@acronym{TI, Texas Instruments} calculator link cables.
|
||||
|
||||
This is a part of the TiLP project.")
|
||||
(home-page "http://lpg.ticalc.org/prj_tilp/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public libticonv
|
||||
(package
|
||||
(name "libticonv")
|
||||
(version "1.1.5")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
"07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; build fails with out --enable-iconv (...?)
|
||||
`(#:configure-flags (list "--enable-iconv")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda* (#:key source #:allow-other-keys)
|
||||
(invoke "tar" "xvkf" source)
|
||||
(invoke "tar" "xvkf"
|
||||
(string-append "tilibs2/libticonv-"
|
||||
,version ".tar.bz2"))
|
||||
(chdir (string-append "libticonv-" ,version))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glib" ,glib)))
|
||||
(synopsis "Character conversion library for TI calculators")
|
||||
(description
|
||||
"This package contains libticonv, a library to support working with
|
||||
@acronym{TI, Texas Instruments} calculator charsets.
|
||||
|
||||
This is a part of the TiLP project.")
|
||||
(home-page "http://lpg.ticalc.org/prj_tilp/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public libtifiles2
|
||||
(package
|
||||
(name "libtifiles2")
|
||||
(version "1.1.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
"07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda* (#:key source #:allow-other-keys)
|
||||
(invoke "tar" "xvkf" source)
|
||||
(invoke "tar" "xvkf"
|
||||
(string-append "tilibs2/libtifiles2-"
|
||||
,version ".tar.bz2"))
|
||||
(chdir (string-append "libtifiles2-" ,version))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("gettext" ,gnu-gettext)
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("libarchive" ,libarchive)
|
||||
("libticonv" ,libticonv)))
|
||||
(synopsis "File functions library for TI calculators")
|
||||
(description
|
||||
"This package contains libticonv, a library to support working with
|
||||
@acronym{TI, Texas Instruments} calculator files.
|
||||
|
||||
This is a part of the TiLP project.")
|
||||
(home-page "http://lpg.ticalc.org/prj_tilp/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public libticalcs2
|
||||
(package
|
||||
(name "libticalcs2")
|
||||
(version "1.1.9")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
|
||||
(sha256
|
||||
(base32
|
||||
"07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda* (#:key source #:allow-other-keys)
|
||||
(invoke "tar" "xvkf" source)
|
||||
(invoke "tar" "xvkf"
|
||||
(string-append "tilibs2/libticalcs2-"
|
||||
,version ".tar.bz2"))
|
||||
(chdir (string-append "libticalcs2-" ,version))
|
||||
#t)))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
("automake" ,automake)
|
||||
("gettext" ,gnu-gettext)
|
||||
("libtool" ,libtool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("libarchive" ,libarchive)
|
||||
("libticables2" ,libticables2)
|
||||
("libticonv" ,libticonv)
|
||||
("libtifiles2" ,libtifiles2)))
|
||||
(synopsis "Support library for TI calculators")
|
||||
(description
|
||||
"This project aims to develop a multi-platform linking program for use
|
||||
with all @acronym{TI, Texas Instruments} graphing calculators (TI73 to
|
||||
V200PLT).
|
||||
|
||||
This is a part of the TiLP project.")
|
||||
(home-page "http://lpg.ticalc.org/prj_tilp/")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public mame
|
||||
(package
|
||||
(name "mame")
|
||||
(version "0.226")
|
||||
(version "0.227")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1392,7 +1561,7 @@ play them on systems for which they were never designed!")
|
|||
(commit (apply string-append "mame" (string-split version #\.)))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1yfns42rk1l0qprj5ksj9fqsgqpa23xnzxf29r4434p4n18bb77v"))
|
||||
(base32 "0p7xhsahmkr5hh3j6hc1mpgi5z4navy77v4k35i0sgpdv1ax4y2l"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Remove bundled libraries.
|
||||
|
|
|
@ -79,7 +79,7 @@ dictionaries.")
|
|||
(define-public enchant
|
||||
(package
|
||||
(name "enchant")
|
||||
(version "2.2.13")
|
||||
(version "2.2.15")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/AbiWord/enchant/releases"
|
||||
|
@ -87,7 +87,7 @@ dictionaries.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"084aqsrkzz2c1ls47p759d9bsi26d0m6wq9901k37483g46zkfga"))))
|
||||
"00vcykbb7lxh51prvmsb62a06q18a6rlk9ba5a7g45c1awaj43rv"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-static"
|
||||
|
|
|
@ -67,6 +67,7 @@
|
|||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages dejagnu)
|
||||
#:use-module (gnu packages digest)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages fontutils)
|
||||
|
@ -102,6 +103,7 @@
|
|||
#:use-module (gnu packages pcre)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pretty-print)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages qt)
|
||||
|
@ -272,14 +274,14 @@ utilities.")
|
|||
(package
|
||||
(inherit geda-gaf)
|
||||
(name "lepton-eda")
|
||||
(version "1.9.11-20200604")
|
||||
(version "1.9.13-20201211")
|
||||
(home-page "https://github.com/lepton-eda/lepton-eda")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference (url home-page) (commit version)))
|
||||
(sha256
|
||||
(base32
|
||||
"091y8h7wcr9smwhb1wf12sj27n5jrannbj3y6qq3q2gwiifiz8sd"))
|
||||
"0xfx6d0pyfrxr1c0nm4pbmb716hng78rgizaa6vsas9347n4kk1n"))
|
||||
(file-name (git-file-name name version))))
|
||||
(native-inputs
|
||||
`(("autoconf" ,autoconf)
|
||||
|
@ -293,56 +295,93 @@ utilities.")
|
|||
,@(package-native-inputs geda-gaf)))
|
||||
(inputs
|
||||
`(("glib" ,glib)
|
||||
("gtk" ,gtk+-2)
|
||||
("gtk" ,gtk+)
|
||||
("gtksheet" ,gtksheet)
|
||||
("guile" ,guile-2.2)
|
||||
("shared-mime-info" ,shared-mime-info)
|
||||
("m4" ,m4)
|
||||
("pcb" ,pcb)))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments geda-gaf)
|
||||
((#:configure-flags flags ''())
|
||||
;; When running "make", the POT files are built with the build time as
|
||||
;; their "POT-Creation-Date". Later on, "make" notices that .pot
|
||||
;; files were updated and goes on to run "msgmerge"; as a result, the
|
||||
;; non-deterministic POT-Creation-Date finds its way into .po files,
|
||||
;; and then in .gmo files. To avoid that, simply make sure 'msgmerge'
|
||||
;; never runs. See <https://bugs.debian.org/792687>.
|
||||
`(cons "ac_cv_path_MSGMERGE=true" ,flags))
|
||||
((#:phases phases '%standard-phases)
|
||||
`(modify-phases %standard-phases
|
||||
(add-before 'bootstrap 'prepare
|
||||
(lambda _
|
||||
;; Some of the scripts there are invoked by autogen.sh.
|
||||
(for-each patch-shebang (find-files "build-tools"))
|
||||
`(#:configure-flags
|
||||
(let ((pcb (assoc-ref %build-inputs "pcb")))
|
||||
;; When running "make", the POT files are built with the build time as
|
||||
;; their "POT-Creation-Date". Later on, "make" notices that .pot
|
||||
;; files were updated and goes on to run "msgmerge"; as a result, the
|
||||
;; non-deterministic POT-Creation-Date finds its way into .po files,
|
||||
;; and then in .gmo files. To avoid that, simply make sure 'msgmerge'
|
||||
;; never runs. See <https://bugs.debian.org/792687>.
|
||||
(list "ac_cv_path_MSGMERGE=true"
|
||||
"--with-gtk3"
|
||||
(string-append "--with-pcb-datadir=" pcb "/share")
|
||||
(string-append "--with-pcb-lib-path="
|
||||
pcb "/share/pcb/pcblib-newlib:"
|
||||
pcb "/share/pcb/newlib")))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'build 'fix-dynamic-link
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(substitute* "libleptongui/scheme/schematic/ffi.scm.in"
|
||||
(("@LIBLEPTONGUI@")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/lib/libleptongui.so")))
|
||||
(substitute* '("libleptongui/scheme/schematic/ffi/gtk.scm.in"
|
||||
"libleptonattrib/lepton-attrib.scm")
|
||||
(("@LIBGTK@")
|
||||
(string-append (assoc-ref inputs "gtk")
|
||||
"/lib/libgtk-3.so")))
|
||||
(substitute* "liblepton/scheme/lepton/ffi.scm.in"
|
||||
(("@LIBLEPTON@")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/lib/liblepton.so")))
|
||||
(substitute* "libleptonattrib/lepton-attrib.scm"
|
||||
(("@LIBLEPTONATTRIB@")
|
||||
(string-append (assoc-ref outputs "out")
|
||||
"/lib/libleptonattrib.so")))
|
||||
(substitute* "liblepton/scheme/lepton/log.scm.in"
|
||||
(("@LIBGLIB@")
|
||||
(string-append (assoc-ref inputs "glib")
|
||||
"/lib/libglib-2.0.so")))
|
||||
|
||||
;; Make sure 'msgmerge' can modify the PO files.
|
||||
(for-each (lambda (po)
|
||||
(chmod po #o666))
|
||||
(find-files "." "\\.po$"))
|
||||
;; For finding libraries when running tests before installation.
|
||||
(setenv "LIBLEPTONGUI"
|
||||
(string-append (getcwd)
|
||||
"/libleptongui/src/.libs/libleptongui.so"))
|
||||
(setenv "LIBLEPTON"
|
||||
(string-append (getcwd)
|
||||
"/libleptongui/src/.libs/liblepton.so"))
|
||||
(setenv "LD_LIBRARY_PATH"
|
||||
(string-append (getcwd) "/libleptonattrib/src/.libs/:"
|
||||
(getenv "LIBRARY_PATH")))
|
||||
#t))
|
||||
(add-before 'bootstrap 'prepare
|
||||
(lambda _
|
||||
;; Some of the scripts there are invoked by autogen.sh.
|
||||
(for-each patch-shebang (find-files "build-tools"))
|
||||
|
||||
;; This would normally be created by invoking 'git', but it
|
||||
;; doesn't work here.
|
||||
(call-with-output-file "version.h"
|
||||
(lambda (port)
|
||||
(format port "#define PACKAGE_DATE_VERSION \"~a\"~%"
|
||||
,(string-drop version
|
||||
(+ 1 (string-index version #\-))))
|
||||
(format port "#define PACKAGE_DOTTED_VERSION \"~a\"~%"
|
||||
,(string-take version
|
||||
(string-index version #\-)))
|
||||
(format port "#define PACKAGE_GIT_COMMIT \"cabbag3\"~%")))
|
||||
#t))
|
||||
(add-after 'install 'compile-scheme-files
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(invoke "make" "precompile")
|
||||
(for-each (lambda (program)
|
||||
(wrap-program program
|
||||
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
|
||||
(,(string-append (assoc-ref outputs "out")
|
||||
"/share/lepton-eda/ccache/")))))
|
||||
(find-files (string-append (assoc-ref outputs "out") "/bin")
|
||||
".*"))
|
||||
#t))))))
|
||||
;; Make sure 'msgmerge' can modify the PO files.
|
||||
(for-each (lambda (po)
|
||||
(chmod po #o666))
|
||||
(find-files "." "\\.po$"))
|
||||
|
||||
;; This would normally be created by invoking 'git', but it
|
||||
;; doesn't work here.
|
||||
(call-with-output-file "version.h"
|
||||
(lambda (port)
|
||||
(format port "#define PACKAGE_DATE_VERSION \"~a\"~%"
|
||||
,(string-drop version
|
||||
(+ 1 (string-index version #\-))))
|
||||
(format port "#define PACKAGE_DOTTED_VERSION \"~a\"~%"
|
||||
,(string-take version
|
||||
(string-index version #\-)))
|
||||
(format port "#define PACKAGE_GIT_COMMIT \"cabbag3\"~%")))
|
||||
#t))
|
||||
(add-after 'install 'compile-scheme-files
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(unsetenv "LIBLEPTONGUI")
|
||||
(unsetenv "LIBLEPTON")
|
||||
(unsetenv "LD_LIBRARY_PATH")
|
||||
(invoke "make" "precompile")
|
||||
#t)))))
|
||||
(description
|
||||
"Lepton EDA ia an @dfn{electronic design automation} (EDA) tool set
|
||||
forked from gEDA/gaf in late 2016. EDA tools are used for electrical circuit
|
||||
|
@ -849,7 +888,6 @@ The viewer can be used interactively with a REPL (for example Geiser in
|
|||
Emacs).")
|
||||
(license license:gpl3+))))
|
||||
|
||||
;; TODO Add doc https://gitlab.com/kicad/services/kicad-doc/-/tree/master
|
||||
(define-public kicad
|
||||
(package
|
||||
(name "kicad")
|
||||
|
@ -899,6 +937,9 @@ Emacs).")
|
|||
#t)))))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "KICAD") ; to find kicad-doc
|
||||
(files '("")))
|
||||
(search-path-specification
|
||||
(variable "KICAD_TEMPLATE_DIR")
|
||||
(files '("share/kicad/template")))
|
||||
(search-path-specification
|
||||
|
@ -970,6 +1011,46 @@ translations for KiCad.")
|
|||
(define-public kicad-i18l
|
||||
(deprecated-package "kicad-i18l" kicad-i18n))
|
||||
|
||||
(define-public kicad-doc
|
||||
(package
|
||||
(name "kicad-doc")
|
||||
(version "5.1.6")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://gitlab.com/kicad/services/kicad-doc.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"03kvss8a0xrjnfvkwymm0vfd7rn9ix7i926xdzz9jg9iycrjfj3g"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags (list "-DBUILD_FORMATS=html")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'build)
|
||||
(add-before 'install 'set-perl-env
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(setenv "PERL5LIB"
|
||||
(string-append (assoc-ref inputs "perl-unicode-linebreak")
|
||||
"/lib/perl5/site_perl" ":"
|
||||
(getenv "PERL5LIB")))
|
||||
#t))
|
||||
(delete 'check))))
|
||||
(native-inputs
|
||||
`(("asciidoc" ,asciidoc)
|
||||
("gettext" ,gettext-minimal)
|
||||
("git" ,git-minimal)
|
||||
("perl" ,perl)
|
||||
("perl-unicode-linebreak" ,perl-unicode-linebreak)
|
||||
("po4a" ,po4a)
|
||||
("source-highlight" ,source-highlight)))
|
||||
(home-page "https://kicad.org")
|
||||
(synopsis "KiCad official documentation")
|
||||
(description "This repository contains the official KiCad documentation.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public kicad-symbols
|
||||
(package
|
||||
(name "kicad-symbols")
|
||||
|
@ -1077,7 +1158,7 @@ the 'showing the effect of'-style of operation.")
|
|||
(define-public volk
|
||||
(package
|
||||
(name "volk")
|
||||
(version "2.4.0")
|
||||
(version "2.4.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -1087,7 +1168,7 @@ the 'showing the effect of'-style of operation.")
|
|||
(recursive? #t))) ; for cpu_features git submodule
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "14y0988r5qi1h3yvkivx5ihccn8r15910lq30r8iy71ih190r5m9"))))
|
||||
(base32 "1mkqiw0i2fbbsk46zvk8yv5swl7ifhq6y1dlfphq8dsmkvxckqby"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
|
@ -1133,22 +1214,23 @@ use on a given system.")
|
|||
(define-public libredwg
|
||||
(package
|
||||
(name "libredwg")
|
||||
(version "0.11")
|
||||
(version "0.11.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/libredwg/libredwg-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1vd7ii32k5447z7k4w9s005hv1ffpj6dyf1w40x6c53qksrblny2"))))
|
||||
(base32 "1xx6y6ckm4mzqln8y8lqf5frcn2b32ypc0d0h9dzpz6363zh7pdn"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--disable-bindings")))
|
||||
(native-inputs
|
||||
`(("libxml2" ,libxml2)
|
||||
("parallel" ,parallel)
|
||||
("perl" ,perl)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python" ,python)
|
||||
("python" ,python-wrapper)
|
||||
("python-libxml2" ,python-libxml2)))
|
||||
(inputs
|
||||
`(("pcre2" ,pcre2)))
|
||||
|
@ -2432,101 +2514,110 @@ full programmatic control over your models.")
|
|||
(license license:gpl2+)))
|
||||
|
||||
(define-public freecad
|
||||
(package
|
||||
(name "freecad")
|
||||
(version "0.18.4")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/FreeCAD/FreeCAD")
|
||||
(commit version)))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Fix build with Python 3.8, see
|
||||
;; <https://tracker.freecadweb.org/view.php?id=4143>.
|
||||
(substitute* "src/Base/swigpyrun.inl"
|
||||
(("PyObject \\*modules = interp->modules;")
|
||||
"PyObject *modules = PyEval_GetBuiltins();"))
|
||||
#t))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"170hk1kgrvsddrwykp24wyj0cha78zzmzbf50gn98x7ngqqs395s"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)
|
||||
("graphviz" ,graphviz)
|
||||
("qttools" ,qttools)
|
||||
("pkg-config" ,pkg-config)
|
||||
("swig" ,swig)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("coin3D" ,coin3D)
|
||||
("eigen" ,eigen)
|
||||
("freetype" ,freetype)
|
||||
("glew" ,glew)
|
||||
("hdf5" ,hdf5-1.10)
|
||||
("libarea" ,libarea)
|
||||
("libmedfile" ,libmedfile)
|
||||
("libspnav" ,libspnav)
|
||||
("libxi" ,libxi)
|
||||
("libxmu" ,libxmu)
|
||||
("openmpi" ,openmpi)
|
||||
("opencascade-occt" ,opencascade-occt)
|
||||
("python-matplotlib" ,python-matplotlib)
|
||||
("python-pyside-2" ,python-pyside-2)
|
||||
("python-pyside-2-tools" ,python-pyside-2-tools)
|
||||
("python-shiboken-2" ,python-shiboken-2)
|
||||
("python-wrapper" ,python-wrapper)
|
||||
("qtbase" ,qtbase)
|
||||
("qtsvg" ,qtsvg)
|
||||
("qtx11extras" ,qtx11extras)
|
||||
("qtxmlpatterns" ,qtxmlpatterns)
|
||||
;; qtwebkit is optional. We remove it currently, because it takes
|
||||
;; much time to compile and substitutes are often unavailable
|
||||
;;("qtwebkit" ,qtwebkit)
|
||||
("tbb" ,tbb)
|
||||
("vtk" ,vtk)
|
||||
("xerces-c" ,xerces-c)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:configure-flags
|
||||
(list
|
||||
"-DBUILD_QT5=ON"
|
||||
(string-append "-DCMAKE_INSTALL_LIBDIR="
|
||||
(assoc-ref %outputs "out") "/lib"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'restore-pythonpath
|
||||
(lambda _
|
||||
(substitute* "src/Main/MainGui.cpp"
|
||||
(("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
|
||||
#t))
|
||||
(add-after 'install 'wrap-pythonpath
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(wrap-program (string-append out "/bin/FreeCAD")
|
||||
(list "PYTHONPATH"
|
||||
'prefix (list (getenv "PYTHONPATH")))))
|
||||
#t)))))
|
||||
(home-page "https://www.freecadweb.org/")
|
||||
(synopsis "Your Own 3D Parametric Modeler")
|
||||
(description
|
||||
"FreeCAD is a general purpose feature-based, parametric 3D modeler for
|
||||
(let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858")
|
||||
(revision "1"))
|
||||
(package
|
||||
(name "freecad")
|
||||
(version (git-version "0.18.5" revision commit-ref))
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/FreeCAD/FreeCAD")
|
||||
(commit commit-ref)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)
|
||||
("graphviz" ,graphviz)
|
||||
("qttools" ,qttools)
|
||||
("pkg-config" ,pkg-config)
|
||||
("python-pyside-2-tools" ,python-pyside-2-tools)
|
||||
("swig" ,swig)))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
("coin3D" ,coin3D)
|
||||
("eigen" ,eigen)
|
||||
("freetype" ,freetype)
|
||||
("glew" ,glew)
|
||||
("hdf5" ,hdf5-1.10)
|
||||
("libarea" ,libarea)
|
||||
("libmedfile" ,libmedfile)
|
||||
("libspnav" ,libspnav)
|
||||
("libxi" ,libxi)
|
||||
("libxmu" ,libxmu)
|
||||
("openmpi" ,openmpi)
|
||||
("opencascade-occt" ,opencascade-occt)
|
||||
("python-matplotlib" ,python-matplotlib)
|
||||
("python-pyside-2" ,python-pyside-2)
|
||||
("python-shiboken-2" ,python-shiboken-2)
|
||||
("python-pivy" ,python-pivy)
|
||||
("python-wrapper" ,python-wrapper)
|
||||
("qtbase" ,qtbase)
|
||||
("qtsvg" ,qtsvg)
|
||||
("qtx11extras" ,qtx11extras)
|
||||
("qtxmlpatterns" ,qtxmlpatterns)
|
||||
("qtwebkit" ,qtwebkit)
|
||||
("tbb" ,tbb)
|
||||
("vtk" ,vtk)
|
||||
("xerces-c" ,xerces-c)
|
||||
("zlib" ,zlib)))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
#:configure-flags
|
||||
(list
|
||||
"-DBUILD_QT5=ON"
|
||||
(string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")
|
||||
(string-append "-DPYSIDE2UICBINARY="
|
||||
(assoc-ref %build-inputs "python-pyside-2-tools")
|
||||
"/bin/uic")
|
||||
(string-append "-DPYSIDE2RCCBINARY="
|
||||
(assoc-ref %build-inputs "python-pyside-2-tools")
|
||||
"/bin/rcc")
|
||||
"-DPYSIDE_LIBRARY=PySide2::pyside2"
|
||||
(string-append
|
||||
"-DPYSIDE_INCLUDE_DIR="
|
||||
(assoc-ref %build-inputs "python-pyside-2") "/include;"
|
||||
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
|
||||
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
|
||||
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"
|
||||
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
|
||||
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
|
||||
(string-append "-DSHIBOKEN_INCLUDE_DIR="
|
||||
(assoc-ref %build-inputs "python-shiboken-2")
|
||||
"/include/shiboken2"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'restore-pythonpath
|
||||
(lambda _
|
||||
(substitute* "src/Main/MainGui.cpp"
|
||||
(("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
|
||||
#t))
|
||||
(add-after 'install 'wrap-pythonpath
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(wrap-program (string-append out "/bin/FreeCAD")
|
||||
(list "PYTHONPATH"
|
||||
'prefix (list (getenv "PYTHONPATH")))))
|
||||
#t)))))
|
||||
(home-page "https://www.freecadweb.org/")
|
||||
(synopsis "Your Own 3D Parametric Modeler")
|
||||
(description
|
||||
"FreeCAD is a general purpose feature-based, parametric 3D modeler for
|
||||
CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and
|
||||
product design but also fits a wider range of uses in engineering, such as
|
||||
architecture or other engineering specialties. It is 100% Open Source (LGPL2+
|
||||
license) and extremely modular, allowing for very advanced extension and
|
||||
customization.")
|
||||
(license
|
||||
(list
|
||||
license:lgpl2.1+
|
||||
license:lgpl2.0+
|
||||
license:gpl3+
|
||||
license:bsd-3))))
|
||||
(license
|
||||
(list
|
||||
license:lgpl2.1+
|
||||
license:lgpl2.0+
|
||||
license:gpl3+
|
||||
license:bsd-3)))))
|
||||
|
||||
(define-public libmedfile
|
||||
(package
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
|
||||
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
||||
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
|
||||
|
@ -566,14 +566,14 @@ directories.
|
|||
(define-public evisum
|
||||
(package
|
||||
(name "evisum")
|
||||
(version "0.5.7")
|
||||
(version "0.5.8")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.enlightenment.org/rel/apps/"
|
||||
"evisum/evisum-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd"))))
|
||||
(base32 "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f)) ; no tests
|
||||
|
|
96
gnu/packages/esolangs.scm
Normal file
96
gnu/packages/esolangs.scm
Normal file
|
@ -0,0 +1,96 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 Hendursaga <hendursaga@yahoo.com>
|
||||
;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages esolangs)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages ncurses)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system copy)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages))
|
||||
|
||||
(define-public cfunge
|
||||
(package
|
||||
(name "cfunge")
|
||||
(version "0.9.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/VorpalBlade/cfunge")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"18ir0h10vxdb5jb57w5hjbgi8spjxg9x2148agadhhmbhsja02m7"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
;; The tests are not designed to be run and evaluated automatically.
|
||||
'(#:tests? #f))
|
||||
(inputs
|
||||
`(("ncurses" ,ncurses)))
|
||||
(home-page "https://github.com/VorpalBlade/cfunge")
|
||||
(synopsis "Fast conforming Befunge93/98/109 interpreter in C")
|
||||
(description "@command{cfunge} is a fast conforming Befunge93/98/109 interpreter
|
||||
written in C. It supports several @dfn{fingerprints} (opt-in language extensions
|
||||
identified by unique ID codes).")
|
||||
(license license:gpl3)))
|
||||
|
||||
(define-public shakespeare-spl
|
||||
(package
|
||||
(name "shakespeare-spl")
|
||||
(version "1.2.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://sourceforge/shakespearelang/spl-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1lxpfhv01kcwy4l4xgx7j765g8g0v74jns0cr908nfw55h5fy1hj"))
|
||||
(patches
|
||||
(search-patches
|
||||
"shakespeare-spl-fix-grammar.patch"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
`(#:imported-modules (,@%gnu-build-system-modules
|
||||
(guix build copy-build-system))
|
||||
#:modules ((guix build copy-build-system)
|
||||
((guix build gnu-build-system) #:prefix gnu:)
|
||||
(guix build utils))
|
||||
#:install-plan '(("spl/bin" "bin")
|
||||
("spl/lib" "lib")
|
||||
("spl/include" "include"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'install 'build
|
||||
(assoc-ref gnu:%standard-phases 'build)))))
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
("flex" ,flex)))
|
||||
(home-page "http://shakespearelang.sourceforge.net/")
|
||||
(synopsis "Write programs like Shakespearean plays")
|
||||
(description "Shakespeare is a programming language with the design goal
|
||||
of making programs read like plays. The characters in the play are variables.
|
||||
If you want to assign a character, let's say Juliet, a positive value, you put
|
||||
her and another character on the stage and let that character praise Juliet.")
|
||||
(license license:gpl2+)))
|
450
gnu/packages/fcitx5.scm
Normal file
450
gnu/packages/fcitx5.scm
Normal file
|
@ -0,0 +1,450 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (gnu packages fcitx5)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system copy)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (gnu packages boost)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages datastructures)
|
||||
#:use-module (gnu packages enchant)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages iso-codes)
|
||||
#:use-module (gnu packages kde-frameworks)
|
||||
#:use-module (gnu packages libevent)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages lua)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pretty-print)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages qt)
|
||||
#:use-module (gnu packages textutils)
|
||||
#:use-module (gnu packages unicode)
|
||||
#:use-module (gnu packages web)
|
||||
#:use-module (gnu packages xdisorg)
|
||||
#:use-module (gnu packages xml)
|
||||
#:use-module (gnu packages xorg))
|
||||
|
||||
(define-public xcb-imdkit
|
||||
(package
|
||||
(name "xcb-imdkit")
|
||||
(version "1.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "1qgbbp8y8ci7haz99vgbrgpjsbrwwyjianyhdvxcirnbm5bybvmz"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Remove bundled uthash.
|
||||
(delete-file-recursively "uthash")
|
||||
#t))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("uthash" ,uthash)
|
||||
("libxcb" ,libxcb)
|
||||
("xcb-util" ,xcb-util)
|
||||
("xcb-util-keysyms" ,xcb-util-keysyms)))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://github.com/fcitx/xcb-imdkit")
|
||||
(synopsis "Input method development support for XCB")
|
||||
(description "Xcb-imdkit is an implementation of xim protocol in XCB,
|
||||
comparing with the implementation of IMDkit with Xlib, and xim inside Xlib, it
|
||||
has less memory foot print, better performance, and safer on malformed
|
||||
client.")
|
||||
(license license:lgpl2.1)))
|
||||
|
||||
(define-public fcitx5
|
||||
(package
|
||||
(name "fcitx5")
|
||||
(version "5.0.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
|
||||
version "_dict.tar.xz"))
|
||||
(sha256
|
||||
(base32 "06zkb33m2rnhg385iy79n3r4svz5jbav74di61xqa3lhbv7534s3"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "-DCLDR_DIR="
|
||||
(assoc-ref %build-inputs "unicode-cldr-common")
|
||||
"/share/unicode/cldr"))))
|
||||
(inputs
|
||||
`(("cairo" ,cairo)
|
||||
("cairo-xcb" ,cairo-xcb)
|
||||
("dbus" ,dbus)
|
||||
("enchant" ,enchant)
|
||||
("expat" ,expat)
|
||||
("fmt" ,fmt)
|
||||
("gdk-pixbuf" ,gdk-pixbuf)
|
||||
("gettext" ,gettext-minimal)
|
||||
("glib" ,glib)
|
||||
("iso-codes" ,iso-codes)
|
||||
("json-c" ,json-c)
|
||||
("libevent" ,libevent)
|
||||
("libpthread-stubs" ,libpthread-stubs)
|
||||
("libuuid" ,util-linux "lib")
|
||||
("libx11" ,libx11)
|
||||
("libxcb" ,libxcb)
|
||||
("libxfixes" ,libxfixes)
|
||||
("libxinerama" ,libxinerama)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("libxkbfile" ,libxkbfile)
|
||||
("pango" ,pango)
|
||||
("unicode-cldr-common" ,unicode-cldr-common)
|
||||
("wayland" ,wayland)
|
||||
("wayland-protocols" ,wayland-protocols)
|
||||
("xcb-imdkit" ,xcb-imdkit)
|
||||
("xcb-util" ,xcb-util)
|
||||
("xcb-util-keysyms" ,xcb-util-keysyms)
|
||||
("xcb-util-wm" ,xcb-util-wm)
|
||||
("xkeyboard-config" ,xkeyboard-config)))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(native-search-paths
|
||||
(list (search-path-specification
|
||||
(variable "FCITX_ADDON_DIRS")
|
||||
(files '("lib/fcitx5")))))
|
||||
(home-page "https://github.com/fcitx/fcitx5")
|
||||
(synopsis "Input method framework")
|
||||
(description "Fcitx 5 is a generic input method framework.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public fcitx5-lua
|
||||
(package
|
||||
(name "fcitx5-lua")
|
||||
(version "5.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "177mj56j8yrl79hvk7bbrifvm137np23pwalv83ibgk4l51z92hf"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("fcitx5" ,fcitx5)
|
||||
("lua" ,lua)
|
||||
("gettext" ,gettext-minimal)
|
||||
("libpthread-stubs" ,libpthread-stubs)))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
(home-page "https://github.com/fcitx/fcitx5-lua")
|
||||
(synopsis "Lua support for Fcitx 5")
|
||||
(description "Fcitx5-lua allows writing Fcitx5 extension in Lua.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public libime
|
||||
(package
|
||||
(name "libime")
|
||||
(version "1.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
|
||||
version "_dict.tar.xz"))
|
||||
(sha256
|
||||
(base32 "006pncby7p6h3rnicckzjwi6jzsrqiqbj6p9bpic80lanlllgw31"))))
|
||||
(build-system cmake-build-system)
|
||||
(inputs
|
||||
`(("fcitx5" ,fcitx5)
|
||||
("boost" ,boost)))
|
||||
(native-inputs
|
||||
`(("gcc" ,gcc-9) ;for #include <filesystem> and ld support
|
||||
("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("python" ,python))) ;needed to run test
|
||||
(home-page "https://github.com/fcitx/libime")
|
||||
(synopsis "Library for implementing generic input method")
|
||||
(description "Libime is a library for implmenting various input methods
|
||||
editors.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public fcitx5-gtk
|
||||
(package
|
||||
(name "fcitx5-gtk")
|
||||
(version "5.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.fcitx-im.org/fcitx5"
|
||||
"/fcitx5-gtk/fcitx5-gtk-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0h53liraqc5nz4nyi3ixdfdw3zzkdcsiff7j25acc3gmaa5gyij7"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f ;No test
|
||||
#:configure-flags
|
||||
(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR="
|
||||
%output "/share/gir-1.0")
|
||||
(string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR="
|
||||
%output "/lib/girepository-1.0"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'patch-install-prefix
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(gtk2 (assoc-ref outputs "gtk2")))
|
||||
;; Install GTK+ 2 input method module to its own output.
|
||||
(substitute* "gtk2/CMakeLists.txt"
|
||||
(("\\$\\{CMAKE_INSTALL_LIBDIR\\}")
|
||||
(string-append gtk2 "/lib")))))))))
|
||||
(inputs
|
||||
`(("fcitx5" ,fcitx5)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
("gtk2" ,gtk+-2)
|
||||
("gtk3" ,gtk+)
|
||||
("glib" ,glib)
|
||||
("libx11" ,libx11)
|
||||
("gettext" ,gettext-minimal)))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)
|
||||
("glib" ,glib "bin"))) ;for glib-genmarshal
|
||||
;; TODO: Add "lib" output to reduce the closure size of "gtk2".
|
||||
(outputs '("out" "gtk2"))
|
||||
(home-page "https://github.com/fcitx/fcitx5-gtk")
|
||||
(synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5")
|
||||
(description "Fcitx5-gtk provides a Glib based D-Bus client and IM module
|
||||
for GTK+2/GTK+3 application.")
|
||||
(license license:lgpl2.1+)))
|
||||
|
||||
(define-public fcitx5-qt
|
||||
(package
|
||||
(name "fcitx5-qt")
|
||||
(version "5.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.fcitx-im.org/fcitx5"
|
||||
"/fcitx5-qt/fcitx5-qt-"
|
||||
version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0ilhb4yw9k3m1c4fidnv3nd5dgm9xxds11dgdys6gswjjnmcgqqm"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "-DCMAKE_INSTALL_QT5PLUGINDIR="
|
||||
%output "/lib/qt5/plugins")
|
||||
"-DENABLE_QT4=Off")))
|
||||
(inputs
|
||||
`(("fcitx5" ,fcitx5)
|
||||
("libxcb" ,libxcb)
|
||||
("libxkbcommon" ,libxkbcommon)
|
||||
("qtbase" ,qtbase)
|
||||
("gettext" ,gettext-minimal)))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)))
|
||||
(home-page "https://github.com/fcitx/fcitx5-qt")
|
||||
(synopsis "Qt library and IM module for Fcitx 5")
|
||||
(description "Fcitx5-qt provides Qt library for development and IM module
|
||||
for Qt based application.")
|
||||
(license (list license:lgpl2.1+
|
||||
;; Files under qt4(Fcitx5Qt4DBusAddons), qt5/dbusaddons
|
||||
;; and qt5/platforminputcontext.
|
||||
license:bsd-3))))
|
||||
|
||||
(define-public fcitx5-chinese-addons
|
||||
(package
|
||||
(name "fcitx5-chinese-addons")
|
||||
(version "5.0.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.fcitx-im.org/fcitx5"
|
||||
"/fcitx5-chinese-addons/fcitx5-chinese-addons-"
|
||||
version "_dict.tar.xz"))
|
||||
(sha256
|
||||
(base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'split-outputs
|
||||
;; Build with GUI supports requires Qt and increase package closure
|
||||
;; by 800M on x86_64, so place it under another output.
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(substitute* "gui/pinyindictmanager/CMakeLists.txt"
|
||||
(("\\$\\{CMAKE_INSTALL_LIBDIR\\}" _)
|
||||
(string-append (assoc-ref outputs "gui") "/lib"))))))))
|
||||
(inputs
|
||||
`(("fcitx5" ,fcitx5)
|
||||
("fcitx5-lua" ,fcitx5-lua)
|
||||
("boost" ,boost)
|
||||
("libime",libime)
|
||||
("curl" ,curl)
|
||||
("gettext" ,gettext-minimal)
|
||||
("fmt" ,fmt)
|
||||
("libpthread-stubs" ,libpthread-stubs)
|
||||
("opencc" ,opencc)
|
||||
("qtbase" ,qtbase)
|
||||
("fcitx5-qt" ,fcitx5-qt)
|
||||
("qtwebkit" ,qtwebkit)))
|
||||
(native-inputs
|
||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(outputs '("out" "gui"))
|
||||
(home-page "https://github.com/fcitx/fcitx5-chinese-addons")
|
||||
(synopsis "Chinese related addons for Fcitx 5")
|
||||
(description "Fcitx5-chinese-addons provides Chinese related addons,
|
||||
including input methods previous bundled inside Fcitx 4:
|
||||
|
||||
@itemize
|
||||
@item Bingchan
|
||||
@item Cangjie
|
||||
@item Erbi
|
||||
@item Pinyin
|
||||
@item Shuangpin
|
||||
@item Wanfeng
|
||||
@item Wubi
|
||||
@item Wubi Pinyin
|
||||
@item Ziranma
|
||||
@end itemize\n")
|
||||
(license (list license:lgpl2.1+
|
||||
license:gpl2+
|
||||
;; im/pinyin/emoji.txt
|
||||
license:unicode))))
|
||||
|
||||
(define-public fcitx5-configtool
|
||||
(package
|
||||
(name "fcitx5-configtool")
|
||||
(version "5.0.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://download.fcitx-im.org/fcitx5"
|
||||
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
;; KDE is currently not working on Guix, KCM supports doesn't make sense.
|
||||
'("-DENABLE_KCM=Off")))
|
||||
(inputs
|
||||
`(("fcitx5" ,fcitx5)
|
||||
("fcitx5-qt" ,fcitx5-qt)
|
||||
("qtbase" ,qtbase)
|
||||
("qtx11extras" ,qtx11extras)
|
||||
("kitemviews" ,kitemviews)
|
||||
("kwidgetsaddons" ,kwidgetsaddons)
|
||||
("libx11" ,libx11)
|
||||
("xkeyboard-config" ,xkeyboard-config)
|
||||
("libxkbfile" ,libxkbfile)
|
||||
("gettext" ,gettext-minimal)
|
||||
("iso-codes" ,iso-codes)))
|
||||
(native-inputs
|
||||
`(("gcc" ,gcc-9)
|
||||
("extra-cmake-modules" ,extra-cmake-modules)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(home-page "https://github.com/fcitx/fcitx5-configtool")
|
||||
(synopsis "Graphical configuration tool for Fcitx 5")
|
||||
(description "Fcitx5-configtool is a graphical configuration tool
|
||||
to manage different input methods in Fcitx 5.")
|
||||
(license license:gpl2+)))
|
||||
|
||||
(define-public fcitx5-material-color-theme
|
||||
(package
|
||||
(name "fcitx5-material-color-theme")
|
||||
(version "0.1")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/hosxy/Fcitx5-Material-Color")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1mgc722521jmfx0xc3ibmiycd3q2w7xg2956xcpc07kz90gcdjaa"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(use-modules (srfi srfi-26))
|
||||
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(assets-dir (string-append
|
||||
out "/share/fcitx5-material-color-theme"))
|
||||
(themes-prefix (string-append out "/share/fcitx5/themes")))
|
||||
|
||||
(define (install-theme-variant variant target)
|
||||
(let ((dir (string-append themes-prefix "/" target))
|
||||
(png (string-append "panel-" variant ".png"))
|
||||
(conf (string-append "theme-" variant ".conf")))
|
||||
(format #t "install: Installing color variant \"~a\" to ~a~%"
|
||||
variant dir)
|
||||
(substitute* conf
|
||||
(("^Name=.*")
|
||||
(string-append "Name=" target "\n")))
|
||||
(mkdir-p dir)
|
||||
(install-file png dir)
|
||||
(copy-file conf (string-append dir "/theme.conf"))
|
||||
(symlink (string-append assets-dir "/arrow.png")
|
||||
(string-append dir "/arrow.png"))))
|
||||
|
||||
(mkdir-p assets-dir)
|
||||
(install-file "arrow.png" assets-dir)
|
||||
(for-each
|
||||
(lambda (x)
|
||||
(install-theme-variant
|
||||
x (string-append "Material-Color-" (string-capitalize x))))
|
||||
'("black" "blue" "brown" "indigo"
|
||||
"orange" "pink" "red" "teal"))
|
||||
|
||||
(install-theme-variant
|
||||
"deepPurple" "Material-Color-DeepPurple")))))))
|
||||
(home-page "https://github.com/hosxy/Fcitx5-Material-Color")
|
||||
(synopsis "Material Design for Fcitx 5")
|
||||
(description "Fcitx5-material-color-theme is a Material Design theme
|
||||
for Fcitx 5 with following color variants:
|
||||
|
||||
@itemize
|
||||
@item Black
|
||||
@item Blue
|
||||
@item Brown
|
||||
@item Indigo
|
||||
@item Orange
|
||||
@item Pink
|
||||
@item Red
|
||||
@item teal
|
||||
@item DeepPurple
|
||||
@end itemize\n")
|
||||
(license license:asl2.0)))
|
|
@ -6,6 +6,7 @@
|
|||
;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
|
||||
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
|
||||
;;; Copyright © 2021 raid5atemyhoemwork <raid5atemyhomework@protonmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -38,6 +39,7 @@
|
|||
#:use-module (gnu packages acl)
|
||||
#:use-module (gnu packages attr)
|
||||
#:use-module (gnu packages autotools)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages compression)
|
||||
|
@ -48,6 +50,7 @@
|
|||
#:use-module (gnu packages documentation)
|
||||
#:use-module (gnu packages docbook)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages gawk)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages kerberos)
|
||||
|
@ -328,8 +331,8 @@ from a mounted file system.")
|
|||
(license license:gpl2+)))
|
||||
|
||||
(define-public bcachefs-tools
|
||||
(let ((commit "742dbbdbb90efb786f05a8576917fcd0e9cbd57e")
|
||||
(revision "1"))
|
||||
(let ((commit "db931a4571817d7d61be6bce306f1d42f7cd3398")
|
||||
(revision "2"))
|
||||
(package
|
||||
(name "bcachefs-tools")
|
||||
(version (git-version "0.1" revision commit))
|
||||
|
@ -341,7 +344,7 @@ from a mounted file system.")
|
|||
(commit commit)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0kn8y3kqylz6scv47mzfmwrlh21kbb14z5vs65vks8w50i26sxnc"))))
|
||||
(base32 "1zl8lda6ni6rhsmsng6smrcjihy2irjf03h1m7nvkqmkhq44j80s"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:make-flags
|
||||
|
@ -352,7 +355,24 @@ from a mounted file system.")
|
|||
"PYTEST=pytest")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(delete 'configure)) ; no configure script
|
||||
(delete 'configure) ; no configure script
|
||||
(add-after 'install 'promote-mount.bcachefs.sh
|
||||
;; XXX The (optional) mount.bcachefs helper requires rust:cargo.
|
||||
;; This alternative shell script does the job well enough for now.
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out")))
|
||||
(with-directory-excursion (string-append out "/sbin")
|
||||
(rename-file "mount.bcachefs.sh" "mount.bcachefs")
|
||||
;; WRAP-SCRIPT causes bogus ‘Insufficient arguments’ errors.
|
||||
(wrap-program "mount.bcachefs"
|
||||
`("PATH" ":" prefix
|
||||
,(cons (string-append out "/sbin")
|
||||
(map (lambda (input)
|
||||
(string-append (assoc-ref inputs input)
|
||||
"/bin"))
|
||||
(list "coreutils"
|
||||
"gawk"
|
||||
"util-linux"))))))))))
|
||||
#:tests? #f)) ; XXX 6 valgrind tests fail
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
|
@ -367,10 +387,15 @@ from a mounted file system.")
|
|||
("libscrypt" ,libscrypt)
|
||||
("libsodium" ,libsodium)
|
||||
("liburcu" ,liburcu)
|
||||
("util-linux" ,util-linux "lib") ; lib{blkid,uuid}
|
||||
("util-linux:lib" ,util-linux "lib") ; lib{blkid,uuid}
|
||||
("lz4" ,lz4)
|
||||
("zlib" ,zlib)
|
||||
("zstd:lib" ,zstd "lib")))
|
||||
("zstd:lib" ,zstd "lib")
|
||||
|
||||
;; Only for mount.bcachefs.sh.
|
||||
("coreutils" ,coreutils-minimal)
|
||||
("gawk" ,gawk)
|
||||
("util-linux" ,util-linux)))
|
||||
(home-page "https://bcachefs.org/")
|
||||
(synopsis "Tools to create and manage bcachefs file systems")
|
||||
(description
|
||||
|
@ -386,6 +411,55 @@ caching system, and lets you assign different roles to each device based on its
|
|||
performance and other characteristics.")
|
||||
(license license:gpl2+))))
|
||||
|
||||
(define-public bcachefs-tools/static
|
||||
(package
|
||||
(inherit bcachefs-tools)
|
||||
(name "bcachefs-tools-static")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments bcachefs-tools)
|
||||
((#:make-flags make-flags)
|
||||
`(append ,make-flags
|
||||
(list "LDFLAGS=-static")))))
|
||||
(inputs
|
||||
`(("eudev:static" ,eudev "static")
|
||||
("libscrypt:static" ,libscrypt "static")
|
||||
("lz4:static" ,lz4 "static")
|
||||
("util-linux:static" ,util-linux "static") ; lib{blkid,uuid}
|
||||
("zlib" ,zlib "static")
|
||||
("zstd:static" ,zstd "static")
|
||||
,@(package-inputs bcachefs-tools)))))
|
||||
|
||||
(define-public bcachefs/static
|
||||
(package
|
||||
(name "bcachefs-static")
|
||||
(version (package-version bcachefs-tools))
|
||||
(build-system trivial-build-system)
|
||||
(source #f)
|
||||
(inputs
|
||||
`(("bcachefs-tools" ,bcachefs-tools/static)))
|
||||
(arguments
|
||||
`(#:modules ((guix build utils))
|
||||
#:builder
|
||||
(begin
|
||||
(use-modules (guix build utils)
|
||||
(ice-9 ftw)
|
||||
(srfi srfi-26))
|
||||
(let* ((bcachefs-tools (assoc-ref %build-inputs "bcachefs-tools"))
|
||||
(out (assoc-ref %outputs "out")))
|
||||
(mkdir-p out)
|
||||
(with-directory-excursion out
|
||||
(install-file (string-append bcachefs-tools
|
||||
"/sbin/bcachefs")
|
||||
"sbin")
|
||||
(remove-store-references "sbin/bcachefs")
|
||||
(invoke "sbin/bcachefs" "version") ; test suite
|
||||
#t)))))
|
||||
(home-page (package-home-page bcachefs-tools))
|
||||
(synopsis "Statically-linked bcachefs command from bcachefs-tools")
|
||||
(description "This package provides the statically-linked @command{bcachefs}
|
||||
from the bcachefs-tools package. It is meant to be used in initrds.")
|
||||
(license (package-license bcachefs-tools))))
|
||||
|
||||
(define-public exfatprogs
|
||||
(package
|
||||
(name "exfatprogs")
|
||||
|
@ -871,7 +945,8 @@ APFS.")
|
|||
("openssl" ,openssl)
|
||||
("python" ,python)
|
||||
("python-cffi" ,python-cffi)
|
||||
("util-linux" ,util-linux "lib")
|
||||
("util-linux" ,util-linux)
|
||||
("util-linux:lib" ,util-linux "lib")
|
||||
("zlib" ,zlib)))
|
||||
(home-page "https://zfsonlinux.org/")
|
||||
(synopsis "Native ZFS on Linux")
|
||||
|
@ -982,14 +1057,14 @@ compatible directories.")
|
|||
(define-public python-dropbox
|
||||
(package
|
||||
(name "python-dropbox")
|
||||
(version "10.3.1")
|
||||
(version "11.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "dropbox" version))
|
||||
(sha256
|
||||
(base32
|
||||
"137rn9fs1bg1p1khd5lcccfxh8jsx27dh2ix5wwd8cmddbrzdrbd"))))
|
||||
"0r64jxm5m4a1sln2la3av0103filb0plqja1nnyibqvk9qrqs5jf"))))
|
||||
(build-system python-build-system)
|
||||
(arguments '(#:tests? #f)) ; Tests require a network connection.
|
||||
(native-inputs
|
||||
|
@ -1000,6 +1075,7 @@ compatible directories.")
|
|||
("python-chardet" ,python-chardet)
|
||||
("python-requests" ,python-requests)
|
||||
("python-six" ,python-six)
|
||||
("python-stone" ,python-stone)
|
||||
("python-urllib3" ,python-urllib3)))
|
||||
(home-page "https://www.dropbox.com/developers")
|
||||
(synopsis "Official Dropbox API Client")
|
||||
|
@ -1010,14 +1086,14 @@ Dropbox API v2.")
|
|||
(define-public dbxfs
|
||||
(package
|
||||
(name "dbxfs")
|
||||
(version "1.0.43")
|
||||
(version "1.0.48")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "dbxfs" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1f9sy2ax215dxiwszrrcadffjdsmrlxm4kwrbiap9dhxvzm226ks"))
|
||||
"07q7dgqaqqyapjl9r4lqydflrgx4dh84c1qsb0jvfmqj3i8887ak"))
|
||||
(patches (search-patches "dbxfs-remove-sentry-sdk.patch"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com>
|
||||
;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
|
||||
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
|
||||
;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant <glv@posteo.net>
|
||||
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
|
||||
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
|
||||
;;; Copyright © 2019 Sebastian Schott <sschott@mailbox.org>
|
||||
|
@ -21,6 +21,7 @@
|
|||
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Carlo Holl <carloholl@gmail.com>
|
||||
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -69,6 +70,7 @@
|
|||
#:use-module (gnu packages dbm)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages gnome)
|
||||
#:use-module (gnu packages golang)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages gnupg)
|
||||
#:use-module (gnu packages graphviz)
|
||||
|
@ -493,7 +495,7 @@ do so.")
|
|||
(define-public electrum
|
||||
(package
|
||||
(name "electrum")
|
||||
(version "3.3.8")
|
||||
(version "4.0.9")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -501,7 +503,7 @@ do so.")
|
|||
version "/Electrum-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"))
|
||||
(base32 "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
|
@ -510,21 +512,19 @@ do so.")
|
|||
#t))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("python-pyaes" ,python-pyaes)
|
||||
("python-pysocks" ,python-pysocks)
|
||||
("python-sip" ,python-sip)
|
||||
("python-pyqt" ,python-pyqt)
|
||||
("python-ecdsa" ,python-ecdsa)
|
||||
("python-pbkdf2" ,python-pbkdf2)
|
||||
("python-requests" ,python-requests)
|
||||
`(("python-pyqt" ,python-pyqt)
|
||||
("python-qrcode" ,python-qrcode)
|
||||
("python-protobuf" ,python-protobuf)
|
||||
("python-aiohttp" ,python-aiohttp)
|
||||
("python-aiohttp-socks" ,python-aiohttp-socks)
|
||||
("python-aiorpcx" ,python-aiorpcx)
|
||||
("python-certifi" ,python-certifi)
|
||||
("python-bitstring" ,python-bitstring)
|
||||
("python-attrs" ,python-attrs)
|
||||
("python-cryptography" ,python-cryptography)
|
||||
("python-qdarkstyle" ,python-qdarkstyle)
|
||||
("python-dnspython" ,python-dnspython)
|
||||
("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
|
||||
("libsecp256k1" ,libsecp256k1)))
|
||||
(arguments
|
||||
`(#:tests? #f ; no tests
|
||||
#:phases
|
||||
|
@ -538,7 +538,14 @@ do so.")
|
|||
(substitute* "setup.py"
|
||||
(("sys\\.prefix")
|
||||
(format #f "\"~a\"" out)))
|
||||
#t))))))
|
||||
#t)))
|
||||
(add-after 'unpack 'use-libsecp256k1-input
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "electrum/ecc_fast.py"
|
||||
(("library_paths = .* 'libsecp256k1.so.0'.")
|
||||
(string-append "library_paths = ('"
|
||||
(assoc-ref inputs "libsecp256k1")
|
||||
"/lib/libsecp256k1.so.0'"))))))))
|
||||
(home-page "https://electrum.org/")
|
||||
(synopsis "Bitcoin wallet")
|
||||
(description
|
||||
|
@ -551,7 +558,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
|
|||
(define-public electron-cash
|
||||
(package
|
||||
(name "electron-cash")
|
||||
(version "4.2.2")
|
||||
(version "4.2.3")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -560,7 +567,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.")
|
|||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1zk40zbf67wid2s5wg1fknb71409wg0qlvznk44q571v9risrdy7"))))
|
||||
(base32 "1q18p86a3a3wpf9nbpymhyilmaw9vffvwxh4hhx29bywfzvav11f"))))
|
||||
(build-system python-build-system)
|
||||
(inputs
|
||||
`(("libevent" ,libevent)
|
||||
|
@ -623,7 +630,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
|
|||
;; the system's dynamically linked library.
|
||||
(package
|
||||
(name "monero")
|
||||
(version "0.17.1.5")
|
||||
(version "0.17.1.9")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -643,7 +650,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch
|
|||
"external/unbound"))
|
||||
#t))
|
||||
(sha256
|
||||
(base32 "0yy9n2qng02j314h8fh5n0mcy6vpdks0yk4d8ifn8hj03f3g2c8b"))))
|
||||
(base32 "0jqss4csvkcrhrmaa3vrnyv6yiwqpbfw7037clx9xcfm4qrrfiwy"))))
|
||||
(build-system cmake-build-system)
|
||||
(native-inputs
|
||||
`(("doxygen" ,doxygen)
|
||||
|
@ -733,16 +740,24 @@ the Monero command line client and daemon.")
|
|||
(define-public monero-gui
|
||||
(package
|
||||
(name "monero-gui")
|
||||
(version "0.17.1.5")
|
||||
(version "0.17.1.9")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/monero-project/monero-gui")
|
||||
(commit (string-append "v" version))))
|
||||
(commit (string-append "v" version))
|
||||
(recursive? #t)))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
;; Delete bundled monero sources, we already have them.
|
||||
;; See the 'extract-monero-sources' phase.
|
||||
(delete-file-recursively "monero")
|
||||
#t))
|
||||
(sha256
|
||||
(base32 "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0"))))
|
||||
(base32 "0vpvpvsbbj547yir15g84qy9l9lwbip795zlliz79i7d66l23b1w"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
`(,@(package-native-inputs monero)
|
||||
|
@ -771,6 +786,7 @@ the Monero command line client and daemon.")
|
|||
;; Some of the monero package source code is required
|
||||
;; to build the GUI.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(mkdir-p "monero")
|
||||
(invoke "tar" "-xv" "--strip-components=1"
|
||||
"-C" "monero"
|
||||
"-f" (assoc-ref inputs "monero-source"))))
|
||||
|
@ -1229,20 +1245,25 @@ trezord as a regular user instead of needing to it run as root.")
|
|||
(define-public trezord
|
||||
(package
|
||||
(name "trezord")
|
||||
(version "2.0.29")
|
||||
(version "2.0.30")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/trezor/trezord-go")
|
||||
(commit (string-append "v" version))))
|
||||
(url "https://github.com/trezor/trezord-go")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp"))
|
||||
"1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
'(#:import-path "github.com/trezor/trezord-go"))
|
||||
(native-inputs
|
||||
`(("github.com/gorilla-csrf" ,go-github-com-gorilla-csrf)
|
||||
("github.com/gorilla/handlers" ,go-github-com-gorilla-handlers)
|
||||
("github.com/gorilla/mux" ,go-github-com-gorilla-mux)
|
||||
("gopkg.in/natefinch/lumberjack.v2" ,go-gopkg-in-natefinch-lumberjack.v2)))
|
||||
(home-page "https://trezor.io")
|
||||
(synopsis "Trezor Communication Daemon aka Trezor Bridge (written in Go)")
|
||||
(description "This allows a Trezor hardware wallet to communicate to the
|
||||
|
@ -1462,6 +1483,11 @@ entity management.")
|
|||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-tests
|
||||
(lambda _
|
||||
;; Fix data specific test failure
|
||||
;; https://reviews.bitcoinabc.org/rABC67bbd3d0aaee2952ff1cb5da51d1fd0b50c2b63a
|
||||
(substitute* "src/test/rpc_tests.cpp"
|
||||
(("1607731200") "9907731200"))
|
||||
|
||||
;; Disable utilprocess_tests because it never ends.
|
||||
;; It looks like it tries to start /bin/sleep and waits until it
|
||||
;; is in the list of running processes, but /bin/sleep doesn't
|
||||
|
@ -1648,3 +1674,54 @@ generate a variety of reports from them, and provides a web interface.")
|
|||
(synopsis "Emacs mode for beancount")
|
||||
(description
|
||||
"Emacs-beancount is an Emacs mode for the Beancount accounting tool.")))
|
||||
|
||||
(define-public hledger-web
|
||||
(package
|
||||
(name "hledger-web")
|
||||
(version "1.14.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://hackage.haskell.org/package/"
|
||||
"hledger-web/hledger-web-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1"))))
|
||||
(build-system haskell-build-system)
|
||||
(inputs
|
||||
`(("ghc-decimal" ,ghc-decimal)
|
||||
("ghc-aeson" ,ghc-aeson)
|
||||
("ghc-blaze-html" ,ghc-blaze-html)
|
||||
("ghc-blaze-markup" ,ghc-blaze-markup)
|
||||
("ghc-case-insensitive" ,ghc-case-insensitive)
|
||||
("ghc-clientsession" ,ghc-clientsession)
|
||||
("ghc-cmdargs" ,ghc-cmdargs)
|
||||
("ghc-conduit" ,ghc-conduit)
|
||||
("ghc-conduit-extra" ,ghc-conduit-extra)
|
||||
("ghc-data-default" ,ghc-data-default)
|
||||
("ghc-hjsmin" ,ghc-hjsmin)
|
||||
("hledger" ,hledger)
|
||||
("ghc-hledger-lib" ,ghc-hledger-lib)
|
||||
("ghc-http-client" ,ghc-http-client)
|
||||
("ghc-http-conduit" ,ghc-http-conduit)
|
||||
("ghc-http-types" ,ghc-http-types)
|
||||
("ghc-json" ,ghc-json)
|
||||
("ghc-megaparsec" ,ghc-megaparsec)
|
||||
("ghc-semigroups" ,ghc-semigroups)
|
||||
("ghc-shakespeare" ,ghc-shakespeare)
|
||||
("ghc-wai" ,ghc-wai)
|
||||
("ghc-wai-extra" ,ghc-wai-extra)
|
||||
("ghc-wai-handler-launch" ,ghc-wai-handler-launch)
|
||||
("ghc-warp" ,ghc-warp)
|
||||
("ghc-yaml" ,ghc-yaml)
|
||||
("ghc-yesod" ,ghc-yesod)
|
||||
("ghc-yesod-core" ,ghc-yesod-core)
|
||||
("ghc-yesod-form" ,ghc-yesod-form)
|
||||
("ghc-yesod-static" ,ghc-yesod-static)))
|
||||
(home-page "https://hledger.org")
|
||||
(synopsis "Web-based user interface for the hledger accounting system")
|
||||
(description "This package provides a simple Web-based User
|
||||
Interface (UI) for the hledger accounting system. It can be used as a
|
||||
local, single-user UI, or as a multi-user UI for viewing, adding, and
|
||||
editing on the Web.")
|
||||
(license license:gpl3)))
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Reference in a new issue