From 632a001bce31c4286e9ed8f60e665f45b31f7970 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 09:01:48 +0300 Subject: gnu: enlightenment: Fix screen unlocking. Without this the password is never collected and checked. * gnu/packages/patches/enlightenment-fix-setuid-path.patch: Fix patch so that it collects the entered password. --- gnu/packages/patches/enlightenment-fix-setuid-path.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/patches/enlightenment-fix-setuid-path.patch b/gnu/packages/patches/enlightenment-fix-setuid-path.patch index f2930845ba..a0efb29857 100644 --- a/gnu/packages/patches/enlightenment-fix-setuid-path.patch +++ b/gnu/packages/patches/enlightenment-fix-setuid-path.patch @@ -1,26 +1,24 @@ diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c -index 8b0aa6641..f15d2c2a2 100644 +index 8b0aa6641..3dff0ad84 100644 --- a/src/bin/e_auth.c +++ b/src/bin/e_auth.c -@@ -11,9 +11,7 @@ e_auth_begin(char *passwd) - pwlen = strlen(passwd); +@@ -12,8 +12,7 @@ e_auth_begin(char *passwd) if (pwlen == 0) goto out; -- snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), - "%s/enlightenment/utils/enlightenment_ckpasswd pw", - e_prefix_lib_get()); -+ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd"); ++ "/run/setuid-programs/enlightenment_ckpasswd pw"); exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); if (!exe) goto out; if (ecore_exe_send(exe, passwd, pwlen) != EINA_TRUE) goto out; -@@ -46,9 +44,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid) - pwlen = strlen(passwd); +@@ -47,8 +46,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid) if (pwlen == 0) goto out; -- snprintf(buf, sizeof(buf), + snprintf(buf, sizeof(buf), - "%s/enlightenment/utils/enlightenment_ckpasswd pk", - e_prefix_lib_get()); -+ snprintf(buf, sizeof(buf), "/run/setuid-programs/enlightenment_ckpasswd"); ++ "/run/setuid-programs/enlightenment_ckpasswd pk"); exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL); if (!exe) goto out; snprintf(buf, sizeof(buf), "%s %u %s", cookie, uid, passwd); -- cgit 1.4.1 From 9813805b30dad444984111d5413b8ab7356f7908 Mon Sep 17 00:00:00 2001 From: Josh Marshall Date: Sun, 24 May 2020 18:47:53 -0400 Subject: Updating python-argon2-cffi to 20.1.0 Signed-off-by: Efraim Flashner --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index e6208ab3d9..fc451e83ef 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1365,14 +1365,14 @@ I/O-free core, and integration modules for different event loops.") (define-public python-argon2-cffi (package (name "python-argon2-cffi") - (version "19.2.0") + (version "20.1.0") (source (origin (method url-fetch) (uri (pypi-uri "argon2-cffi" version)) (sha256 (base32 - "18xxfw30gi3lwaz4vwb05iavzlrk3fa1x9fippzrgd3px8z65apz")) + "0zgr4mnnm0p4i99023safb0qb8cgvl202nly1rvylk2b7qnrn0nq")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "extras") #t)))) (build-system python-build-system) -- cgit 1.4.1 From 868a18642318edc87e38d04697647aba2ca93b34 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 25 May 2020 10:55:45 +0200 Subject: gnu: emacs-helm-emms: Update to 20200322. * gnu/packages/emacs-xyz.scm (emacs-helm-emms): Update to 20200322. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 18c19740e9..6e0f768dbe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16457,10 +16457,10 @@ you searched for and execute it, or view its documentation.") (license license:gpl3+)))) (define-public emacs-helm-emms - (let ((commit "b785cb845a98a643eba9d5d53c9c0b4e6810a3cd")) + (let ((commit "37e5aa029abfa5a5c48636314de8157142944fa2")) (package (name "emacs-helm-emms") - (version (git-version "1.3" "2" commit)) + (version (git-version "1.3" "3" commit)) (source (origin (method git-fetch) @@ -16470,7 +16470,7 @@ you searched for and execute it, or view its documentation.") (file-name (git-file-name name version)) (sha256 (base32 - "1595r09y3rmwd46nnhvjja3hb8j2ila295ijxv61cg52ws4wginh")))) + "0r1ai6xhzayyik30w2sx9n62bxxwm12vfmjspv0daqif9az8y3vg")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit 1.4.1 From 607bfab5ec8f096c651bd44d4fbc8e568279327d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 14:16:38 +0300 Subject: gnu: efl: Update to 1.24.2. * gnu/packages/enlightenment.scm (efl): Update to 1.24.2. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 08a52f9d92..4d8c12ed3b 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -69,7 +69,7 @@ (define-public efl (package (name "efl") - (version "1.24.1") + (version "1.24.2") (source (origin (method url-fetch) (uri (string-append @@ -77,7 +77,7 @@ version ".tar.xz")) (sha256 (base32 - "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7")))) + "0w3srvigg4kfi7xq76c7y4hnq5yr2gxrrsvlyj1g2wc1igz1vyg1")))) (build-system meson-build-system) (native-inputs `(("check" ,check) -- cgit 1.4.1 From 0b96705889df3d2fb9a14ec73213d137a256986c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 14:20:53 +0300 Subject: gnu: tensorflow: Fix build with python-3.8. * gnu/packages/machine-learning.scm (tensorflow)[arguments]: Also import python-version from python-build-system. Adjust 'python3.7-compatibility to also add python-3.8 compatibility. Adjust 'install-python to not hardcode the python version. --- gnu/packages/machine-learning.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 6552d171bf..cf00a84e86 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1403,7 +1403,11 @@ Python.") (list "CC=gcc") #:modules ((ice-9 ftw) (guix build utils) - (guix build cmake-build-system)) + (guix build cmake-build-system) + ((guix build python-build-system) + #:select (python-version))) + #:imported-modules (,@%cmake-build-system-modules + (guix build python-build-system)) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-source-file-times-to-1980 @@ -1428,6 +1432,12 @@ Python.") ;; optional package. (substitute* "tensorflow/tools/pip_package/setup.py" ((".*'tensorboard >.*") "")) + + ;; Fix the build with python-3.8, taken from rejected upstream patch: + ;; https://github.com/tensorflow/tensorflow/issues/34197 + (substitute* (find-files "tensorflow/python" ".*\\.cc$") + (("(nullptr,)(\\ +/. tp_print)" _ _ tp_print) + (string-append "NULL, " tp_print))) #t)) (add-after 'python3.7-compatibility 'chdir (lambda _ (chdir "tensorflow/contrib/cmake") #t)) @@ -1617,16 +1627,19 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) (invoke "make" "tf_python_build_pip_package") #t)) (add-after 'build-pip-package 'install-python - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (wheel (car (find-files "../build/tf_python/dist/" "\\.whl$")))) + (wheel (car (find-files "../build/tf_python/dist/" "\\.whl$"))) + (python-version (python-version + (assoc-ref inputs "python")))) (invoke "python" "-m" "pip" "install" wheel (string-append "--prefix=" out)) ;; XXX: broken RUNPATH, see fix-python-build phase. (delete-file (string-append - out "/lib/python3.7/site-packages/tensorflow/contrib/" + out "/lib/python" python-version + "/site-packages/tensorflow/contrib/" "seq2seq/python/ops/lib_beam_search_ops.so")) #t)))))) (native-inputs -- cgit 1.4.1 From 5856db313d7e6973506fc6272fdf3eb4efd1d109 Mon Sep 17 00:00:00 2001 From: Ryan Desfosses Date: Mon, 25 May 2020 13:40:20 +0200 Subject: gnu: Add emacs-interleave. * gnu/packages/emacs-xyz.scm (emacs-interleave): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6e0f768dbe..5dbb48bb0e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -71,6 +71,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 pinoaffe ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Ryan Desfosses ;;; ;;; This file is part of GNU Guix. ;;; @@ -6076,6 +6077,28 @@ the Hydra very seamless; it's like a minor mode that disables itself automatically.") (license license:gpl3+))) +(define-public emacs-interleave + (package + (name "emacs-interleave") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/rudolfochrist/interleave") + (commit (string-append "interleave-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0l5b681mrpk12lx5c16m7kc13p29z6zismwg1llsjg7cdmrmsrcb")))) + (build-system emacs-build-system) + (home-page "https://github.com/rudolfochrist/interleave") + (synopsis "Emacs minor mode to interleave notes and text books") + (description + "Interleave is a minor mode that presents a document viewer side +by side to an Org buffer with your notes relevant to the current page.") + (license license:gpl3+))) + (define-public emacs-ivy (package (name "emacs-ivy") -- cgit 1.4.1 From ba2104aaa378bda6075a2093a4fc4851505aa789 Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 22 May 2020 02:03:42 +0200 Subject: doc: Fix typos. * doc/guix.texi: Fix typos. * doc/contributing.texi: Fix typos. Signed-off-by: Julien Lepiller --- doc/contributing.texi | 2 +- doc/guix.texi | 86 +++++++++++++++++++++++++-------------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 7b1f7e7c94..25b50e8e72 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -501,7 +501,7 @@ It is a good idea to strip commit identifiers in the @code{version} field to, say, 7 digits. It avoids an aesthetic annoyance (assuming aesthetics have a role to play here) as well as problems related to OS limits such as the maximum shebang length (127 bytes for the Linux -kernel.) It is best to use the full commit identifiers in +kernel). It is best to use the full commit identifiers in @code{origin}s, though, to avoid ambiguities. A typical package definition may look like this: diff --git a/doc/guix.texi b/doc/guix.texi index 3d1b097447..4dbbf96db9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -609,7 +609,7 @@ you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run: This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}. The latter contains a ready-to-use profile for @code{root} (see next -step.) +step). Do @emph{not} unpack the tarball on a working Guix system since that would overwrite its own essential files. @@ -617,10 +617,10 @@ would overwrite its own essential files. The @option{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such warnings were triggered by GNU@tie{}tar 1.26 and older; recent -versions are fine.) +versions are fine). They stem from the fact that all the files in the archive have their modification time set to zero (which -means January 1st, 1970.) This is done on purpose to make sure the +means January 1st, 1970). This is done on purpose to make sure the archive content is independent of its creation time, thus making it reproducible. @@ -705,7 +705,7 @@ there: That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the -Info search path.) +Info search path). @item @cindex substitutes, authorization thereof @@ -1363,7 +1363,7 @@ build failed and the client specified @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}}). The daemon listens for connections and spawns one sub-process for each session -started by a client (one of the @command{guix} sub-commands.) The +started by a client (one of the @command{guix} sub-commands). The @command{guix processes} command allows you to get an overview of the activity on your system by viewing each of the active sessions and clients. @xref{Invoking guix processes}, for more information. @@ -2292,7 +2292,7 @@ mkfs.ext4 -L my-root /dev/sda2 If you are instead planning to encrypt the root partition, you can use the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, -@code{man cryptsetup}} for more information.) Assuming you want to +@code{man cryptsetup}} for more information). Assuming you want to store the root partition on @file{/dev/sda2}, the command sequence would be along these lines: @@ -2764,7 +2764,7 @@ Install the specified @var{package}s. Each @var{package} may specify either a simple package name, such as @code{guile}, or a package name followed by an at-sign and version number, such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter -case, the newest version prefixed by @code{1.8} is selected.) +case, the newest version prefixed by @code{1.8} is selected). If no version number is specified, the newest available version will be selected. In addition, @var{package} @@ -3368,7 +3368,7 @@ When using HTTPS, the server's X.509 certificate is @emph{not} validated HTTPS clients such as Web browsers usually do. This is because Guix authenticates substitute information itself, as explained above, which is what we care about (whereas X.509 certificates are about -authenticating bindings between domain names and public keys.) +authenticating bindings between domain names and public keys). @node Proxy Settings @subsection Proxy Settings @@ -4578,7 +4578,7 @@ The main options are: @table @code @item --export -Export the specified store files or packages (see below.) Write the +Export the specified store files or packages (see below). Write the resulting archive to the standard output. Dependencies are @emph{not} included in the output, unless @@ -4595,7 +4595,7 @@ exported store items. Read an archive from the standard input, and import the files listed therein into the store. Abort if the archive has an invalid digital signature, or if it is signed by a public key not among the authorized -keys (see @option{--authorize} below.) +keys (see @option{--authorize} below). @item --missing Read a list of store file names from the standard input, one per line, @@ -4611,7 +4611,7 @@ to generate the key pair. The generated key pair is typically stored under @file{/etc/guix}, in @file{signing-key.pub} (public key) and @file{signing-key.sec} (private -key, which must be kept secret.) When @var{parameters} is omitted, +key, which must be kept secret). When @var{parameters} is omitted, an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt versions before 1.6.0, it is a 4096-bit RSA key. Alternatively, @var{parameters} can specify @@ -4927,7 +4927,7 @@ interpreted as packages that will be added to the environment directly. @item --pure Unset existing environment variables when building the new environment, except -those specified with @option{--preserve} (see below.) This has the effect of +those specified with @option{--preserve} (see below). This has the effect of creating an environment in which search paths only contain package inputs. @item --preserve=@var{regexp} @@ -4945,7 +4945,7 @@ guix environment --pure --preserve=^SLURM --ad-hoc openmpi @dots{} \ This example runs @command{mpirun} in a context where the only environment variables defined are @env{PATH}, environment variables whose name starts with @samp{SLURM}, as well as the usual ``precious'' variables (@env{HOME}, -@env{USER}, etc.) +@env{USER}, etc.). @item --search-paths Display the environment variable definitions that make up the @@ -4966,7 +4966,7 @@ directory is created that matches the current user's home directory, and The spawned process runs as the current user outside the container. Inside the container, it has the same UID and GID as the current user, unless -@option{--user} is passed (see below.) +@option{--user} is passed (see below). @item --network @itemx -N @@ -5867,7 +5867,7 @@ Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the specified packages will be automatically installed alongside the package they belong to (@pxref{package-cmd-propagated-inputs, @command{guix package}}, for information on how @command{guix package} deals with -propagated inputs.) +propagated inputs). For example this is necessary when a C/C++ library needs headers of another library to compile, or when a pkg-config file refers to another @@ -7070,7 +7070,7 @@ argument. Return @code{#t} when @var{path} designates a valid store item and @code{#f} otherwise (an invalid item may exist on disk but still be invalid, for instance because it is the result of an aborted or failed -build.) +build). A @code{&store-protocol-error} condition is raised if @var{path} is not prefixed by the store directory (@file{/gnu/store}). @@ -7115,7 +7115,7 @@ directory in the store, but may produce more. @cindex dependencies, build-time The inputs of the derivations---i.e., its build-time dependencies---which may be other derivations or plain files in the store (patches, build scripts, -etc.) +etc.). @item The system type targeted by the derivation---e.g., @code{x86_64-linux}. @@ -7537,7 +7537,7 @@ The store monad---an alias for @code{%state-monad}. Values in the store monad encapsulate accesses to the store. When its effect is needed, a value of the store monad must be ``evaluated'' by -passing it to the @code{run-with-store} procedure (see below.) +passing it to the @code{run-with-store} procedure (see below). @end defvr @deffn {Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)] @@ -7675,7 +7675,7 @@ into gexps. For example, a useful type of high-level objects that can be inserted in a gexp is ``file-like objects'', which make it easy to add files to the store and to refer to them in derivations and such (see @code{local-file} and @code{plain-file} -below.) +below). To illustrate the idea, here is an example of a gexp: @@ -7846,7 +7846,7 @@ Like the above, but refers to native builds of the objects listed in @end table G-expressions created by @code{gexp} or @code{#~} are run-time objects -of the @code{gexp?} type (see below.) +of the @code{gexp?} type (see below). @end deffn @deffn {Scheme Syntax} with-imported-modules @var{modules} @var{body}@dots{} @@ -7892,7 +7892,7 @@ Return @code{#t} if @var{obj} is a G-expression. G-expressions are meant to be written to disk, either as code building some derivation, or as plain files in the store. The monadic procedures below allow you to do that (@pxref{The Store Monad}, for more -information about monads.) +information about monads). @deffn {Monadic Procedure} gexp->derivation @var{name} @var{exp} @ [#:system (%current-system)] [#:target #f] [#:graft? #t] @ @@ -8903,7 +8903,7 @@ guix build --log-file -e '(@@ (gnu packages guile) guile-2.0)' If a log is unavailable locally, and unless @option{--no-substitutes} is passed, the command looks for a corresponding log on one of the -substitute servers (as specified with @option{--substitute-urls}.) +substitute servers (as specified with @option{--substitute-urls}). So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine: @@ -9142,7 +9142,7 @@ hash (@pxref{Invoking guix archive}). @item --exclude-vcs @itemx -x When combined with @option{--recursive}, exclude version control system -directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.) +directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.). @vindex git-fetch As an example, here is how you would compute the hash of a Git checkout, @@ -9675,7 +9675,7 @@ guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)' @end example This command lists the dependents of the ``final'' libc (essentially all -the packages.) +the packages). @item --update @itemx -u @@ -9782,7 +9782,7 @@ be used when passing @command{guix refresh} one or more package names: @item --list-updaters @itemx -L -List available updaters and exit (see @option{--type} above.) +List available updaters and exit (see @option{--type} above). For each updater, display the fraction of packages it covers; at the end, display the fraction of packages covered by all these updaters. @@ -9846,7 +9846,7 @@ When this option is omitted, @command{guix refresh} uses @file{~/.config/guix/upstream/trustedkeys.kbx} as the keyring for upstream signing keys. OpenPGP signatures are checked against keys from this keyring; missing keys are downloaded to this keyring as well (see -@option{--key-download} below.) +@option{--key-download} below). You can export keys from your default GPG keyring into a keybox file using commands like this one: @@ -10258,7 +10258,7 @@ guix graph --type=reverse-package ocaml ...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if you are also interested in cases where OCaml is an implicit dependency, see -@code{reverse-bag} below.) +@code{reverse-bag} below). Note that for core packages this can yield huge graphs. If all you want is to know the number of packages that depend on a given package, use @@ -10832,7 +10832,7 @@ When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes provided by different servers, the command displays it as in the example above and its exit code is 2 (other non-zero exit codes denote other kinds of -errors.) +errors). The one option that matters is: @@ -11158,7 +11158,7 @@ integration tool; their process identifier (PID) is given by the 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 +running as root). Last, by looking at the @code{ChildProcess} field, we understand that these three builds are being offloaded (@pxref{Daemon Offload Setup}). @@ -11800,7 +11800,7 @@ variables. @defvr {Scheme Variable} %base-file-systems These are essential file systems that are required on normal systems, such as @code{%pseudo-terminal-file-system} and @code{%immutable-store} (see -below.) Operating system declarations should always contain at least +below). Operating system declarations should always contain at least these. @end defvr @@ -12629,7 +12629,7 @@ Since this is part of @code{%base-services}, you can use @code{modify-services} to customize the set of special files (@pxref{Service Reference, @code{modify-services}}). But the simple way to add a special file is @i{via} the @code{extra-special-file} procedure -(see below.) +(see below). @end defvr @deffn {Scheme Procedure} extra-special-file @var{file} @var{target} @@ -14940,7 +14940,7 @@ definition (@pxref{operating-system Reference, system-wide packages}). This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager} (GDM), a program that manages graphical display servers and handles graphical user logins. Its value must be a @code{gdm-configuration} -(see below.) +(see below). @cindex session types (X11) @cindex X11 session types @@ -16211,7 +16211,7 @@ gnome-session``. Currently only GNOME has support for Wayland. @defvr {Scheme Variable} gnome-desktop-service-type This is the type of the service that adds the @uref{https://www.gnome.org, GNOME} desktop environment. Its value is a @code{gnome-desktop-configuration} -object (see below.) +object (see below). This service adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-settings-daemon}. @@ -16229,7 +16229,7 @@ The GNOME package to use. @defvr {Scheme Variable} xfce-desktop-service-type This is the type of a service to run the @uref{Xfce, https://xfce.org/} desktop environment. Its value is an @code{xfce-desktop-configuration} object -(see below.) +(see below). This service adds the @code{xfce} package to the system profile, and extends polkit with the ability for @code{thunar} to manipulate the file @@ -16249,7 +16249,7 @@ The Xfce package to use. @deffn {Scheme Variable} mate-desktop-service-type This is the type of the service that runs the @uref{https://mate-desktop.org/, MATE desktop environment}. Its value is a @code{mate-desktop-configuration} -object (see below.) +object (see below). This service adds the @code{mate} package to the system profile, and extends polkit with the actions from @@ -16563,7 +16563,7 @@ Users need to be in the @code{lp} group to access the D-Bus service. @defvr {Scheme Variable} gnome-keyring-service-type This is the type of the service that adds the @uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}. Its -value is a @code{gnome-keyring-configuration} object (see below.) +value is a @code{gnome-keyring-configuration} object (see below). This service adds the @code{gnome-keyring} package to the system profile and extends PAM with entries using @code{pam_gnome_keyring.so}, unlocking @@ -22310,10 +22310,10 @@ configuration: Note that ddclient needs to access credentials that are stored in a @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see -@code{secret-file} below.) You are expected to create this file manually, in +@code{secret-file} below). You are expected to create this file manually, in an ``out-of-band'' fashion (you @emph{could} make this file part of the service configuration, for instance by using @code{plain-file}, but it will be -world-readable @i{via} @file{/gnu/store}.) See the examples in the +world-readable @i{via} @file{/gnu/store}). See the examples in the @file{share/ddclient} directory of the @code{ddclient} package. @c %start of fragment @@ -26388,7 +26388,7 @@ password, and which needs to access the @file{/etc/passwd} and obvious security reasons. To address that, these executables are @dfn{setuid-root}, meaning that they always run with root privileges (@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual}, -for more info about the setuid mechanism.) +for more info about the setuid mechanism). The store itself @emph{cannot} contain setuid programs: that would be a security issue since any user on the system can write derivations that @@ -27525,7 +27525,7 @@ each other: Emit in Dot/Graphviz format 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). The command: @@ -28086,7 +28086,7 @@ services and service types. This interface is provided by the @deffn {Scheme Procedure} service @var{type} [@var{value}] Return a new service of @var{type}, a @code{} object (see -below.) @var{value} can be any object; it represents the parameters of +below). @var{value} can be any object; it represents the parameters of this particular service instance. When @var{value} is omitted, the default value specified by @var{type} @@ -28642,7 +28642,7 @@ Occasionally, important security vulnerabilities are discovered in software packages and must be patched. Guix developers try hard to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet provide a ``stable'' branch -containing only security updates.) The @command{guix lint} tool helps +containing only security updates). The @command{guix lint} tool helps developers find out about vulnerable versions of software packages in the distribution: @@ -29089,7 +29089,7 @@ reason. Guix is based on the @uref{https://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with contributions from other people (see -the @file{nix/AUTHORS} file in Guix.) Nix pioneered functional package +the @file{nix/AUTHORS} file in Guix). Nix pioneered functional package management, and promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially transparent build processes. Without this work, Guix would not exist. -- cgit 1.4.1 From 7384f40f400b66b6c0ee2f7d80628035d1494996 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 16:51:30 +0200 Subject: gnu: parallel: Update to 20200522. * gnu/packages/parallel.scm (parallel): Update to 20200522. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 92f7b58128..575f87930f 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -54,14 +54,14 @@ (define-public parallel (package (name "parallel") - (version "20200422") + (version "20200522") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb")))) + (base32 "10is46v5dpccxibby0zikg1q68mdwpmgdpxk796zka93idd6id29")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From f8687cb21e6af7501b1537812bccca574b9d34b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 14:09:18 +0200 Subject: gnu: dia: Update to 0.97.3-2.3cf7ec4 [fixes CVE-2019-19451]. * gnu/packages/gnome.scm (dia): Update to 0.97.3-2.3cf7ec4. [build-system]: Use Meson. [inputs]: Add graphene, libxslt, poppler, and python-2. Remove freetype, gdk-pixbuf, libart-lgpl, and pango. [native-inputs]: Add appstream-glib and docbook-xsl. Remove autoconf, automake, libtool, perl, and python-wrapper. --- gnu/packages/gnome.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a568d54044..dbaab157f5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1010,11 +1010,12 @@ useful as a tutorial and users' guide for new or less experienced users.") ;; This version from GNOME's repository includes fixes for compiling with ;; recent versions of the build tools. The latest activity on the ;; pre-GNOME version has been in 2014, while GNOME has continued applying - ;; fixes in 2016. - (let ((commit "fbc306168edab63db80b904956117cbbdc514ee4")) + ;; fixes since. + (let ((commit "3cf7ec4c2e5bca139a7f3e17f9fc9009c237fcc5") + (revision "2")) (package (name "dia") - (version (git-version "0.97.3" "1" commit)) + (version (git-version "0.97.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1023,24 +1024,23 @@ useful as a tutorial and users' guide for new or less experienced users.") (file-name (git-file-name name version)) (sha256 (base32 - "1b4bba0k8ph4cwgw8xjglss0p6n111bpd5app67lrq79mp0ad06l")))) - (build-system gnu-build-system) + "04r8dspa6nmicrifhi3sh46hqvyy88hzq37xx99q3q1mwsrpmwy8")))) + (build-system meson-build-system) (inputs - `(("freetype" ,freetype) - ("gdk-pixbuf" ,gdk-pixbuf) + `(("graphene" ,graphene) ("gtk+" ,gtk+-2) - ("libart-lgpl" ,libart-lgpl) ("libxml2" ,libxml2) - ("pango" ,pango))) + ("libxslt" ,libxslt) + ("poppler" ,poppler) + ;; Without Python 2, build fails: plug-ins/python/meson.build:4:0: + ;; ERROR: Unknown method "dependency" in object. + ("python-2" ,python-2))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("intltool" ,intltool) + `(("appstream-glib" ,appstream-glib) + ("docbook-xsl" ,docbook-xsl) ("glib" ,glib "bin") - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) (home-page "https://wiki.gnome.org/Apps/Dia") (synopsis "Diagram creation for GNOME") (description "Dia can be used to draw different types of diagrams, and -- cgit 1.4.1 From a422d9f3b67e49d8382b0c02688b24267e6cf1cc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 18:51:54 +0200 Subject: gnu: cataclysm-dda: Update to 0.E-2. * gnu/packages/games.scm (cataclysm-dda): Update to 0.E-2. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9e1a01fc04..7f9a08aa6b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -450,7 +450,7 @@ possible, while battling many vicious aliens.") (define-public cataclysm-dda (package (name "cataclysm-dda") - (version "0.E") + (version "0.E-2") (source (origin (method git-fetch) @@ -458,7 +458,7 @@ possible, while battling many vicious aliens.") (url "https://github.com/CleverRaven/Cataclysm-DDA.git") (commit version))) (sha256 - (base32 "0pbi0fw37zimzdklfj58s1ql0wlqq7dy6idkcsib3hn910ajaxan")) + (base32 "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From c5e6a7fed81f16477b7de569bc0206a0514de375 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:12:55 +0200 Subject: gnu: denemo: Update to 2.4.0. * gnu/packages/music.scm (denemo): Update to 2.4.0. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1d02e3abcf..9f30caf7af 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -384,14 +384,14 @@ many input formats and provides a customisable Vi-style user interface.") (define-public denemo (package (name "denemo") - (version "2.3.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/denemo/" "denemo-" version ".tar.gz")) (sha256 - (base32 "1blkcl3slbsq9jlhwcf2m9v9g38a0sjfhh9advgi2qr1gxri08by")))) + (base32 "145kq0zfgdadykl3i6na221i4s5wzdrcqq48amzyfarnrqk2rmpd")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 8a51e31f46ab33237e17ddca8b60c2ba37604898 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:20:05 +0200 Subject: gnu: wireshark: Update to 3.2.4. * gnu/packages/networking.scm (wireshark): Update to 3.2.4. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4a2df4fd5a..962f0185b2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -767,14 +767,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.2.3") + (version "3.2.4") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "1fpsfjrap7j84sy728yhcr2gad9nq3n5gq03mwrmxnc6ijwf81zh")))) + (base32 "1amqgn94g6h6cfnsccm2zb4c73pfv1qmzi1i6h1hnbcyhhg4czfi")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit 1.4.1 From 78763c1e7be07ed1c9306a6bee97d22e93c70dd2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:26:32 +0200 Subject: gnu: cmark: Use HTTPS home page URI. * gnu/packages/markup.scm (cmark)[home-page]: Use HTTPS URI. --- gnu/packages/markup.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 3cd7fb559c..7ae73da8a5 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -228,7 +228,7 @@ CommonMark to an abstract syntax tree (@dfn{AST}) and rendering the document as HTML, groff man, LaTeX, CommonMark, or an XML representation of the AST. The package also provides the command-line program @command{cmark} for parsing and rendering CommonMark.") - (home-page "http://commonmark.org") + (home-page "https://commonmark.org") ;; cmark is distributed with a BSD-2 license, but some components are Expat ;; licensed. The CommonMark specification is Creative Commons CC-BY-SA 4.0 ;; licensed. See 'COPYING' in the source distribution for more information. -- cgit 1.4.1 From 316928addfd5bc896b9705bff6b4529599728861 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:28:37 +0200 Subject: gnu: cppzmq: Use HTTPS home page URI. * gnu/packages/networking.scm (cppzmq)[home-page]: Use HTTPS URI. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 962f0185b2..39341e92fe 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -487,7 +487,7 @@ between different versions of ØMQ.") `(("pkg-config" ,pkg-config))) (inputs `(("zeromq" ,zeromq))) - (home-page "http://zeromq.org") + (home-page "https://zeromq.org") (synopsis "C++ bindings for the ØMQ messaging library") (description "This package provides header-only C++ bindings for ØMQ. The header -- cgit 1.4.1 From 9fc6a24c4621c3ccb8da6ba6867a8efa82283210 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:29:19 +0200 Subject: gnu: czmq: Use HTTPS home page URI. * gnu/packages/networking.scm (czmq)[home-page]: Use HTTPS URI. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 39341e92fe..f106d2bf72 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -456,7 +456,7 @@ more.") #t))))) (inputs `(("zeromq" ,zeromq))) - (home-page "http://zeromq.org") + (home-page "https://zeromq.org") (synopsis "High-level C bindings for ØMQ") (description "czmq provides bindings for the ØMQ core API that hides the differences -- cgit 1.4.1 From 09a3d34cf53348d870e360d650a880e5f0064355 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 19:30:59 +0200 Subject: gnu: gcompris: Use HTTPS home page URI. * gnu/packages/education.scm (gcompris)[home-page]: Use HTTPS URI. --- gnu/packages/education.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index d6c2cd02c3..980cec5443 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -114,7 +114,7 @@ ("texi2html" ,texi2html) ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) - (home-page "http://gcompris.net") + (home-page "https://gcompris.net") (synopsis "Educational software suite") (description "GCompris is an educational software suite comprising of numerous activities for children aged 2 to 10. Some of the activities are -- cgit 1.4.1 From a2cddd7350bf924fc7cee2008a07d786083999c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 18:07:00 +0200 Subject: gnu: libnftnl: Update to 1.1.6. * gnu/packages/linux.scm (libnftnl): Update to 1.1.6. [source]: Remove patch. * gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 6 +-- .../libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch | 47 ---------------------- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef4c5d2dcb..6095c69085 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1119,7 +1119,6 @@ dist_patch_DATA = \ %D%/packages/patches/jsoncpp-fix-inverted-case.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ - %D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f6acc086a7..2788f9d319 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5984,16 +5984,14 @@ re-use code and to avoid re-inventing the wheel.") (define-public libnftnl (package (name "libnftnl") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (string-append "mirror://netfilter.org/libnftnl/" "libnftnl-" version ".tar.bz2")) (sha256 - (base32 "1wqlxf76bkqf3qhka9sw32qhb2ni20q1k6rn3iril2kw482lvpk6")) - (patches - (search-patches "libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch")))) + (base32 "1jhyxsfrfqjascrm5lnxlcyzj6n0gc0qc1bp2asb7m61dxlmmsy1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch b/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch deleted file mode 100644 index df0571bf2b..0000000000 --- a/gnu/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Tue, 10 Dec 2019 16:20:40 +0100 -Subject: gnu: libnftnl: Don't check NFTNL_FLOWTABLE_SIZE. - -Taken verbatim from the upstream commit[0] directly following the 1.1.5 -release. - -[0]: https://git.netfilter.org/libnftnl/commit/?id=b2388765e0c4405442faa13845419f6a35d0134c - -From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001 -From: Phil Sutter -Date: Mon, 2 Dec 2019 18:29:56 +0100 -Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE - -Marshalling code around that attribute has been dropped by commit -d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is -lost during the test. - -Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a -later point, leave the test code in place but just comment it out. - -Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") -Signed-off-by: Phil Sutter -Acked-by: Pablo Neira Ayuso ---- - tests/nft-flowtable-test.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c -index 3edb00d..8ab8d4c 100644 ---- a/tests/nft-flowtable-test.c -+++ b/tests/nft-flowtable-test.c -@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl - if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) != - nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE)) - print_err("Flowtable use mismatches"); -+#if 0 - if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) != - nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE)) - print_err("Flowtable size mismatches"); -+#endif - if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) != - nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS)) - print_err("Flowtable flags mismatches"); --- -cgit v1.2.1 - -- cgit 1.4.1 From 18a91ab89760bed207ae22a69ec8e4a559ae3666 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 17:02:12 +0200 Subject: gnu: colordiff: Update to 1.0.19. * gnu/packages/patchutils.scm (colordiff): Update to 1.0.19. --- gnu/packages/patchutils.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 0c46a62bf7..0d58c21eee 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -163,7 +163,7 @@ refreshed, and more.") (define-public colordiff (package (name "colordiff") - (version "1.0.18") + (version "1.0.19") (source (origin (method url-fetch) @@ -172,8 +172,7 @@ refreshed, and more.") (string-append "http://www.colordiff.org/archive/colordiff-" version ".tar.gz"))) (sha256 - (base32 - "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9")))) + (base32 "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From ae58ebba8211f3593fb6d7214f5b80bc6aca5929 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:29:43 +0200 Subject: gnu: netcat-openbsd: Update to 1.217-1. * gnu/packages/admin.scm (netcat-openbsd): Update to 1.217-1. [arguments]: Remove obsolete #:configure-flags. --- gnu/packages/admin.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cb8e73e95a..7ec68d1d64 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -718,7 +718,7 @@ would need and has several interesting built-in capabilities.") (define-public netcat-openbsd (package (name "netcat-openbsd") - (version "1.206-1") + (version "1.217-1") (source (origin (method git-fetch) (uri (git-reference @@ -727,14 +727,12 @@ would need and has several interesting built-in capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "08r3mmck3s5pbvwyq19wp5g8jqcxza3cm8nkc6jm7rqn4jdydc4z")))) + "0kcvi3pav2fdx5c22psjv5dggk4cmrqiaq2cklhqngsk4a7vrjan")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test suite + `(#:tests? #f ; no test suite #:make-flags - (list "CC=gcc" - (string-append "CFLAGS=-I" (assoc-ref %build-inputs "libbsd") "/include") - "LDFLAGS=-lbsd") + (list "CC=gcc") #:phases (modify-phases %standard-phases (delete 'configure) -- cgit 1.4.1 From 3e0190a8502dc16b39e1d11a69f31efdf5b8c412 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 17:29:12 +0200 Subject: gnu: redkite: Update to 0.8.1. * gnu/packages/audio.scm (redkite): Update to 0.8.1. --- gnu/packages/audio.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 35c4001303..4f1667b9d5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3988,7 +3988,7 @@ stream to one or more IceCast and/or ShoutCast servers.") (define-public redkite (package (name "redkite") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) @@ -3997,8 +3997,7 @@ stream to one or more IceCast and/or ShoutCast servers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1747w1kg8y9jbl11xi018d85dm38xk7843pz26sh0k5fdv87a10q")))) + (base32 "17kv2jc4jvn3sdicz3sf8dnf25wbvv7ijzkr0mm0sbrrjz6vrwz0")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests included -- cgit 1.4.1 From 083b24e23e1fb722b3a0ba94c94da6970722bc69 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:04:52 +0200 Subject: gnu: xonotic: Use HTTPS home page URI. * gnu/packages/games.scm (xonotic)[home-page]: Use HTTPS URI. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7f9a08aa6b..ee7f001f20 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6664,7 +6664,7 @@ quotation from a collection of quotes.") ("pkg-config" ,pkg-config) ("libtool" ,libtool) ("gmp" ,gmp))) - (home-page "http://xonotic.org") + (home-page "https://xonotic.org") (synopsis "Fast-paced first-person shooter game") (description "Xonotic is a free, fast-paced first-person shooter. -- cgit 1.4.1 From 91e2170042324c0a8436605ac178f167c6e999f4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:06:43 +0200 Subject: gnu: xftwidth: Use HTTPS home page URI. * gnu/packages/xdisorg.scm (xftwidth)[home-page]: Use HTTPS URI. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index acc74e328a..b717b36aed 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1573,13 +1573,13 @@ program for X11. It was designed to be fast, tiny and scriptable in any languag #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out))))) + (home-page "https://github.com/vixus0/xftwidth") (synopsis "Calculator for determining pixel widths of displayed text using Xft fonts") (description "xftwidth is a small C program for calculating the pixel widths of displayed text using Xft fonts. It is especially useful in scripts for displaying text in graphical panels, menus, popups, and notification windows generated using dzen. These scripts are often used in conjunction with minimalistic tiling window managers such as herbstluftwm and bspwm.") - (home-page "http://github.com/vixus0/xftwidth") (license license:expat))) (define-public xcb-util-xrm -- cgit 1.4.1 From 950f16976aac61be406a802149899d56cbbca625 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:19:12 +0200 Subject: gnu: uget: Use HTTPS home page URI. * gnu/packages/bittorrent.scm (uget)[home-page]: Use HTTPS URI. --- gnu/packages/bittorrent.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 14f3815b52..cbdd901695 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -336,7 +336,7 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (home-page "http://ugetdm.com/") + (home-page "https://ugetdm.com/") (synopsis "Universal download manager with GTK+ interface") (description "uGet is portable download manager with GTK+ interface supporting -- cgit 1.4.1 From b2d35dd9aeb3f6c566d53bfc9534abfd57860a51 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:19:47 +0200 Subject: gnu: uget: Update to 2.2.0. * gnu/packages/bittorrent.scm (uget): Update to 2.2.0. --- gnu/packages/bittorrent.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index cbdd901695..947537b231 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -314,15 +314,15 @@ Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.") (define-public uget (package (name "uget") - (version "2.0.8") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/urlget/" - "uget%20%28stable%29/" version "/uget-" - version ".tar.gz")) - (sha256 - (base32 - "0919cf7lfk1djdl003cahqjvafdliv7v2l8r5wg95n4isqggdk75")))) + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/urlget/" + "uget%20%28stable%29/" version "/uget-" + version ".tar.gz")) + (sha256 + (base32 "0rg2mr2cndxvnjib8zm5dp7y2hgbvnqkz2j2jmg0xlzfh9d34b2m")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit 1.4.1 From 0588668fa8ad226e965783240317286de8f77333 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:21:15 +0200 Subject: gnu: taskwarrior: Use HTTPS home page URI. * gnu/packages/task-management.scm (taskwarrior)[home-page]: Use HTTPS URI. --- gnu/packages/task-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index a0313c17c2..601a3616f7 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -52,7 +52,7 @@ (delete-file "src/cal") (delete-file "src/calendar") (delete-file "src/tw")))))) - (home-page "http://taskwarrior.org") + (home-page "https://taskwarrior.org") (synopsis "Command line task manager") (description "Taskwarrior is a command-line task manager following the Getting Things -- cgit 1.4.1 From 22e5a77af2be50cfa4744e5c11f625d264627fb8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:24:05 +0200 Subject: gnu: python2-renpy: Use HTTPS home page URI. * gnu/packages/game-development.scm (python2-renpy)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ac9c2ce864..188ff7d354 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1157,7 +1157,7 @@ developed mainly for Ren'py.") (native-inputs `(("python2-cython" ,python2-cython) ("xdg-utils" ,xdg-utils))) - (home-page "http://www.renpy.org/") + (home-page "https://www.renpy.org/") (synopsis "Ren'py python module") (description "This package contains the shared libraries and Python modules of Ren'py.") -- cgit 1.4.1 From 10052b7087a469451bf8ade979c472e5a40470a6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 25 May 2020 20:24:17 +0200 Subject: gnu: renpy: Use HTTPS home page URI. * gnu/packages/game-development.scm (renpy)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 188ff7d354..99c0711e1a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1345,7 +1345,7 @@ if __name__ == \"__main__\": ("xorg-server" ,xorg-server))) (outputs (list "out" "tutorial" "the-question")) - (home-page "http://www.renpy.org/") + (home-page "https://www.renpy.org/") (synopsis "Visual Novel Engine") (description "Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell interactive stories that run on computers and -- cgit 1.4.1 From 9be18877d5c9fe49feb317b9026d5d3a32d98779 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 25 May 2020 14:40:47 -0400 Subject: gnu: OBS: Update to 25.0.8. * gnu/packages/video.scm (obs): Update to 25.0.8. [inputs]: Add mbedtls-apache. [arguments]: Set the version string in #:configure-flags. --- gnu/packages/video.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1e36c6c313..152f356914 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2423,7 +2423,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "25.0.7") + (version "25.0.8") (source (origin (method git-fetch) (uri (git-reference @@ -2432,10 +2432,12 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "02ppkp1j5yxnxv663nz5wv4vbcg3k53l43xq94d1p1b3j4wxwq8b")))) + "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; no tests + `(#:tests? #f ; no test suite + #:configure-flags + (list (string-append "-DOBS_VERSION_OVERRIDE=" ,version)))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -2449,6 +2451,7 @@ be used for realtime video capture via Linux-specific APIs.") ("jansson" ,jansson) ("libx264" ,libx264) ("libxcomposite" ,libxcomposite) + ("mbedtls" ,mbedtls-apache) ("mesa" ,mesa) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) -- cgit 1.4.1 From 327452875a0a195e8fae1d51d22d807ce595ebd3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 20:54:09 +0300 Subject: gnu: tuir: Update to 1.29.0. * gnu/packages/syndication.scm (tuir): Update to 1.29.0. --- gnu/packages/syndication.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index acd7b63ef7..3d33ee521f 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -135,14 +135,14 @@ file system, and many more features.") (define-public tuir (package (name "tuir") - (version "1.28.3") + (version "1.29.0") (source (origin (method url-fetch) (uri (pypi-uri "tuir" version)) (sha256 (base32 - "1gpyjrl7jdfjq30m32nzh59ajv91gq19l93jjri2wsv5yrf90hdr")))) + "06xb030ibphbrz4nsxm8mh3g60ld8xfp6kc3j6vi1k4ls5s4h79i")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From fe95a0784c4d7ec1dc99fb1da1070f07aa40245d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 20:56:52 +0300 Subject: gnu: mpv-mpris: Update to 0.5. * gnu/packages/video.scm (mpv-mpris): Update to 0.5. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 152f356914..6529ae6507 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1530,7 +1530,7 @@ projects while introducing many more.") (define-public mpv-mpris (package (name "mpv-mpris") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -1540,7 +1540,7 @@ projects while introducing many more.") (file-name (git-file-name name version)) (sha256 (base32 - "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i")))) + "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit 1.4.1 From 80008f80d5b32c6cc8ae8187c45aad9f2e266ac0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 20:58:26 +0300 Subject: gnu: font-gnu-unifont: Update to 13.0.02. * gnu/packages/fonts.scm (font-gnu-unifont): Update to 13.0.02. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9284609373..b77aaca059 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -677,7 +677,7 @@ for use at smaller text sizes"))) (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "13.0.01") + (version "13.0.02") (source (origin (method url-fetch) @@ -687,7 +687,7 @@ for use at smaller text sizes"))) (string-append "mirror://gnu/unifont/unifont-" version "/unifont-" version ".tar.gz"))) (sha256 - (base32 "1svzm3xahb2m8r79ha9gb1z3zlckykx9d87cghswj7dxn9868j4b")))) + (base32 "1fg908qadh14kfbpzqfj3vgzlxgx68sdlwhl2prz7arq5r45dami")))) (build-system gnu-build-system) (outputs '("out" ; TrueType version "pcf" ; PCF (bitmap) version -- cgit 1.4.1 From 06df0f9fd9191c614485c1672ddb15156911e7f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:00:47 +0300 Subject: gnu: perl-cgi: Update to 4.47. * gnu/packages/web.scm (perl-cgi): Update to 4.47. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f6fab8f036..c7bea4c5ae 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2607,7 +2607,7 @@ development server with Starman.") (define-public perl-cgi (package (name "perl-cgi") - (version "4.46") + (version "4.47") (source (origin (method url-fetch) @@ -2615,7 +2615,7 @@ development server with Starman.") "CGI-" version ".tar.gz")) (sha256 (base32 - "16225vmdsfa2y7i1ydv7634nd0qxxb0ccwnfszjq58rwqgfri2bq")))) + "1a9cylhqsm5icvbg09m21nj0xx4zy5gbk4p74npm1ch3qlryzyyr")))) (build-system perl-build-system) (native-inputs `(("perl-test-deep" ,perl-test-deep) -- cgit 1.4.1 From d84ddbb9c7af66dd0edfd847f0260e9a5e48083b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:05:35 +0300 Subject: gnu: quazip: Update to 0.9.1. * gnu/packages/compression.scm (quazip): Update to 0.9.1. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d21d79962a..38adf35e33 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -1942,7 +1942,7 @@ download times, and other distribution and storage costs.") (define-public quazip (package (name "quazip") - (version "0.9") + (version "0.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -1951,7 +1951,7 @@ download times, and other distribution and storage costs.") (file-name (git-file-name name version)) (sha256 (base32 - "0psvf3d9akyyx3bckc9325nmbp97xiagf8la4vhca5xn2f430fbn")))) + "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no test -- cgit 1.4.1 From 46731db2431a21766c5fdfa74aca9bd61b7c41a2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:20:30 +0300 Subject: gnu: perl-io-tty: Update to 1.14. * gnu/packages/perl.scm (perl-io-tty): Update to 1.14. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 220519cde1..d0605f1b28 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5268,14 +5268,14 @@ filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines.") (define-public perl-io-tty (package (name "perl-io-tty") - (version "1.12") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-" version ".tar.gz")) (sha256 (base32 - "0399anjy3bc0w8xzsc3qx5vcyqryc9gc52lc7wh7i49hsdq8gvx2")))) + "1dcmxdhrapxvvzlfp6yzz7655f3c6x8jrw0md8ndp2qj27iy9wsi")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/IO-Tty") (synopsis "Perl interface to pseudo ttys") -- cgit 1.4.1 From 3e7d5cd399aa4fd832c8a767098ed3f597d2205f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:23:26 +0300 Subject: gnu: perl-timedate: Update to 2.33. * gnu/packages/perl.scm (perl-timedate): Update to 2.33. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index d0605f1b28..8b143ffde2 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10034,14 +10034,14 @@ still work as expected.") (define-public perl-timedate (package (name "perl-timedate") - (version "2.32") + (version "2.33") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/A/AT/ATOOMIC/" "TimeDate-" version ".tar.gz")) (sha256 - (base32 "1mmk9dy4a26a4d4c5rswqqhxr0295j93bjbcx91d3qkmwfcs1v1l")))) + (base32 "1cjyc0yi873597r7xcp9yz0l1c46ik2kxwfrn00zbrlx0d5rrdn0")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/TimeDate") (synopsis "Date parsing/formatting subroutines") -- cgit 1.4.1 From 062585711e324db35fff46592f8876ae00b6063b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:33:33 +0300 Subject: gnu: python-llfuse: Update to 1.3.6. * gnu/packages/python-xyz.scm (python-llfuse): Update to 1.3.6. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9aa5635ab8..efd92beb9f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7940,13 +7940,13 @@ should be stored on various operating systems.") (define-public python-llfuse (package (name "python-llfuse") - (version "1.3.5") + (version "1.3.6") (source (origin (method url-fetch) (uri (pypi-uri "llfuse" version ".tar.bz2")) (sha256 (base32 - "1n7a90jww3ly49fm7x27m3xw3la3qfrnykcakga654g6kcyjlhbf")))) + "1j9fzxpgmb4rxxyl9jcf84zvznhgi3hnh4hg5vb0qaslxkvng8ii")))) (build-system python-build-system) (inputs `(("fuse" ,fuse) -- cgit 1.4.1 From 6115ab1d2099b29097ac3c9988a82bb42a2c70aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:33:31 +0300 Subject: gnu: Add go-github-com-francoispqt-gojay. * gnu/packages/golang.scm (go-github-com-francoispqt-gojay): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3ae59ad2b7..8dd276562a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3141,6 +3141,31 @@ network protocol.") (home-page "https://github.com/lucas-clemente/quic-go") (license license:expat))) +(define-public go-github-com-francoispqt-gojay + (package + (name "go-github-com-francoispqt-gojay") + (version "1.2.13") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/francoispqt/gojay") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ix95qdyajfmxhf9y52vjrih63f181pjs4v5as8905s4d5vmkd06")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/francoispqt/gojay")) + (propagated-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (synopsis "JSON encoder/decoder with powerful stream API for Golang") + (description "GoJay is a performant JSON encoder/decoder for Golang. It has +a simple API and doesn't use reflection. It relies on small interfaces to +decode/encode structures and slices.") + (home-page "https://github.com/francoispqt/gojay") + (license license:expat))) + (define-public go-github-com-pkg-errors (package (name "go-github-com-pkg-errors") -- cgit 1.4.1 From e033700f17660ff936936cf89cc557b95d12bb13 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 16:04:33 +0200 Subject: tests: Hide quoted (define-module ...) form from Geiser. * tests/gexp.scm (%extension-package): Split (define-module ...) form to fool Geiser. --- tests/gexp.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/gexp.scm b/tests/gexp.scm index e073a7b816..20ef8d2648 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -78,7 +78,8 @@ (mkdir-p out) (call-with-output-file (string-append out "/hg2g.scm") (lambda (port) - (write '(define-module (hg2g) + (define defmod 'define-module) ;fool Geiser + (write `(,defmod (hg2g) #:export (the-answer)) port) (write '(define the-answer 42) port))))))))) -- cgit 1.4.1 From abf43d4511566e97f09049aa8b29453a2ed5ed16 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 16:06:03 +0200 Subject: gexp: Fix expansion for (file-append (local-file ...) ...). Fixes . Regression introduced in d03001a31a6d460b712825640dba11e3f1a53a14. * guix/gexp.scm (lower+expand-object): When LOWERED is not a struct and EXPAND is true, call EXPAND. * tests/gexp.scm ("file-append, raw store item"): New test. --- guix/gexp.scm | 4 +++- tests/gexp.scm | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 78b8af6fbc..9e193c76c4 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -270,7 +270,9 @@ expand to file names, but it's possible to expand to a plain data type." (if (not expand) (loop lowered (lookup-expander lowered)) (return (expand obj lowered output))) - (return lowered))))))) ;self-quoting + (if (not expand) ;self-quoting + (return lowered) + (return (expand obj lowered output))))))))) (define-syntax define-gexp-compiler (syntax-rules (=> compiler expander) diff --git a/tests/gexp.scm b/tests/gexp.scm index 20ef8d2648..1beeb67c21 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -285,6 +285,20 @@ (((thing "out")) (eq? thing file)))))) +(test-assert "file-append, raw store item" + (let* ((obj (plain-file "example.txt" "Hello!")) + (a (file-append obj "/a")) + (b (file-append a "/b")) + (c (file-append b "/c")) + (exp #~(list #$c)) + (item (run-with-store %store (lower-object obj))) + (lexp (run-with-store %store (lower-gexp exp)))) + (and (equal? (lowered-gexp-sexp lexp) + `(list ,(string-append item "/a/b/c"))) + (equal? (lowered-gexp-sources lexp) + (list item)) + (null? (lowered-gexp-inputs lexp))))) + (test-assertm "with-parameters for %current-system" (mlet* %store-monad ((system -> (match (%current-system) ("aarch64-linux" "x86_64-linux") -- cgit 1.4.1 From 8c23d7a15e90481f0b4ab2ba9bd178d68e7affaa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 17:24:54 +0200 Subject: doc: Remove one use of 'file-append*'. * doc/build.scm (texinfo-manual-source)[build]: Use 'file-append', not 'file-append*', for 'htmlxref.cnf', to ensure it has the right basename. --- doc/build.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/build.scm b/doc/build.scm index def4bdf18a..7256fb9bb5 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -141,7 +141,7 @@ as well as images, OS examples, and translations." (date->string date "~B ~Y") version version)))))) - (install-file #$(file-append* documentation "/htmlxref.cnf") + (install-file #$(file-append documentation "/htmlxref.cnf") #$output) (for-each (lambda (texi) -- cgit 1.4.1 From f408d8d636ac24d576e9ee91a6c823e0874386ef Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 17:33:04 +0200 Subject: self: Optimize 'file-append*' for 'local-file?'. * guix/self.scm (file-append*): Add 'local-file?' case. * guix/gexp.scm (local-file-select?): Export. --- guix/gexp.scm | 1 + guix/self.scm | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index 9e193c76c4..510a1d54c3 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -51,6 +51,7 @@ local-file-absolute-file-name local-file-name local-file-recursive? + local-file-select? plain-file plain-file? diff --git a/guix/self.scm b/guix/self.scm index a9568049b2..60fe6e6b01 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -213,7 +213,15 @@ record with the new file name." ;; itself. (local-file (string-append item "/" file) #:recursive? recursive?)) - ;; TODO: Add 'local-file?' case. + ((? local-file? base) + ;; Likewise, but with a . + (if (local-file-recursive? base) + (local-file (string-append (local-file-absolute-file-name base) + "/" file) + (basename file) + #:recursive? recursive? + #:select? (local-file-select? base)) + (file-append base file))) (_ ;; In this case, anything that refers to the result also depends on ITEM, ;; which isn't great. -- cgit 1.4.1 From 9e91983055e72f5f8380d9642d3495909c25e147 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Sun, 24 May 2020 17:23:59 +0200 Subject: gnu: qhull: Update to 2019.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (qhull): update to 2019.1 Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e62fb38086..dfc3729e48 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -227,15 +227,15 @@ programming languages.") (define-public qhull (package (name "qhull") - (version "2015.2") + (version "2019.1") (source (origin (method url-fetch) (uri (string-append "http://www.qhull.org/download/qhull-" (car (string-split version #\.)) - "-src-7.2.0.tgz")) + "-src-7.3.2.tgz")) (sha256 (base32 - "0dm4b2xr3asy6w74khq2zg4gf26zsy3qf9sq7pf7lmrvbj911c3q")))) + "1ys3vh3qq0v9lh452xb932vp63advds1pxk42lk7cc1niiar0y9b")))) (build-system cmake-build-system) (synopsis "Calculate convex hulls and related structures") (description -- cgit 1.4.1 From 2c402b1a156f13e6377671c1d0eb4437806b96ea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 22:58:31 +0200 Subject: gexp: The result of 'imported-files/derivation' is non-substitutable. * guix/gexp.scm (imported-files/derivation): Pass #:substitutable? #f to 'gexp->derivation'. --- guix/gexp.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/gexp.scm b/guix/gexp.scm index 510a1d54c3..67b6121313 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1443,6 +1443,7 @@ to the source files instead of copying them." #:system system #:guile-for-build guile #:local-build? #t + #:substitutable? #f ;; Avoid deprecation warnings about the use of the _IO* ;; constants in (guix build utils). -- cgit 1.4.1 From 49143297fcf4b2ca1172924f25137b08b0eecf58 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 22:59:22 +0200 Subject: compile: Do not optimize "gnu/tests/*". * guix/build/compile.scm (optimization-options): Add "gnu/tests/" to level 0. --- guix/build/compile.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/compile.scm b/guix/build/compile.scm index 63f24fa7d4..ea7e1d2d03 100644 --- a/guix/build/compile.scm +++ b/guix/build/compile.scm @@ -98,7 +98,8 @@ (define (override-option option value lst) `(,option ,value ,@(strip-option option lst))) - (cond ((string-contains file "gnu/packages/") + (cond ((or (string-contains file "gnu/packages/") + (string-contains file "gnu/tests/")) ;; Level 0 is good enough but partial evaluation helps preserve the ;; "macro writer's bill of rights". (override-option #:partial-eval? #t -- cgit 1.4.1 From a1a3bd5f1f9819fd8183a1c5c45c7c02952576da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 May 2020 23:02:09 +0200 Subject: maint: 'authenticate' depends on a couple of .go files. * Makefile.am (authenticate): Add dependency on guix/{git,openpgp}.go. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3113e6b042..5b64386b53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -632,7 +632,7 @@ commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac # Authenticate the current Git checkout by checking signatures on every commit # starting from $(commit_v1_0_1). -authenticate: +authenticate: guix/openpgp.go guix/git.go $(AM_V_at)echo "Authenticating Git checkout..." ; \ "$(top_builddir)/pre-inst-env" $(GUILE) \ --no-auto-compile -e git-authenticate \ -- cgit 1.4.1 From 1bbf7e137dd4e72d6d673e9842c5b3492aa6d25f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 25 May 2020 18:00:55 -0400 Subject: gnu: wxmaxima: Update to 20.04.0. * gnu/packages/maths.scm (wxmaxima): Update to 20.04.0. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index dfc3729e48..3424aaa15e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3183,7 +3183,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "20.03.1") + (version "20.04.0") (source (origin (method git-fetch) @@ -3192,7 +3192,7 @@ point numbers.") (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "09ciip0wkahps5jdsqqr72bwjrd15bacw38zp23v3hm71xfk8hky")))) + (base32 "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From dd070af55cd834e19348bc45aec3aa955ff42388 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:06:27 +0200 Subject: gnu: nethogs: Update to 0.8.6. * gnu/packages/networking.scm (nethogs): Update to 0.8.6. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f106d2bf72..0b6c6e7353 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1723,14 +1723,14 @@ the bandwidth, loss, and other parameters.") (define-public nethogs (package (name "nethogs") - (version "0.8.5") + (version "0.8.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/raboof/nethogs/archive/v" version ".tar.gz")) (sha256 (base32 - "1k4x8r7s4dgcb6n2rjn28h2yyij92mwm69phncl3597cdxr954va")) + "1875q9hx48g68pika7n51an879v3s10ir4sf95z6ggnl6m91sz1i")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (inputs @@ -1741,7 +1741,7 @@ the bandwidth, loss, and other parameters.") ,(string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No ./configure script. + (delete 'configure)))) ; no ./configure script. (home-page "https://github.com/raboof/nethogs") (synopsis "Per-process bandwidth monitor") (description "NetHogs is a small 'net top' tool for Linux. Instead of -- cgit 1.4.1 From 52dd58b56dbcc7610a26275fe9782151d664bb68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:08:41 +0200 Subject: gnu: nethogs: Don't use unstable tarball. * gnu/packages/networking.scm (nethogs)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Don't try (and fail) to determine the version using git. --- gnu/packages/networking.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0b6c6e7353..9f7548db9a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1724,21 +1724,23 @@ the bandwidth, loss, and other parameters.") (package (name "nethogs") (version "0.8.6") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/raboof/nethogs/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "1875q9hx48g68pika7n51an879v3s10ir4sf95z6ggnl6m91sz1i")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/raboof/nethogs") + (commit (string-append "v" version)))) + (sha256 + (base32 "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("libpcap" ,libpcap) ("ncurses" ,ncurses))) (arguments `(#:make-flags `("CC=gcc" - ,(string-append "PREFIX=" %output)) + ,(string-append "PREFIX=" %output) + ,(string-append "VERSION=" ,version)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no ./configure script. -- cgit 1.4.1 From 3102e8d37cbc77871e920e5328fa0045f09bf20b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:10:38 +0200 Subject: gnu: nethogs: Migrate to HASH. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (nethogs)[source]: Migrate to… : …this I guess. --- gnu/packages/networking.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 9f7548db9a..617d7d6883 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1730,8 +1730,9 @@ the bandwidth, loss, and other parameters.") (uri (git-reference (url "https://github.com/raboof/nethogs") (commit (string-append "v" version)))) - (sha256 - (base32 "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9")) + (hash + (content-hash "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9" + sha256)) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From e8c1e27f8ea87bb3b401b4f37457533a562fbe66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:12:58 +0200 Subject: gnu: balsa: Update to 2.6.1. * gnu/packages/mail.scm (balsa): Update to 2.6.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8e72edc221..c374084e80 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2762,14 +2762,14 @@ tools and applications: (define-public balsa (package (name "balsa") - (version "2.6.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (string-append "https://pawsa.fedorapeople.org/balsa/" name "-" version ".tar.bz2")) (sha256 - (base32 "0ycidvgy9npd6avxk88sf2ca609m7zb0hzrk1yajrgwb1rfqx68a")))) + (base32 "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 8f3f2c9b1bf594392930094065666d901c774e7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:13:01 +0200 Subject: gnu: balsa: Don't use NAME in source URI. * gnu/packages/mail.scm (balsa)[source]: Hard-code NAME. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c374084e80..101dcf52b4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2767,7 +2767,7 @@ tools and applications: (origin (method url-fetch) (uri (string-append "https://pawsa.fedorapeople.org/balsa/" - name "-" version ".tar.bz2")) + "balsa-" version ".tar.bz2")) (sha256 (base32 "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4")))) (build-system gnu-build-system) -- cgit 1.4.1 From a9ef542552815e5509a55115154ea91fbb929031 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:16:37 +0200 Subject: gnu: fetchmail: Update to 6.4.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (fetchmail): Update to 6.4.5. [arguments]: Remove obsolete ‘create-test-environment’ phase. --- gnu/packages/mail.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 101dcf52b4..1a01393cf4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -347,7 +347,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.1") + (version "6.4.5") (source (origin (method url-fetch) @@ -355,21 +355,14 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "1859wvfc9fq72mwp4njdiy0x89hnddlfr3nix71qqglcs0fz2crz")))) + (base32 "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) (arguments `(#:configure-flags (list (string-append "--with-ssl=" - (assoc-ref %build-inputs "openssl"))) - #:phases - (modify-phases %standard-phases - (add-before 'check 'create-test-environment - (lambda _ - ;; Fix ‘Cannot find absolute path for user's home directory’. - (setenv "HOME" "/tmp") - #t))))) + (assoc-ref %build-inputs "openssl"))))) (home-page "https://www.fetchmail.info/") (synopsis "Remote-mail retrieval and forwarding utility") (description -- cgit 1.4.1 From ebe9d865dde17ceecdafe8e000ff88542d47a344 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:46:46 +0200 Subject: gnu: cutter: Update to 1.10.3. * gnu/packages/engineering.scm (cutter): Update to 1.10.3. --- gnu/packages/engineering.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index be86848538..07f4d0cf96 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2175,7 +2175,7 @@ simulation.") (define-public cutter (package (name "cutter") - (version "1.10.1") + (version "1.10.3") (source (origin (method git-fetch) @@ -2184,8 +2184,7 @@ simulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3")))) + (base32 "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk")))) (build-system gnu-build-system) (arguments `(#:phases @@ -2194,8 +2193,8 @@ simulation.") (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (radare2 (assoc-ref inputs "radare2"))) - ;; fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib - ;; override `qmake PREFIX=` + ;; Fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib + ;; override `qmake PREFIX=`. (substitute* "./src/lib_radare2.pri" (("PREFIX") "R2PREFIX") (("R2PREFIX=/usr") (string-append "R2PREFIX=" radare2))) -- cgit 1.4.1 From 403aa3aaf248703f0c9faeec6d4a99171a5cd371 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:02:50 +0200 Subject: gnu: mc: Update to 4.8.24. * gnu/packages/mc.scm (mc): Update to 4.8.24. [source]: Use HTTPS. --- gnu/packages/mc.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm index 8ff4759127..56e563a132 100644 --- a/gnu/packages/mc.scm +++ b/gnu/packages/mc.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,14 +37,14 @@ (define-public mc (package (name "mc") - (version "4.8.23") + (version "4.8.24") (source (origin (method url-fetch) - (uri (string-append "http://ftp.midnight-commander.org/mc-" + (uri (string-append "https://ftp.midnight-commander.org/mc-" version ".tar.xz")) (sha256 - (base32 "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx")))) + (base32 "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl))) -- cgit 1.4.1 From 02d32b198268ed15928fa2f8a9379ada86fb13e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:04:45 +0200 Subject: gnu: mutt: Update to 1.14.2. * gnu/packages/mail.scm (mutt): Update to 1.14.2. --- gnu/packages/mail.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1a01393cf4..fa0b22cd9c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -382,7 +382,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.13.5") + (version "1.14.2") (source (origin (method url-fetch) (uri (list @@ -392,7 +392,7 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc")) + "0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs @@ -416,8 +416,8 @@ aliasing facilities to work just as they would on normal mail.") "--with-sasl" "--with-sqlite3" ; required for Autocrypt "--with-idn2" ; recommended for Autocrypt - ;; so that mutt does not check whether the path - ;; exists, which it does not in the chroot + ;; So that mutt does not check whether the path + ;; exists, which it does not in the chroot. "--with-mailpath=/var/mail"))) (home-page "http://www.mutt.org/") (synopsis "Mail client") -- cgit 1.4.1 From ba40c10be712d10a0566409954285c5f7405f0d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:11:30 +0200 Subject: gnu: batctl: Update to 2020.1. * gnu/packages/networking.scm (batctl): Update to 2020.1. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 617d7d6883..81d58d15e7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2900,14 +2900,14 @@ maximum extent possible.") (define-public batctl (package (name "batctl") - (version "2020.0") + (version "2020.1") (source (origin (method url-fetch) (uri (string-append "https://downloads.open-mesh.org/batman/releases/batman-adv-" version "/batctl-" version ".tar.gz")) (sha256 - (base32 "01414ywhlb2b9ng9d5kd5rr1s7wzvi234j8hj6ra2spn92qykvv0")))) + (base32 "0fy252q1my3a57v6pfz8i97h6zv7v03di01dhwjkj47pqnx1rqm3")))) (inputs `(("libnl" ,libnl))) (native-inputs -- cgit 1.4.1 From 91982acc4fd6a36c5c53bd313e3c916a914e46ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:13:28 +0200 Subject: gnu: haproxy: Update to 2.1.4. * gnu/packages/networking.scm (haproxy): Update to 2.1.4. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 81d58d15e7..b0c1440fd3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3102,7 +3102,7 @@ cables.") (define-public haproxy (package (name "haproxy") - (version "2.1.3") + (version "2.1.4") (source (origin (method url-fetch) (uri (string-append "https://www.haproxy.org/download/" @@ -3110,7 +3110,7 @@ cables.") "/src/haproxy-" version ".tar.gz")) (sha256 (base32 - "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv")))) + "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 6302b5dafe74aeb17f447af0c76c0afb6888a747 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:18:22 +0200 Subject: gnu: nfs-utils: Update to 2.4.3. * gnu/packages/nfs.scm (nfs-utils): Update to 2.4.3. --- gnu/packages/nfs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index 45ed181b03..f3015ef79a 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,7 +46,7 @@ (define-public nfs-utils (package (name "nfs-utils") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (string-append @@ -53,7 +54,7 @@ "/nfs-utils-" version ".tar.xz")) (sha256 (base32 - "0f0hm8jq1p5gra55v621qpbb3mryakaikzpy5znkvxym0dx76r24")))) + "16b5y82cjy1cvijg5zmdvivc6sfdlv2slyynxbwwyw43vpjzqrdg")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 91ef7e174215895e849db995ced77e92de41bf93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:20:22 +0200 Subject: gnu: scrot: Update to 1.3. * gnu/packages/xdisorg.scm (scrot): Update to 1.3. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index b717b36aed..fec7b9a4ee 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -616,7 +616,7 @@ move windows, switch between desktops, etc.).") (define-public scrot (package (name "scrot") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) @@ -626,7 +626,7 @@ move windows, switch between desktops, etc.).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w")))) + (base32 "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit 1.4.1 From c59c04d3b949577e7394daf3ec771de1c7339d0d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 23:23:38 +0200 Subject: gnu: xbanish: Update to 1.7. * gnu/packages/xdisorg.scm (xbanish): Update to 1.7. --- gnu/packages/xdisorg.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index fec7b9a4ee..5e4e275073 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -794,7 +794,7 @@ to find buttons, etc, on the screen to click on.") (define-public xbanish (package (name "xbanish") - (version "1.6") + (version "1.7") (home-page "https://github.com/jcs/xbanish") (source (origin (method git-fetch) @@ -803,14 +803,14 @@ to find buttons, etc, on the screen to click on.") (file-name (git-file-name name version)) (sha256 (base32 - "0vp8ja68hpmqkl61zyjar3czhmny1hbm74m8f393incfz1ymr3i8")))) + "0ic5f7zgc32p5g1wxas9y5h8dhik0pvsa8wmn6skdry56gw9vg9q")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no tests + `(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure)))) ; no configure script (inputs `(("libx11" ,libx11) ("libxfixes" ,libxfixes) -- cgit 1.4.1 From 3dfb21f0d7fcdca0ec7f16029cbc5a63460664f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:34:20 +0200 Subject: gnu: lxappearance: Update to 0.6.3. * gnu/packages/lxde.scm (lxappearance): Update to 0.6.3. --- gnu/packages/lxde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 14c4120d05..b9b78a1887 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Brendan Tildesley -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 ison ;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Ricardo Wurmus @@ -104,14 +104,14 @@ libFM file management library."))) (define-public lxappearance (package (name "lxappearance") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lxde/" "LXAppearance/" name "-" version ".tar.xz")) (sha256 (base32 - "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4")))) + "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2))) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From cbec994ddef92cac0a6fd3640d443437b4ab3935 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:34:47 +0200 Subject: gnu: lxappearance: Don't use NAME in source URI. * gnu/packages/lxde.scm (lxappearance)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index b9b78a1887..55605a0d5f 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -105,13 +105,13 @@ libFM file management library."))) (package (name "lxappearance") (version "0.6.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/lxde/" - "LXAppearance/" name "-" version ".tar.xz")) - (sha256 - (base32 - "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/lxde/" + "LXAppearance/lxappearance-" version ".tar.xz")) + (sha256 + (base32 "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2))) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From 53bd021f1b3ff78150e75af28b13b2da08af6d36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:39:47 +0200 Subject: gnu: lxsession: Update to 0.5.5. * gnu/packages/lxde.scm (lxsession): Update to 0.5.5. [source]: Remove upstreamed patch. * gnu/packages/patches/lxsession-use-gapplication.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/lxde.scm | 8 +- .../patches/lxsession-use-gapplication.patch | 152 --------------------- 3 files changed, 4 insertions(+), 157 deletions(-) delete mode 100644 gnu/packages/patches/lxsession-use-gapplication.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6095c69085..dc3e880603 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1233,7 +1233,6 @@ dist_patch_DATA = \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ - %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 55605a0d5f..efd6c39453 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -518,16 +518,14 @@ in LXDE.") (define-public lxsession (package (name "lxsession") - (version "0.5.3") + (version "0.5.5") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/lxde/" name "-" version ".tar.xz")) - (patches (search-patches "lxsession-use-gapplication.patch")) (sha256 - (base32 - "1a0zmyywwzdh59nc0l94cir18vhp633z4q2xfhn5zx11ajj45gwh")) + (base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4")) (modules '((guix build utils))) (snippet ;; Remove C files generated by Vala so we can build from source. @@ -560,6 +558,8 @@ in LXDE.") ("intltool" ,intltool) ("docbook-xsl" ,docbook-xsl) ("vala" ,vala) + + ;; For bootstrapping. ("autoconf" ,autoconf) ("automake" ,automake))) (synopsis "Lightweight X11 session manager") diff --git a/gnu/packages/patches/lxsession-use-gapplication.patch b/gnu/packages/patches/lxsession-use-gapplication.patch deleted file mode 100644 index 3f2269a42f..0000000000 --- a/gnu/packages/patches/lxsession-use-gapplication.patch +++ /dev/null @@ -1,152 +0,0 @@ -Upstream patch to remove libunique dependency, and use glib >= 2.28.0 -to handle unique apps both for GTK+ 2 and 3. -https://sourceforge.net/p/lxde/patches/539/ - - -From a7d3b40a79a7a16c1f5d50d2bd466570258dae29 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= -Date: Sun, 22 Jan 2017 01:09:59 +0100 -Subject: [PATCH] Use GApplication for unique app handling - -Remove libunique dependency, and use glib >= 2.28.0 to handle unique apps both for GTK+ 2 and 3. ---- - Makefile.am | 6 ------ - configure.ac | 7 +------ - lxclipboard/main.vala | 16 +--------------- - lxpolkit/main.vala | 16 +--------------- - 4 files changed, 3 insertions(+), 42 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index c2e1fe8..e3a3b97 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -90,9 +90,6 @@ if USE_GTK3 - lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK3 - else - lxclipboard_lxclipboard_VALAFLAGS += --define USE_GTK2 --lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0 --lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS) --lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS) - endif - - lxpolkit_lxpolkit_vala_SOURCES = \ -@@ -137,9 +134,6 @@ if USE_GTK3 - lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK3 - else - lxpolkit_lxpolkit_VALAFLAGS += --define USE_GTK2 --lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0 --lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS) --lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS) - endif - - lxsession_db_lxsession_db_SOURCES = \ -diff --git a/configure.ac b/configure.ac -index 06ddbb3..9126f4d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -45,7 +45,7 @@ PKG_CHECK_MODULES(X11, [x11]) - AC_SUBST(X11_CFLAGS) - AC_SUBST(X11_LIBS) - --PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0]) -+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28.0]) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - -@@ -79,11 +79,6 @@ else - CFLAGS="$CFLAGS -D USE_GTK2" - gtk_modules="gtk+-2.0 >= 2.6.0" - VALA_GTK_LIBS="gtk+-2.0" -- -- PKG_CHECK_MODULES(UNIQUE, [unique-1.0]) -- AC_SUBST(UNIQUE_CFLAGS) -- AC_SUBST(UNIQUE_LIBS) -- - fi - PKG_CHECK_MODULES(GTK, [$gtk_modules]) - AC_SUBST(GTK_CFLAGS) -diff --git a/lxclipboard/main.vala b/lxclipboard/main.vala -index bee4044..3d4a8d7 100644 ---- a/lxclipboard/main.vala -+++ b/lxclipboard/main.vala -@@ -17,9 +17,6 @@ - * MA 02110-1301, USA. - */ - using Gtk; --#if USE_GTK2 --using Unique; --#endif - - namespace Lxsession - { -@@ -28,17 +25,7 @@ namespace Lxsession - public static int main(string[] args) - { - Gtk.init (ref args); --#if USE_GTK2 -- Unique.App app = new Unique.App("org.lxde.lxclipboard", null); -- -- if(app.is_running) -- { -- message("lxclipboard is already running. Existing"); -- return 0; -- } --#endif --# if USE_GTK3 -- Gtk.Application app = new Gtk.Application ( -+ GLib.Application app = new GLib.Application ( - "org.lxde.lxclipboard", - GLib.ApplicationFlags.FLAGS_NONE); - app.register (); -@@ -48,7 +35,6 @@ namespace Lxsession - message("lxclipboard is already running. Existing"); - return 0; - } --#endif - - clipboard_start (); - -diff --git a/lxpolkit/main.vala b/lxpolkit/main.vala -index c0d6ae2..50c3cb7 100644 ---- a/lxpolkit/main.vala -+++ b/lxpolkit/main.vala -@@ -17,9 +17,6 @@ - * MA 02110-1301, USA. - */ - using Gtk; --#if USE_GTK2 --using Unique; --#endif - - const string GETTEXT_PACKAGE = "lxsession"; - -@@ -33,17 +30,7 @@ namespace Lxsession - Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "utf-8"); - - Gtk.init (ref args); --#if USE_GTK2 -- Unique.App app = new Unique.App("org.lxde.lxpolkit", null); -- -- if(app.is_running) -- { -- message(_("lxpolkit is already running. Existing")); -- return 0; -- } --#endif --# if USE_GTK3 -- Gtk.Application app = new Gtk.Application ( -+ GLib.Application app = new GLib.Application ( - "org.lxde.lxpolkit", - GLib.ApplicationFlags.FLAGS_NONE); - app.register (); -@@ -53,7 +40,6 @@ namespace Lxsession - message(_("lxpolkit is already running. Existing")); - return 0; - } --#endif - - policykit_agent_init(); - --- -2.11.0 - -- cgit 1.4.1 From 00c63b8d9dd264b930deeb496713ebce7d2bace2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:40:36 +0200 Subject: gnu: lxsession: Don't use NAME in source URI. * gnu/packages/lxde.scm (lxsession)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index efd6c39453..e2171da19f 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -523,7 +523,7 @@ in LXDE.") (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/lxde/" - name "-" version ".tar.xz")) + "lxsession-" version ".tar.xz")) (sha256 (base32 "0imv9nysip1j9lrb2z96kl05isjgp312323wnnd5b59h0ff0sgp4")) (modules '((guix build utils))) -- cgit 1.4.1 From 46b02378f07250caa09a3bc690014724956e1a4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:44:45 +0200 Subject: gnu: lxpanel: Update to 0.10.0. * gnu/packages/lxde.scm (lxpanel): Update to 0.10.0. [inputs]: Add curl. --- gnu/packages/lxde.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index e2171da19f..0317d9ddc7 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages curl) #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages file-systems) @@ -571,15 +572,14 @@ in LXDE.") (define-public lxpanel (package (name "lxpanel") - (version "0.9.3") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/lxde/" name "-" version ".tar.xz")) (sha256 - (base32 - "1ccgv7jgl3y865cpb6w7baaz7468fxncm83bqxlwyni5bwhglb1l")))) + (base32 "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26")))) (build-system gnu-build-system) (arguments `(#:phases @@ -594,7 +594,8 @@ in LXDE.") #t)))))) (inputs ;; TODO: libindicator-0.3.0 - `(("gtk+-2" ,gtk+-2) + `(("curl" ,curl) + ("gtk+-2" ,gtk+-2) ("alsa-lib" ,alsa-lib) ("libwnck-2" ,libwnck-2) ("keybinder" ,keybinder) -- cgit 1.4.1 From 4f3e8733f90a8ec943a4b387a27e4002cdd2f324 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:45:00 +0200 Subject: gnu: lxpanel: Don't use NAME in source URI. * gnu/packages/lxde.scm (lxpanel)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 0317d9ddc7..c5eb3965ad 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -577,7 +577,7 @@ in LXDE.") (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/lxde/" - name "-" version ".tar.xz")) + "lxpanel-" version ".tar.xz")) (sha256 (base32 "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26")))) (build-system gnu-build-system) -- cgit 1.4.1 From 85343f4978cf68c5239f72fd81b30f6bb1e5ea0e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:46:44 +0200 Subject: gnu: lxrandr: Update to 0.3.2. * gnu/packages/lxde.scm (lxrandr): Update to 0.3.2. --- gnu/packages/lxde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index c5eb3965ad..1a1e254c79 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -126,7 +126,7 @@ able to change themes, icons, and fonts used by GTK+ applications.") (define-public lxrandr (package (name "lxrandr") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lxde/LXRandR" @@ -135,7 +135,7 @@ able to change themes, icons, and fonts used by GTK+ applications.") name "-" version ".tar.xz")) (sha256 (base32 - "0khqi42paqg82jllb2kza4arf3fafzgq90fhyr3rw3d9hn23763d")))) + "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2))) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From 4fa75903fc4146e3f2c94ba7bb1304229c2d413a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 19:47:13 +0200 Subject: gnu: lxrandr: Don't use NAME in source URI. * gnu/packages/lxde.scm (lxrandr)[source]: Hard-code NAME. --- gnu/packages/lxde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 1a1e254c79..fbf32bf337 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -132,7 +132,7 @@ able to change themes, icons, and fonts used by GTK+ applications.") (uri (string-append "mirror://sourceforge/lxde/LXRandR" "%20%28monitor%20config%20tool%29/LXRandR%20" (version-major+minor version) ".x/" - name "-" version ".tar.xz")) + "lxrandr-" version ".tar.xz")) (sha256 (base32 "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb")))) -- cgit 1.4.1 From b5c6264188e8071a2ee521eb0257b3d9d34bffeb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 20:51:02 +0200 Subject: gnu: radare2: Remove pointless configure flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (radare2)[arguments]: Remove unrecognised ‘--without-nonpic’ from #:configure-flags. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 07f4d0cf96..6628a45482 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1364,8 +1364,8 @@ bindings for Python, Java, OCaml and more.") (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) #t))) #:configure-flags - (list "--with-sysmagic" "--with-syszip" "--with-openssl" - "--without-nonpic" "--with-rpath" "--with-syscapstone") + (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" + "--with-openssl" "--with-rpath") #:make-flags (list "CC=gcc"))) (inputs -- cgit 1.4.1 From 655a0c65be6b3653c61310e730d5128670ffa5b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 20:52:39 +0200 Subject: gnu: radare2: Use OUTPUTS keyword. * gnu/packages/engineering.scm (radare2)[arguments]: Substitute OUTPUTS for %OUTPUTS. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6628a45482..9132743626 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1360,8 +1360,8 @@ bindings for Python, Java, OCaml and more.") #:phases (modify-phases %standard-phases (add-before 'configure 'mklibdir - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) + (lambda* (#:key inputs outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) #t))) #:configure-flags (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" -- cgit 1.4.1 From 6454e5ac500264babc9df669885568d13f08be1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:16:11 +0200 Subject: gnu: radare2: Remove impotent snippet. * gnu/packages/engineering.scm (radare2)[source]: Remove a snippet that does nothing. --- gnu/packages/engineering.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9132743626..a46f244469 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1343,17 +1343,7 @@ bindings for Python, Java, OCaml and more.") (sha256 (base32 "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "libr/asm/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - (substitute* "libr/parse/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - (substitute* "libr/bin/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - #t)))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:tests? #f ; tests require git and network access -- cgit 1.4.1 From d01269d251ebdc4417374ea817f406c4ecd004a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:16:29 +0200 Subject: gnu: radare2: Update to 4.4.0. * gnu/packages/engineering.scm (radare2): Update to 4.4.0. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a46f244469..3653f10aeb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1334,7 +1334,7 @@ bindings for Python, Java, OCaml and more.") (define-public radare2 (package (name "radare2") - (version "4.2.1") + (version "4.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -1342,7 +1342,7 @@ bindings for Python, Java, OCaml and more.") (commit version))) (sha256 (base32 - "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg")) + "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 95fd14df34660b09033df65e0c4740b8996224ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 10:01:58 +0200 Subject: gnu: pianobar: Build with the default C standard. * gnu/packages/music.scm (pianobar)[arguments]: Remove CFLAGS from #:make-flags. --- gnu/packages/music.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9f30caf7af..2c6be8eba8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2718,8 +2718,7 @@ tune-in sender list from @url{http://opml.radiotime.com}.") (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags (list "CC=gcc" "CFLAGS=-std=c99" - (string-append "PREFIX=" %output)) + #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs -- cgit 1.4.1 From 03ed699159a47f7c6de2c3e9713bf8facf70554e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:25:44 +0200 Subject: gnu: perl-time-mock: Do not use "v" in version string. * gnu/packages/perl.scm (perl-time-mock)[version]: Remove "v" prefix. [source](uri): Adjust accordingly. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8b143ffde2..7064e7fde1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10052,12 +10052,12 @@ time values and formatting dates into ASCII strings.") (define-public perl-time-mock (package (name "perl-time-mock") - (version "v0.0.2") + (version "0.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EW/EWILHELM/" - "Time-Mock-" version ".tar.gz")) + "Time-Mock-v" version ".tar.gz")) (sha256 (base32 "0bwqyg8z98m8cjw1qcm4wg502n225k33j2fp8ywxkgfjdd1zgllv")))) -- cgit 1.4.1 From 3e5446e75255552a18379e7b6783355536fd7a21 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:27:10 +0200 Subject: gnu: perl-file-find-object: Do not use "v" prefix in version string. * gnu/packages/perl.scm (perl-file-find-object)[version]: Remove "v" prefix. [source](uri): Adjust accordingly. --- gnu/packages/perl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7064e7fde1..b98bc5417a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10790,14 +10790,13 @@ such that being individual extensions would be wasteful.") (define-public perl-file-find-object (package (name "perl-file-find-object") - (version "v0.2.13") + (version "0.2.13") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-" - version - ".tar.gz")) + "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-v" + version ".tar.gz")) (sha256 (base32 "0gf13b76b824s73r5rp00v8xrd6dnb5yi5jjavfc394scqv6ldh4")))) -- cgit 1.4.1 From 9d7ecf1c82a4854e34d635381209d87d1ab37bb0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:27:45 +0200 Subject: gnu: perl-getopt-long: Do not use "v" prefix in version string. * gnu/packages/perl.scm (perl-getopt-long)[version]: Remove "v" prefix. [source](uri): Adjust accordingly. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b98bc5417a..e7d4ce8392 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4786,12 +4786,12 @@ back to a full directory scan if none of these are available.") (define-public perl-getopt-long (package (name "perl-getopt-long") - (version "v2.49.1") + (version "2.49.1") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/J/JV/JV/" - "Getopt-Long-" (substring version 1) ".tar.gz")) + "Getopt-Long-v" (substring version 1) ".tar.gz")) (sha256 (base32 "0bw8gbhj8s5gmkqvs3m7pk9arqhgqssrby4yimh29ah9alix9ylq")))) -- cgit 1.4.1 From 9da87078417bb16ad82652a7d2efd72185c28220 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 May 2020 13:32:53 +0200 Subject: gnu: emacsy-minimal: Do not use "v" prefix in version string. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (emacsy-minimal): Turn COMMIT binding into a "git describe" string. [version]: Drop first character of COMMIT. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8dfce091ef..8225604a0f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2872,11 +2872,11 @@ in C using Gtk+-3 and WebKitGtk.") (license license:gpl3+))) (define-public emacsy-minimal - (let ((commit "d459ca1d3d09e7624e662bc4cfc3596850796fc6")) + (let ((commit "v0.4.1-28-gd459ca1")) (package (inherit emacsy) (name "emacsy-minimal") - (version (git-version "v0.4.1" "28" commit)) + (version (string-drop commit 1)) (source (origin (method git-fetch) (uri (git-reference -- cgit 1.4.1 From c1f3382e6f742ca17513e019e860bbc45f38f83c Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 18:05:29 +0200 Subject: gnu: Add dump. * gnu/packages/backup.scm (dump): New variable. Signed-off-by: Marius Bakke --- gnu/packages/backup.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0fe6676cc2..e79fe4a85e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -1026,6 +1027,42 @@ stored previously can be read back in full at any time. The program is format-agnostic, so you can feed virtually any files to it.") (license license:gpl2+))) +(define-public dump + (package + (name "dump") + (version "0.4b46") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/dump/dump/" + version "/dump-" version ".tar.gz")) + (sha256 + (base32 + "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + `("--sysconfdir=/etc" + "--disable-readline" + "--disable-rmt"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("openssl" ,openssl-1.0) + ("zlib" ,zlib) + ("util-linux" ,util-linux "lib") + ("e2fsprogs" ,e2fsprogs))) + (home-page "https://dump.sourceforge.io/") + (synopsis "Ext2/3/4 filesystem dump/restore utilities") + (description "Dump examines files in a filesystem, determines which ones +need to be backed up, and copies those files to a specified disk, tape or +other storage medium. Subsequent incremental backups can then be layered on +top of the full backup. The restore command performs the inverse function of +dump; it can restore a full backup of a filesystem. Single files and +directory subtrees may also be restored from full or partial backups in +interractive mode.") + (license license:bsd-3))) + (define-public burp (package (name "burp") -- cgit 1.4.1 From dd003125f72c0e7d6e1f10b7ccd7969fe674c9c1 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Mon, 25 May 2020 13:24:10 +0200 Subject: gnu: python-iml: Use HTTPS home page. * gnu/packages/machine-learning.scm (python-iml)[home-page]: s/http/https/ Signed-off-by: Marius Bakke --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index cf00a84e86..1b678d3d20 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1821,7 +1821,7 @@ advanced research.") ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) - (home-page "http://github.com/interpretable-ml/iml") + (home-page "https://github.com/interpretable-ml/iml") (synopsis "Interpretable Machine Learning (iML) package") (description "Interpretable ML (iML) is a set of data type objects, visualizations, and interfaces that can be used by any method designed to -- cgit 1.4.1 From d79c917f2dd7550c6737fede49c77679f0a83770 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Mon, 25 May 2020 13:27:37 +0200 Subject: gnu: Add python-pytest-pycodestyle. * gnu/packages/python-check.scm (python-pytest-pycodestyle): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-check.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 22b9ea8df5..1071abdbad 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Edouard Klein ;;; ;;; This file is part of GNU Guix. ;;; @@ -337,6 +338,28 @@ testing framework.") framework.") (license license:expat))) +(define-public python-pytest-pycodestyle + (package + (name "python-pytest-pycodestyle") + (version "2.0.0") ;later versions require python-pytest~=5.4 + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-pycodestyle" version)) + (sha256 + (base32 + "02i5gl7pm9cwxk15sn29inz3n8flpj1r3p1l110h43f2na5w8h7z")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pycodestyle" ,python-pycodestyle))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/henry0312/pytest-pycodestyle") + (synopsis "Pytest plugin to run pycodestyle") + (description "This package provides a plugin to run @code{pycodestyle} +for the @code{pytest} framework.") + (license license:expat))) + (define-public python-codacy-coverage (package (name "python-codacy-coverage") -- cgit 1.4.1 From 0321c6ebeae35709cde65b2dccd0a3a6a5d6aeee Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 25 May 2020 15:39:10 -0700 Subject: gnu: diffoscope: Update to 145. * gnu/packages/diffoscope (diffoscope): Update to 145. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 1df8552a30..0c780932eb 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -70,7 +70,7 @@ #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "143")) + (let ((version "145")) (package (name "diffoscope") (version version) @@ -82,7 +82,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0j58dqdk8ln8y0bcnfy37ljs37nkl56lzxqns396300ysln0qiwm")))) + "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 2f04adf5c4e4be8e44e2bf753d4e0a87f9149c7e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 25 May 2020 17:01:50 -0700 Subject: gnu: disorderfs: Update to 0.5.10. * gnu/packages/file-systems (disorderfs): Update to 0.5.10. --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 293322c76b..df6febb92e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -323,7 +323,7 @@ from the jfsutils package. It is meant to be used in initrds.") (define-public disorderfs (package (name "disorderfs") - (version "0.5.9") + (version "0.5.10") (source (origin (method git-fetch) @@ -333,7 +333,7 @@ from the jfsutils package. It is meant to be used in initrds.") (file-name (git-file-name name version)) (sha256 (base32 - "0irgr9hkm9icx1s44m9382484yx8hddzjxbsz621ip9c946pif0g")))) + "0lsisx5118k0qk0b5klbxl03rvhycnznyfx05yxmjawh85bfhmlh")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 51a11b82a317d620026ca1bb2b7e6d29a1c1ee75 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 26 May 2020 00:52:55 +0200 Subject: gnu: mupdf: Don't use NAME in source URI. * gnu/packages/pdf.scm (mupdf)[source]: Hard-code NAME. --- gnu/packages/pdf.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 7906fd28da..6121fe650d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -690,7 +690,7 @@ extracting content or merging files.") (origin (method url-fetch) (uri (string-append "https://mupdf.com/downloads/archive/" - name "-" version "-source.tar.xz")) + "mupdf-" version "-source.tar.xz")) (sha256 (base32 "1npmy92lkj41nnc14b4fpq7z62pminy94zsdbrczj22jpn283rvg")) -- cgit 1.4.1 From dc36bfec50de76aca1ea0d5714043b6ad9c52747 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 26 May 2020 02:20:44 +0200 Subject: gnu: nethogs: Use explicitly BASE32 source hash. Works around error: failed to load 'gnu/packages/networking.scm': ice-9/eval.scm:293:34: Wrong type to apply: # when manually building from git. * gnu/packages/networking.scm (nethogs)[source]: Use BASE32 explicitly. --- gnu/packages/networking.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b0c1440fd3..fd29370841 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1731,8 +1731,9 @@ the bandwidth, loss, and other parameters.") (url "https://github.com/raboof/nethogs") (commit (string-append "v" version)))) (hash - (content-hash "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9" - sha256)) + (content-hash + (base32 "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9") + sha256)) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From 5f833e0495f00a72f8d34a63e8afbc531afdd22d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:41:22 +0300 Subject: gnu: go-github-com-blang-semver: Update version string. The commit was actually the tag for 3.3.0. * gnu/packages/golang.scm (go-github-com-blang-semver)[version]: Retag as 3.3.0. [source]: Update to use version string. --- gnu/packages/golang.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8dd276562a..31022ebf41 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -978,28 +978,26 @@ optimized for performance yet simple to use.") (license license:expat)))) (define-public go-github-com-blang-semver - (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9") - (revision "0")) - (package - (name "go-github-com-blang-semver") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/blang/semver.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/blang/semver")) - (home-page "https://github.com/blang/semver") - (synopsis "Semantic versioning library written in Go") - (description "Semver is a library for Semantic versioning written in Go.") - (license license:expat)))) + (package + (name "go-github-com-blang-semver") + (version "3.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blang/semver.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/blang/semver")) + (home-page "https://github.com/blang/semver") + (synopsis "Semantic versioning library written in Go") + (description "Semver is a library for Semantic versioning written in Go.") + (license license:expat))) (define-public go-github-com-emicklei-go-restful (let ((commit "89ef8af493ab468a45a42bb0d89a06fccdd2fb22") -- cgit 1.4.1 From f6b4ca5a0a7ce9b3fa3af04b806520b9d6c69ea0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:43:48 +0300 Subject: gnu: go-github-com-blang-semver: Update to 4.0.0. * gnu/packages/golang.scm (go-github-com-blang-semver): Update to 4.0.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 31022ebf41..ce21412536 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -980,7 +980,7 @@ optimized for performance yet simple to use.") (define-public go-github-com-blang-semver (package (name "go-github-com-blang-semver") - (version "3.3.0") + (version "4.0.0") (source (origin (method git-fetch) @@ -990,7 +990,7 @@ optimized for performance yet simple to use.") (file-name (git-file-name name version)) (sha256 (base32 - "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2")))) + "14h9ys4n4kx9cbj42lkdf4i5k3nkll6sd62jcvl7cs565v6fiknz")))) (build-system go-build-system) (arguments '(#:import-path "github.com/blang/semver")) -- cgit 1.4.1 From b5a68ec8b97b3a3e54d3a1c3ffc161f91601de64 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:52:43 +0300 Subject: gnu: go-github-com-bkaradzic-go-lz4: Update version string. * gnu/packages/syncthing.scm (go-github-com-bkaradzic-go-lz4)[version]: Commit comes after the 1.0.0 release. --- gnu/packages/syncthing.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 99bdd7704b..a082e8a05f 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -232,7 +232,7 @@ configuration that is stored in a Go struct.") (revision "0")) (package (name "go-github-com-bkaradzic-go-lz4") - (version (git-version "0.0.0" revision commit)) + (version (git-version "1.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference -- cgit 1.4.1 From 1e07bd2aa7fd3a112a308ae6cf84603f2effe114 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:20:22 +0300 Subject: gnu: go-github-com-certifi-gocertifi: Update to 2020.02.11. * gnu/packages/tls.scm (go-github-com-certifi-gocertifi): Update to 2020.02.11. --- gnu/packages/tls.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ec81b7bf07..f6746ebe21 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Leo Famulari -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus @@ -1021,25 +1021,23 @@ relatively simple Bash script.") (license license:expat))) (define-public go-github-com-certifi-gocertifi - (let ((commit "a5e0173ced670013bfb649c7e806bc9529c986ec") - (revision "1")) - (package - (name "go-github-com-certifi-gocertifi") - (version (git-version "2018.01.18" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/certifi/gocertifi") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1n9drccl3q1rr8wg3nf60slkf1lgsmz5ahifrglbdrc6har3rryj")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/certifi/gocertifi")) - (synopsis "X.509 TLS root certificate bundle for Go") - (description "This package is a Go language X.509 TLS root certificate bundle, + (package + (name "go-github-com-certifi-gocertifi") + (version "2020.02.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/certifi/gocertifi") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "018bsy1vclsdk2kns9f37giabibg3kggk3vpj0yr3dv0k72gzybk")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/certifi/gocertifi")) + (synopsis "X.509 TLS root certificate bundle for Go") + (description "This package is a Go language X.509 TLS root certificate bundle, derived from Mozilla's collection.") - (home-page "https://certifi.io") - (license license:mpl2.0)))) + (home-page "https://certifi.io") + (license license:mpl2.0))) -- cgit 1.4.1 From 4672f2c23cbbc75f83e548a5ef4246a3394bd9ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:08:35 +0300 Subject: gnu: go-github-com-stathat-go: Update version string. The commit was also tagged 1.0.0. * gnu/packages/syncthing.scm (go-github-com-stathat-go)[version]: Retag 1.0.0. [source]: Update to use version string. --- gnu/packages/syncthing.scm | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index a082e8a05f..740981e937 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -492,27 +492,25 @@ higher-level API for doing so.") (license isc))) (define-public go-github-com-stathat-go - (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e") - (revision "0")) - (package - (name "go-github-com-stathat-go") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stathat/go") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zzlsl24dyr202qkr2pay22m6d0gb7ssms77wgdx0r0clgm7dihw")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/stathat/go")) - (synopsis "Post statistics to StatHat") - (description "This is a Go package for posting to a StatHat account.") - (home-page "https://github.com/stathat/go") - (license expat)))) + (package + (name "go-github-com-stathat-go") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stathat/go") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zzlsl24dyr202qkr2pay22m6d0gb7ssms77wgdx0r0clgm7dihw")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/stathat/go")) + (synopsis "Post statistics to StatHat") + (description "This is a Go package for posting to a StatHat account.") + (home-page "https://github.com/stathat/go") + (license expat))) (define-public go-github-com-rcrowley-go-metrics (let ((commit "cac0b30c2563378d434b5af411844adff8e32960") -- cgit 1.4.1 From 4ddd50c60817588b38ea1bf69e106c2bc7fda938 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:14:51 +0300 Subject: gnu: go-github-com-ccding-go-stun: Update version string. The commit was also tagged 0.1.1. * gnu/packages/syncthing.scm (go-github-com-ccding-go-stun)[version]: Change to tagged version. [source]: Update to use version string. --- gnu/packages/syncthing.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 740981e937..8ca5ab5680 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1035,29 +1035,27 @@ virtual connections from a single physical connection.") (license expat))) (define-public go-github-com-ccding-go-stun - (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6") - (revision "2")) - (package - (name "go-github-com-ccding-go-stun") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ccding/go-stun.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/ccding/go-stun")) - (synopsis "STUN client implementation") - (description "Go-stun is a go implementation of the STUN client (RFC 3489 + (package + (name "go-github-com-ccding-go-stun") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccding/go-stun.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/ccding/go-stun")) + (synopsis "STUN client implementation") + (description "Go-stun is a go implementation of the STUN client (RFC 3489 and RFC 5389).") - (home-page "https://github.com/ccding/go-stun") - (license asl2.0)))) + (home-page "https://github.com/ccding/go-stun") + (license asl2.0))) (define-public go-github-com-cespare-xxhash (package -- cgit 1.4.1 From cbc139a791eb8a664c28c2d28033daa0baa102e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:16:33 +0300 Subject: gnu: go-github-com-ccding-go-stun: Update to 0.1.2. * gnu/packages/syncthing.scm (go-github-com-ccding-go-stun): Update to 0.1.2. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 8ca5ab5680..179586023f 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1037,7 +1037,7 @@ virtual connections from a single physical connection.") (define-public go-github-com-ccding-go-stun (package (name "go-github-com-ccding-go-stun") - (version "0.1.1") + (version "0.1.2") (source (origin (method git-fetch) @@ -1047,7 +1047,7 @@ virtual connections from a single physical connection.") (file-name (git-file-name name version)) (sha256 (base32 - "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) + "133r2s4h9vv5lmjd680my2c5973gfi0gg5cxcwzjwdjad83a2dm0")))) (build-system go-build-system) (arguments '(#:import-path "github.com/ccding/go-stun")) -- cgit 1.4.1 From 2de39dc723545e2e3dee9e8ef6a5f55db335c958 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:12:17 +0300 Subject: gnu: go-github-com-mitchellh-go-homedir: Update version string. The commit was actually at the 1.0.0 tag. * gnu/packages/golang.scm (go-github-com-mitchellh-go-homedir)[version]: Update to proper version. [source]: Update commit for git-fetch. --- gnu/packages/golang.scm | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index ce21412536..cd6054de8c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2341,29 +2341,27 @@ statistics for wrapped connections.") (license license:expat)))) (define-public go-github-com-mitchellh-go-homedir - (let ((commit "ae18d6b8b3205b561c79e8e5f69bff09736185f4") - (revision "0")) - (package - (name "go-github-com-mitchellh-go-homedir") - (version (git-version "1.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mitchellh/go-homedir.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) - (build-system go-build-system) - (arguments - (quote (#:import-path "github.com/mitchellh/go-homedir" - ;; TODO: Tests fail because it tries to access home. - #:tests? #f))) - (home-page "https://github.com/mitchellh/go-homedir") - (synopsis "Go library for detecting and expanding the user's home directory without cgo") - (description "This is a Go library for detecting the user's home + (package + (name "go-github-com-mitchellh-go-homedir") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mitchellh/go-homedir.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) + (build-system go-build-system) + (arguments + (quote (#:import-path "github.com/mitchellh/go-homedir" + ;; TODO: Tests fail because it tries to access home. + #:tests? #f))) + (home-page "https://github.com/mitchellh/go-homedir") + (synopsis "Go library for detecting and expanding the user's home directory without cgo") + (description "This is a Go library for detecting the user's home directory without the use of @command{cgo}, so the library can be used in cross-compilation environments. @@ -2377,7 +2375,7 @@ package cannot cross compile. But 99% of the time the use for @command{os/user} is just to retrieve the home directory, which we can do for the current user without cgo. This library does that, enabling cross-compilation.") - (license license:expat)))) + (license license:expat))) (define-public go-github-com-multiformats-go-multiaddr (let ((commit "fe1c46f8be5af4aff4db286e08839295bd922efb") -- cgit 1.4.1 From c748f5262fa155e8986692c5cae7a584804d28ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:13:38 +0300 Subject: gnu: go-github-com-mitchellh-go-homedir: Update to 1.1.0. * gnu/packages/golang.scm (go-github-com-mitchellh-go-homedir): Update to 1.1.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index cd6054de8c..fa62a9ad15 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2343,7 +2343,7 @@ statistics for wrapped connections.") (define-public go-github-com-mitchellh-go-homedir (package (name "go-github-com-mitchellh-go-homedir") - (version "1.0.0") + (version "1.1.0") (source (origin (method git-fetch) @@ -2353,7 +2353,7 @@ statistics for wrapped connections.") (file-name (git-file-name name version)) (sha256 (base32 - "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) + "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1")))) (build-system go-build-system) (arguments (quote (#:import-path "github.com/mitchellh/go-homedir" -- cgit 1.4.1 From 369aab196d6df12fe6552ad84fcd2db80be0fcbe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:18:17 +0300 Subject: gnu: go-github-com-mitchellh-go-homedir: Enable tests. * gnu/packages/golang.scm (go-github-com-mitchellh-go-homedir) [arguments]: Enable tests. Add custom phase to set HOME environment variable. --- gnu/packages/golang.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fa62a9ad15..44481ed08f 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2356,9 +2356,13 @@ statistics for wrapped connections.") "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1")))) (build-system go-build-system) (arguments - (quote (#:import-path "github.com/mitchellh/go-homedir" - ;; TODO: Tests fail because it tries to access home. - #:tests? #f))) + `(#:import-path "github.com/mitchellh/go-homedir" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-home-directory + (lambda _ + (setenv "HOME" "/") + #t))))) (home-page "https://github.com/mitchellh/go-homedir") (synopsis "Go library for detecting and expanding the user's home directory without cgo") (description "This is a Go library for detecting the user's home -- cgit 1.4.1 From 28d60279c94eea9d0ca59e217f0c1647ef93a8db Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:07:44 +0300 Subject: gnu: go-github-com-kr-text: Update to 0.2.0. * gnu/packages/golang.scm (go-github-com-kr-text): Update to 0.2.0. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 44481ed08f..c8948f0877 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2824,7 +2824,7 @@ format in Go.") (define-public go-github-com-kr-text (package (name "go-github-com-kr-text") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -2833,7 +2833,7 @@ format in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1")))) + "0hf58ypz6rxsw6nx3i856whir9lvy4sdx946wbw1nfaf2rdmr9vx")))) (build-system go-build-system) (arguments '(#:import-path "github.com/kr/text")) -- cgit 1.4.1 From f5c9d2611f460be9827f8af339827ad494c45a5a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 21:54:55 +0300 Subject: gnu: go-github-com-lib-pq: Update to 1.5.2. * gnu/packages/syncthing.scm (go-github-com-lib-pq): Update to 1.5.2. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 179586023f..f660cb0eee 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -416,7 +416,7 @@ address of the default LAN gateway.") (define-public go-github-com-lib-pq (package (name "go-github-com-lib-pq") - (version "1.2.0") + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -425,7 +425,7 @@ address of the default LAN gateway.") (file-name (git-file-name name version)) (sha256 (base32 - "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz")))) + "1wjw5pfjgc63n9934mgvg8hr1v9381mcdz62jkn9xqxqcv6b95lw")))) (build-system go-build-system) (arguments `(#:import-path "github.com/lib/pq" -- cgit 1.4.1 From 37b0793d516c1b604ee312b5e156837484ca4b04 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:04:44 +0300 Subject: gnu: go-github-com-oschwald-maxminddb-golang: Update to 1.6.0. * gnu/packages/syncthing.scm (go-github-com-oschwald-maxminddb-golang): Update to 1.6.0. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index f660cb0eee..057f0ce2bd 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -468,7 +468,7 @@ GeoLite2 and GeoIP2 databases in Go.") (define-public go-github-com-oschwald-maxminddb-golang (package (name "go-github-com-oschwald-maxminddb-golang") - (version "1.4.0") + (version "1.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -477,7 +477,7 @@ GeoLite2 and GeoIP2 databases in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "100wd5qv00pkcm6cb8c4x5gavc9jnn7drh6xrqh85hzci4rils66")))) + "1xdqaazxddnajh0qic1c70skad44kxxr7m46fypbnawn61v3f7gc")))) (build-system go-build-system) (propagated-inputs `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) -- cgit 1.4.1 From a2b7abcd97caec8e2f16a8d9f68171f9622136e1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:06:25 +0300 Subject: gnu: go-github-com-go-asn1-ber-asn1-ber: Update to 1.4.1. * gnu/packages/syncthing.scm (go-github-com-go-asn1-ber-asn1-ber): Update to 1.4.1. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 057f0ce2bd..6eff80dded 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -943,7 +943,7 @@ server tools for Prometheus metrics.") (define-public go-github-com-go-asn1-ber-asn1-ber (package (name "go-github-com-go-asn1-ber-asn1-ber") - (version "1.3.1") + (version "1.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -952,7 +952,7 @@ server tools for Prometheus metrics.") (file-name (git-file-name name version)) (sha256 (base32 - "0dxfmgk84fn0p6pz3i0cspynh6rly5pfk9wghm1q07mx99npln02")))) + "0d7yl1f7ak0djkflw8wx1wlhym2whg7bh57m419arfym9ncwrhg1")))) (build-system go-build-system) (arguments '(#:import-path "github.com/go-asn1-ber/asn1-ber")) -- cgit 1.4.1 From f913f7d9e5293ac2eb7015457bcc7fac8dfe7e2f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:12:12 +0300 Subject: gnu: go-github-com-beorn7-perks-quantile: Update to 1.0.1. * gnu/packages/syncthing.scm (go-github-com-beorn7-perks-quantile): Update to 1.0.1. --- gnu/packages/syncthing.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6eff80dded..6ae7b7b024 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -747,30 +747,28 @@ notification library in Go.") (license expat)))) (define-public go-github-com-beorn7-perks-quantile - (let ((commit "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9") - (revision "0")) - (package - (name "go-github-com-beorn7-perks-quantile") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beorn7/perks.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/beorn7/perks/quantile" - #:unpack-path "github.com/beorn7/perks")) - (synopsis "Compute approximate quantiles over an unbounded data stream") - (description "Perks contains the Go package @code{quantile} that computes + (package + (name "go-github-com-beorn7-perks-quantile") + (version "1.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/beorn7/perks.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/beorn7/perks/quantile" + #:unpack-path "github.com/beorn7/perks")) + (synopsis "Compute approximate quantiles over an unbounded data stream") + (description "Perks contains the Go package @code{quantile} that computes approximate quantiles over an unbounded data stream within low memory and CPU bounds.") - (home-page "https://github.com/beorn7/perks") - (license expat)))) + (home-page "https://github.com/beorn7/perks") + (license expat))) (define-public go-github-com-prometheus-client-model (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") -- cgit 1.4.1 From a63077f0032ad904fc7ae57dd79742fe2913a1d2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 22:21:54 +0300 Subject: gnu: go-github-com-maruel-panicparse: Update to 1.4.1. * gnu/packages/golang.scm (go-github-com-maruel-panicparse): Update to 1.4.1. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c8948f0877..e11c52b0e4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3191,7 +3191,7 @@ error handling primitives in Go.") (define-public go-github-com-maruel-panicparse (package (name "go-github-com-maruel-panicparse") - (version "1.3.0") + (version "1.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -3200,7 +3200,7 @@ error handling primitives in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "13qkn7f64yln8jdmma37h6ra4c7anxkp3vfgvfyb6lb07dpr1ibq")))) + "0sff44kqmpwzpa6h84fssdsv9glfm8bjjcnspsr64qzmqxpbc7m4")))) (build-system go-build-system) (arguments '(#:import-path "github.com/maruel/panicparse")) -- cgit 1.4.1 From 3d2e2bf6b85b5d54e331b8572050a395be87d134 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 May 2020 09:49:11 +0300 Subject: gnu: go-github-com-prometheus-procfs: Update to 0.0.11. * gnu/packages/syncthing.scm (go-github-com-prometheus-procfs): Update to 0.0.11. [propagated-inputs]: Add go-golang-org-x-sys. --- gnu/packages/syncthing.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6ae7b7b024..be7496e7ca 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -878,7 +878,7 @@ Prometheus metrics.") (define-public go-github-com-prometheus-procfs (package (name "go-github-com-prometheus-procfs") - (version "0.0.4") + (version "0.0.11") (source (origin (method git-fetch) (uri (git-reference @@ -887,13 +887,15 @@ Prometheus metrics.") (file-name (git-file-name name version)) (sha256 (base32 - "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544")))) + "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c")))) (build-system go-build-system) (arguments '(#:import-path "github.com/prometheus/procfs" ;; The tests require Go modules, which are not yet supported in Guix's ;; Go build system. #:tests? #f)) + (propagated-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) (synopsis "Go library for reading @file{/proc}") (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") -- cgit 1.4.1 From 681ac9a66c26d2c739e41f03228f8c63fc0df482 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 26 May 2020 09:49:50 +0300 Subject: gnu: go-github-com-prometheus-procfs: Re-indent. * gnu/packages/syncthing.scm (go-github-com-prometheus-procfs): Re-indent the package. --- gnu/packages/syncthing.scm | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index be7496e7ca..bb264df717 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -876,31 +876,31 @@ Prometheus metrics.") (license asl2.0))) (define-public go-github-com-prometheus-procfs - (package - (name "go-github-com-prometheus-procfs") - (version "0.0.11") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/procfs.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/prometheus/procfs" - ;; The tests require Go modules, which are not yet supported in Guix's - ;; Go build system. - #:tests? #f)) - (propagated-inputs - `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) - (synopsis "Go library for reading @file{/proc}") - (description "The @code{procfs} Go package provides functions to retrieve + (package + (name "go-github-com-prometheus-procfs") + (version "0.0.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/procfs.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/procfs" + ;; The tests require Go modules, which are not yet supported in Guix's + ;; Go build system. + #:tests? #f)) + (propagated-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (synopsis "Go library for reading @file{/proc}") + (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") - (home-page "https://github.com/prometheus/procfs") - (license asl2.0))) + (home-page "https://github.com/prometheus/procfs") + (license asl2.0))) (define-public go-github-com-prometheus-client-golang (package -- cgit 1.4.1 From 8b2a637dcd7d5e8e4e5e765e89196f542fbddac4 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:44:57 +0200 Subject: gnu: stumpish: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f9db2dbe4d..b4d6fe74c1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1661,8 +1661,8 @@ productive, customizable lisp based systems.") (delete 'create-symlinks))))))) (define-public stumpish - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "stumpish") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1674,7 +1674,7 @@ productive, customizable lisp based systems.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("bash" ,bash) ("rlwrap" ,rlwrap))) -- cgit 1.4.1 From 7b7c3c081d7bbccd72dbfa583d3e40e61d94a47b Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:44:58 +0200 Subject: gnu: sbcl-ttf-fonts: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b4d6fe74c1..a2b788e276 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1701,8 +1701,8 @@ productive, customizable lisp based systems.") (deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk)) (define-public sbcl-stumpwm-ttf-fonts - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "sbcl-ttf-fonts") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1714,7 +1714,7 @@ productive, customizable lisp based systems.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("stumpwm" ,stumpwm "lib") ("clx-truetype" ,sbcl-clx-truetype))) -- cgit 1.4.1 From 40dab17631a7467fe751907e01a00b97a617388d Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:44:59 +0200 Subject: gnu: sbcl-pass: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a2b788e276..b139e37748 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1732,8 +1732,8 @@ rendering.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (define-public sbcl-stumpwm-pass - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "sbcl-pass") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1745,7 +1745,7 @@ rendering.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("stumpwm" ,stumpwm "lib"))) (build-system asdf-build-system/sbcl) -- cgit 1.4.1 From 546f21c22f4b6add9f72b820019f4a35f9311448 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:45:00 +0200 Subject: gnu: sbcl-globalwindows: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b139e37748..4678ec524a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1762,8 +1762,8 @@ password-store into StumpWM.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (define-public sbcl-stumpwm-globalwindows - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "sbcl-globalwindows") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1775,7 +1775,7 @@ password-store into StumpWM.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("stumpwm" ,stumpwm "lib"))) (build-system asdf-build-system/sbcl) -- cgit 1.4.1 From dfd4a29889fe8dae55cefa069f2e176e421611f8 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:45:01 +0200 Subject: gnu: sbcl-swm-gaps: Update to 0.0.1-2.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4678ec524a..2e975354c3 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1792,8 +1792,8 @@ windows in the current X session.") (license (list license:gpl2+ license:gpl3+ license:bsd-2))))) (define-public sbcl-stumpwm-swm-gaps - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "1")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "2")) (package (name "sbcl-swm-gaps") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1805,7 +1805,7 @@ windows in the current X session.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (inputs `(("stumpwm" ,stumpwm "lib"))) (build-system asdf-build-system/sbcl) -- cgit 1.4.1 From edb0366c16fee4767a1d007b6c38f11080910b50 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 25 May 2020 19:45:02 +0200 Subject: gnu: emacs-stumpwm-mode: Update to 0.0.1-3.920f8fc. Signed-off-by: Oleg Pykhalov --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5dbb48bb0e..b99acb7815 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -72,6 +72,7 @@ ;;; Copyright © 2020 pinoaffe ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Ryan Desfosses +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -15460,8 +15461,8 @@ bookmarks and history.") (license license:gpl3+))) (define-public emacs-stumpwm-mode - (let ((commit "dd5b037923ec7d3cc27c55806bcec5a1b8cf4e91") - (revision "2")) + (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d6") + (revision "3")) (package (name "emacs-stumpwm-mode") (version (git-version "0.0.1" revision commit)) @@ -15473,7 +15474,7 @@ bookmarks and history.") (file-name (git-file-name name version)) (sha256 (base32 - "0ahxdj9f884afpzxczx6mx7l4nwg4kw6afqaq7lwhf7lxcwylldn")))) + "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit 1.4.1 From 1b4fa7851b39f087a6433e8b5e22c479ca1da289 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:09:53 +0200 Subject: image: Add partition offset support. * gnu/image.scm (partition-offset): New procedure, ()[offset]: new field. * gnu/system/image.scm (system-disk-image): Apply the partition offset. --- gnu/image.scm | 2 ++ gnu/system/image.scm | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/image.scm b/gnu/image.scm index b05fc69dc5..3a02692950 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -22,6 +22,7 @@ partition? partition-device partition-size + partition-offset partition-file-system partition-label partition-uuid @@ -47,6 +48,7 @@ partition? (device partition-device (default #f)) (size partition-size) + (offset partition-offset (default #f)) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) (uuid partition-uuid (default #f)) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 571b7af5f3..adc2b3c221 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -243,11 +243,17 @@ used in the image." ;; Return the genimage partition configuration for PARTITION. (let ((label (partition-label partition)) (dos-type (partition->dos-type partition)) - (image (partition-image partition))) + (image (partition-image partition)) + (offset (partition-offset partition))) #~(format #f "~/partition ~a { ~/~/partition-type = ~a ~/~/image = \"~a\" - ~/}" #$label #$dos-type #$image))) + ~/~/offset = \"~a\" + ~/}" + #$label + #$dos-type + #$image + #$(or offset 0)))) (let* ((format (image-format image)) (image-type (format->image-type format)) -- cgit 1.4.1 From 16f9124d1fec7b40cdac189346e0d5021e43122b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:12:14 +0200 Subject: build: image: Add support for EXT2 and EXT3 file-systems. * gnu/build/image.scm (make-ext4-image): Rename to ... (make-ext-image): ... it, and pass the file-system type to mke2fs, (make-partition-image): Adapt to call "make-ext-image" if the partition file-system is prefixed by "ext". --- gnu/build/image.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index fe8e11aa1b..23fc56571f 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -63,16 +63,18 @@ take the partition metadata size into account, take a 25% margin." (* 1.25 (file-size root))) -(define* (make-ext4-image partition target root - #:key - (owner-uid 0) - (owner-gid 0)) - "Handle the creation of EXT4 partition images. See 'make-partition-image'." +(define* (make-ext-image partition target root + #:key + (owner-uid 0) + (owner-gid 0)) + "Handle the creation of EXT2/3/4 partition images. See +'make-partition-image'." (let ((size (partition-size partition)) + (fs (partition-file-system partition)) (label (partition-label partition)) (uuid (partition-uuid partition)) (options "lazy_itable_init=1,lazy_journal_init=1")) - (invoke "mke2fs" "-t" "ext4" "-d" root + (invoke "mke2fs" "-t" fs "-d" root "-L" label "-U" (uuid->string uuid) "-E" (format #f "root_owner=~a:~a,~a" owner-uid owner-gid options) @@ -105,8 +107,8 @@ ROOT directory to populate the image." (let* ((partition (sexp->partition partition-sexp)) (type (partition-file-system partition))) (cond - ((string=? type "ext4") - (make-ext4-image partition target root)) + ((string-prefix? "ext" type) + (make-ext-image partition target root)) ((string=? type "vfat") (make-vfat-image partition target root)) (else -- cgit 1.4.1 From 15135a5e134f119c5467f0509f09dace60c63832 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:17:52 +0200 Subject: gnu: grub: Allow "grub-bios-setup" to operate on raw disk-images. * gnu/packages/patches/grub-setup-root.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/bootloaders.scm (grub): Apply it. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 1 + gnu/packages/patches/grub-setup-root.patch | 124 +++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 gnu/packages/patches/grub-setup-root.patch diff --git a/gnu/local.mk b/gnu/local.mk index dc3e880603..7d23b04723 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1041,6 +1041,7 @@ dist_patch_DATA = \ %D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ + %D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0f0d3b4b62..5273412adf 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -96,6 +96,7 @@ "0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5")) (patches (search-patches "grub-efi-fat-serial-number.patch" + "grub-setup-root.patch" "grub-verifiers-Blocklist-fallout-cleanup.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/grub-setup-root.patch b/gnu/packages/patches/grub-setup-root.patch new file mode 100644 index 0000000000..1abe9c383a --- /dev/null +++ b/gnu/packages/patches/grub-setup-root.patch @@ -0,0 +1,124 @@ +This patch is taken from OpenWrt, see: + +https://github.com/openwrt/openwrt/blob/master/package/boot/grub2/patches/100-grub_setup_root.patch. + +It allows to use grub-bios-setup on a raw disk-images, without root permissions. + +--- a/util/grub-setup.c ++++ b/util/grub-setup.c +@@ -87,6 +87,8 @@ static struct argp_option options[] = { + N_("install even if problems are detected"), 0}, + {"skip-fs-probe",'s',0, 0, + N_("do not probe for filesystems in DEVICE"), 0}, ++ {"root-device", 'r', N_("DEVICE"), 0, ++ N_("use DEVICE as the root device"), 0}, + {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, + {"allow-floppy", 'a', 0, 0, + /* TRANSLATORS: The potential breakage isn't limited to floppies but it's +@@ -130,6 +132,7 @@ struct arguments + char *core_file; + char *dir; + char *dev_map; ++ char *root_dev; + int force; + int fs_probe; + int allow_floppy; +@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct + arguments->dev_map = xstrdup (arg); + break; + ++ case 'r': ++ if (arguments->root_dev) ++ free (arguments->root_dev); ++ ++ arguments->root_dev = xstrdup (arg); ++ break; ++ + case 'f': + arguments->force = 1; + break; +@@ -313,7 +323,7 @@ main (int argc, char *argv[]) + GRUB_SETUP_FUNC (arguments.dir ? : DEFAULT_DIRECTORY, + arguments.boot_file ? : DEFAULT_BOOT_FILE, + arguments.core_file ? : DEFAULT_CORE_FILE, +- dest_dev, arguments.force, ++ arguments.root_dev, dest_dev, arguments.force, + arguments.fs_probe, arguments.allow_floppy, + arguments.add_rs_codes); + +--- a/util/setup.c ++++ b/util/setup.c +@@ -252,13 +252,12 @@ identify_partmap (grub_disk_t disk __att + void + SETUP (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */ + { + char *core_path; + char *boot_img, *core_img, *boot_path; +- char *root = 0; + size_t boot_size, core_size; + grub_uint16_t core_sectors; + grub_device_t root_dev = 0, dest_dev, core_dev; +@@ -307,7 +306,10 @@ SETUP (const char *dir, + + core_dev = dest_dev; + +- { ++ if (root) ++ root_dev = grub_device_open(root); ++ ++ if (!root_dev) { + char **root_devices = grub_guess_root_devices (dir); + char **cur; + int found = 0; +@@ -320,6 +322,8 @@ SETUP (const char *dir, + char *drive; + grub_device_t try_dev; + ++ if (root_dev) ++ break; + drive = grub_util_get_grub_dev (*cur); + if (!drive) + continue; +--- a/include/grub/util/install.h ++++ b/include/grub/util/install.h +@@ -191,13 +191,13 @@ grub_install_get_image_target (const cha + void + grub_util_bios_setup (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes); + void + grub_util_sparc_setup (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes); + +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -1712,7 +1712,7 @@ main (int argc, char *argv[]) + /* Now perform the installation. */ + if (install_bootsector) + grub_util_bios_setup (platdir, "boot.img", "core.img", +- install_drive, force, ++ NULL, install_drive, force, + fs_probe, allow_floppy, add_rs_codes); + break; + } +@@ -1738,7 +1738,7 @@ main (int argc, char *argv[]) + /* Now perform the installation. */ + if (install_bootsector) + grub_util_sparc_setup (platdir, "boot.img", "core.img", +- install_drive, force, ++ NULL, install_drive, force, + fs_probe, allow_floppy, + 0 /* unused */ ); + break; -- cgit 1.4.1 From 1dbd0005a1312e88f449626142895f1ffb0bee60 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 May 2020 16:22:17 +0200 Subject: system: image: Fix disk-image cross-compilation. * gnu/system/image.scm (system-disk-image): Use the native version of the helper packages (e2fsprogs, dosfstools, mtools, genimage, coreutils and findutils). --- gnu/system/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index adc2b3c221..6b5a36ffc6 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -232,7 +232,7 @@ used in the image." (type (partition-file-system partition)) (image-builder (with-imported-modules* - (let ((inputs '#$(list e2fsprogs dosfstools mtools))) + (let ((inputs '#+(list e2fsprogs dosfstools mtools))) (set-path-environment-variable "PATH" '("bin" "sbin") inputs) (make-partition-image #$(partition->gexp partition) #$output @@ -275,7 +275,7 @@ image ~a { (let* ((substitutable? (image-substitutable? image)) (builder (with-imported-modules* - (let ((inputs '#$(list genimage coreutils findutils))) + (let ((inputs '#+(list genimage coreutils findutils))) (set-path-environment-variable "PATH" '("bin" "sbin") inputs) (genimage #$(image->genimage-cfg image) #$output)))) (image-dir (computed-file "image-dir" builder))) -- cgit 1.4.1 From 5d31933e0b8520ee831e71dcd0ede6ec3de5216e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 13:51:07 +0100 Subject: gnu: Add python2-pyatspi. This will enable updating python2-dogtail to 0.9.11. * gnu/packages/gnome.scm (python2-pyatspi): New variable. --- gnu/packages/gnome.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dbaab157f5..fdbec60881 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8860,6 +8860,14 @@ accessibility infrastructure.") (license license:lgpl2.0) (properties '((upstream-name . "pyatspi"))))) +(define-public python2-pyatspi + (package + (inherit python-pyatspi) + (name "python2-pyatspi") + (inputs + `(("python" ,python-2) + ("python-pygobject" ,python2-pygobject))))) + (define-public orca (package (name "orca") -- cgit 1.4.1 From 06fe35cf0c27545e8d995aaf35b7b11987f4ed67 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 15 Apr 2020 18:43:55 +0100 Subject: gnu: python-pyatspi: Propagate python-pygobject. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As python-pygobject is required at runtime. * gnu/packages/gnome.scm (python-pyatspi)[inputs]: Move python-pygobject to… [propagated-inputs]: …here. (python2-pyatspi)[inputs]: Move python2-pygobject to… [propagated-inputs]: …here. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fdbec60881..94a649779e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8849,8 +8849,9 @@ from gi.repository import Atspi")) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python" ,python) - ("python-pygobject" ,python-pygobject))) + `(("python" ,python))) + (propagated-inputs + `(("python-pygobject" ,python-pygobject))) (synopsis "Python client bindings for D-Bus AT-SPI") (home-page "https://wiki.linuxfoundation.org/accessibility\ /atk/at-spi/at-spi_on_d-bus") @@ -8865,8 +8866,9 @@ accessibility infrastructure.") (inherit python-pyatspi) (name "python2-pyatspi") (inputs - `(("python" ,python-2) - ("python-pygobject" ,python2-pygobject))))) + `(("python" ,python-2))) + (propagated-inputs + `(("python-pygobject" ,python2-pygobject))))) (define-public orca (package -- cgit 1.4.1 From cf7381612c3bf2fd89fd03a53e85ed6eb9e9f9f8 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 13:51:14 +0100 Subject: gnu: python2-dogtail: Update to 0.9.11. There are newer releases on a gitlab.com repository compared to PyPI. Make an attempt at getting the tests to work, they don't yet I believe because DBus isn't working properly. This update is a step towards getting a Python 3 variant of the package, which can be used to test virt-manager. * gnu/packages/python-xyz.scm (python2-dogtail): Update to 0.9.11. [source]: Switch from PyPI to gitlab.com, as gitlab.com contains newer releases. [arguments]: Replace the check phase, and update comment about disabling the tests. [propagated-inputs,native-inputs]: Add relevant packages. [home-page]: Change to https://gitlab.com/dogtail/dogtail/ --- gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index efd92beb9f..0cbb5e81e3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1753,18 +1753,42 @@ Python 3.3+.") ;; spaces in indentation" with Python 3. (package (name "python2-dogtail") - (version "0.9.9") + (version "0.9.11") (source (origin (method url-fetch) - (uri (pypi-uri "dogtail" version)) + (uri + (string-append + "https://gitlab.com/dogtail/dogtail/-/raw/released/" + "dogtail-" version ".tar.gz")) (sha256 (base32 - "0p5wfssvzr9w0bvhllzbbd8fnp4cca2qxcpcsc33dchrmh5n552x")))) + "0sr38z7b2n12bvfd4xw4b5dnnhkn5zl3h0ymmnnzavcihfqia6l0")))) (build-system python-build-system) - (arguments `(#:python ,python-2 - #:tests? #f)) ; invalid command "test" - ;; Currently no offical homepage. - (home-page "https://pypi.org/project/dogtail/") + (arguments + `(#:python ,python-2 + #:tests? #f ; TODO Launching dbus for the tests + ; fails + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (invoke "dbus-run-session" "--" "nosetests" "-v" "tests/")) + #t))))) + (propagated-inputs + `(("python-pygobject" ,python2-pygobject) + ("python-pycairo" ,python2-pycairo) + ("python-pyatspi" ,python2-pyatspi))) + (native-inputs + `(("python-nose" ,python2-nose) + ("gtk+" ,gtk+) + ("xvfb" ,xorg-server) + ("dbus" ,dbus) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gobject-introspection" ,gobject-introspection))) + (home-page "https://gitlab.com/dogtail/dogtail/") (synopsis "GUI test tool and automation framework written in Python") (description "Dogtail is a GUI test tool and automation framework written in Python. -- cgit 1.4.1 From c4b0131010c7bb864198318fc44b10b038c80b55 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 13:54:25 +0100 Subject: gnu: python2-dogtail: Switch to Python 3, and add Python 2 variant. * gnu/packages/python-xyz.scm (python2-dogtail): Rename to python-dogtail. [name]: Change python2-dogtail to python-dogtail. [arguments]: Remove #:python. [propagated-inputs,native-inputs]: Switch Python 2 packages to Python 3 variants. (python2-dogtail): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0cbb5e81e3..b359ffc955 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1748,11 +1748,9 @@ Python 3.3+.") (define-public python2-pyicu (package-with-python2 python-pyicu)) -(define-public python2-dogtail - ;; Python 2 only, as it leads to "TabError: inconsistent use of tabs and - ;; spaces in indentation" with Python 3. +(define-public python-dogtail (package - (name "python2-dogtail") + (name "python-dogtail") (version "0.9.11") (source (origin (method url-fetch) @@ -1765,8 +1763,7 @@ Python 3.3+.") "0sr38z7b2n12bvfd4xw4b5dnnhkn5zl3h0ymmnnzavcihfqia6l0")))) (build-system python-build-system) (arguments - `(#:python ,python-2 - #:tests? #f ; TODO Launching dbus for the tests + `(#:tests? #f ; TODO Launching dbus for the tests ; fails #:phases (modify-phases %standard-phases @@ -1778,11 +1775,11 @@ Python 3.3+.") (invoke "dbus-run-session" "--" "nosetests" "-v" "tests/")) #t))))) (propagated-inputs - `(("python-pygobject" ,python2-pygobject) - ("python-pycairo" ,python2-pycairo) - ("python-pyatspi" ,python2-pyatspi))) + `(("python-pygobject" ,python-pygobject) + ("python-pycairo" ,python-pycairo) + ("python-pyatspi" ,python-pyatspi))) (native-inputs - `(("python-nose" ,python2-nose) + `(("python-nose" ,python-nose) ("gtk+" ,gtk+) ("xvfb" ,xorg-server) ("dbus" ,dbus) @@ -1797,6 +1794,9 @@ applications. dogtail scripts are written in Python and executed like any other Python program.") (license license:gpl2+))) +(define-public python2-dogtail + (package-with-python2 python-dogtail)) + (define-public python-empy (package (name "python-empy") -- cgit 1.4.1 From 20f524a44b1a9728045be1198ff795697557796c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 16:53:37 +0100 Subject: gnu: virt-manager: Work towards enabling some tests. * gnu/packages/virtualization.scm (virt-manager)[arguments]: Set #:test-target to "test_ui", replace the 'check phase. [native-inputs]: Add some inputs required for running tests. --- gnu/packages/virtualization.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 32113a0f2c..05ce96c974 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -655,9 +655,10 @@ virtualization library.") (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command - ;; Some of the tests seem to require network access to install virtual - ;; machines. - #:tests? #f + #:test-target "test_ui" + #:tests? #f ; TODO The tests currently fail + ; RuntimeError: Loop condition wasn't + ; met #:imported-modules ((guix build glib-or-gtk-build-system) ,@%python-build-system-modules) #:modules ((ice-9 match) @@ -704,6 +705,16 @@ virtualization library.") ,(filter identity paths)))) bin-files)) #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; Dogtail requires that Assistive Technology support be enabled + (setenv "GTK_MODULES" "gail:atk-bridge") + (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) + #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'install 'glib-or-gtk-wrap @@ -732,7 +743,14 @@ virtualization library.") ("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man - ("intltool" ,intltool))) + ("intltool" ,intltool) + ;; The following are required for running the tests + ;; ("python-dogtail" ,python-dogtail) + ;; ("xvfb" ,xorg-server-for-tests) + ;; ("dbus" ,dbus) + ;; ("at-spi2-core" ,at-spi2-core) + ;; ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + )) (home-page "https://virt-manager.org/") (synopsis "Manage virtual machines") (description -- cgit 1.4.1 From 1dd7b87f101ce99b37be5c769904c1aa2f6a0615 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 26 May 2020 13:05:22 +0200 Subject: image: Set offset default to zero. * gnu/image.scm ()[offset]: Set to zero by default. * gnu/system/image.scm (system-disk-image): Adapt accordingly. --- gnu/image.scm | 2 +- gnu/system/image.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/image.scm b/gnu/image.scm index 3a02692950..b434ed50e3 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -48,7 +48,7 @@ partition? (device partition-device (default #f)) (size partition-size) - (offset partition-offset (default #f)) + (offset partition-offset (default 0)) (file-system partition-file-system (default "ext4")) (label partition-label (default #f)) (uuid partition-uuid (default #f)) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 6b5a36ffc6..cb770a17e8 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -253,7 +253,7 @@ used in the image." #$label #$dos-type #$image - #$(or offset 0)))) + #$offset))) (let* ((format (image-format image)) (image-type (format->image-type format)) -- cgit 1.4.1 From 9b0d54b2797d4efed0e104e1237d197863839a43 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 26 May 2020 11:47:01 +0200 Subject: gnu: monero: Update to 0.16.0.0. * gnu/packages/finance.scm (monero): Update to 0.16.0.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 92a00240f3..92a0b758a9 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -547,7 +547,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.15.0.5") + (version "0.16.0.0") (source (origin (method git-fetch) @@ -568,7 +568,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch #t)) (sha256 (base32 - "06zzwa0y8ic6x3y2fy501788r51p4klanyvmm76ywrwf087njlkv")))) + "0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit 1.4.1 From 51bd1f5b07415f63cb5d402a73187855550858b4 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 26 May 2020 14:19:11 +0200 Subject: gnu: monero-gui: Update to 0.16.0.0. * gnu/packages/finance.scm (monero-gui): Update to 0.16.0.0. [native-inputs]: Add monero-source. [inputs]: Add libgcrypt. [arguments]: Add 'get-monero-extra-files' phase. --- gnu/packages/finance.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 92a0b758a9..3e23fcceea 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -666,7 +666,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.15.0.4") + (version "0.16.0.0") (source (origin (method git-fetch) @@ -676,14 +676,16 @@ the Monero command line client and daemon.") (file-name (git-file-name name version)) (sha256 (base32 - "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z")))) + "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld")))) (build-system qt-build-system) (native-inputs - `(("pkg-config" ,pkg-config) + `(("monero-source" ,(package-source monero)) + ("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs `(("boost" ,boost) ("hidapi" ,hidapi) + ("libgcrypt" ,libgcrypt) ("libsodium" ,libsodium) ("libunwind" ,libunwind) ("libusb" ,libusb) @@ -705,7 +707,16 @@ the Monero command line client and daemon.") `(#:tests? #f ; No tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-makefile-vars + (add-after 'unpack 'get-monero-extra-files + ;; Some headers and GnuPG public keys of the monero package source + ;; code are required to build the GUI. + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "-xv" "--wildcards" "--strip-components=1" + "-C" "monero" + "-f" (assoc-ref inputs "monero-source") + "*.asc" "*.h") + #t)) + (add-after 'get-monero-extra-files 'fix-makefile-vars (lambda _ (substitute* "src/zxcvbn-c/makefile" (("\\?=") "=")) -- cgit 1.4.1 From e91c29a491267a832b2739a8f171e6e1bf263a95 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 26 May 2020 14:45:39 +0200 Subject: gnu: txr: Update to 238. * gnu/packages/lisp.scm (txr): Update to 238. [arguments]: Don't hardcode "cc=gcc" in configure-flags. --- gnu/packages/lisp.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3ae8dab141..21e1a0449b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -806,7 +806,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "235") + (version "238") (source (origin (method git-fetch) @@ -815,12 +815,15 @@ enough to play the original mainframe Zork all the way through.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kpqk2x0sz7sqxsrhasq0xnljjlnxwhh4xjx2nii0zy2jkv4vsbn")))) + (base32 "0asdq4n828xb1m31s7f47mqcbjqkzxz11bwnw8v3f2249m93ync4")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - (list "cc=gcc" - (string-append "--prefix=" (assoc-ref %outputs "out"))) + `(#:configure-flags + (let ((target ,(%current-target-system))) + (list (string-append "cc=" (if target + (string-append target "-gcc") + "gcc")) + (string-append "--prefix=" (assoc-ref %outputs "out")))) #:test-target "tests" #:phases (modify-phases %standard-phases -- cgit 1.4.1 From 6ac7526e488ad3dd73080d1c00efe2066b1bf0a2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 26 May 2020 16:01:33 +0200 Subject: services: Fix permissions of directory /var/spool/cups/tmp. Fixes . * gnu/services/cups.scm (%cups-activation): Fix permissions of directory /var/spool/cups/tmp. --- gnu/services/cups.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index c3c6d2f1be..16d6f76c1a 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -869,7 +869,7 @@ IPP specifications.") (use-modules (guix build utils)) (define (mkdir-p/perms directory owner perms) (mkdir-p directory) - (chown "/var/run/cups" (passwd:uid owner) (passwd:gid owner)) + (chown directory (passwd:uid owner) (passwd:gid owner)) (chmod directory perms)) (define (build-subject parameters) (string-concatenate -- cgit 1.4.1 From bd3716f6fee127562935d86ff7f641197366769c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 26 May 2020 16:25:25 +0200 Subject: image: Add partition file-system options support. * gnu/image.scm ()[file-system-options]: New field, (partition-file-system-options): new exported procedure. * gnu/system/image.scm (partition->gexp): Adapt accordingly. * gnu/build/image.scm (sexp->partition): Also adapt accordingly, (make-ext-image): and pass file-system options to mke2fs. --- gnu/build/image.scm | 28 ++++++++++++++++------------ gnu/image.scm | 19 +++++++++++-------- gnu/system/image.scm | 1 + 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 23fc56571f..b37ea9332a 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -47,9 +47,10 @@ "Take SEXP, a tuple as returned by 'partition->gexp', and turn it into a record." (match sexp - ((size file-system label uuid) + ((size file-system file-system-options label uuid) (partition (size size) (file-system file-system) + (file-system-options file-system-options) (label label) (uuid uuid))))) @@ -71,19 +72,22 @@ take the partition metadata size into account, take a 25% margin." 'make-partition-image'." (let ((size (partition-size partition)) (fs (partition-file-system partition)) + (fs-options (partition-file-system-options partition)) (label (partition-label partition)) (uuid (partition-uuid partition)) - (options "lazy_itable_init=1,lazy_journal_init=1")) - (invoke "mke2fs" "-t" fs "-d" root - "-L" label "-U" (uuid->string uuid) - "-E" (format #f "root_owner=~a:~a,~a" - owner-uid owner-gid options) - target - (format #f "~ak" - (size-in-kib - (if (eq? size 'guess) - (estimate-partition-size root) - size)))))) + (journal-options "lazy_itable_init=1,lazy_journal_init=1")) + (apply invoke + `("mke2fs" "-t" ,fs "-d" ,root + "-L" ,label "-U" ,(uuid->string uuid) + "-E" ,(format #f "root_owner=~a:~a,~a" + owner-uid owner-gid journal-options) + ,@fs-options + ,target + ,(format #f "~ak" + (size-in-kib + (if (eq? size 'guess) + (estimate-partition-size root) + size))))))) (define* (make-vfat-image partition target root) "Handle the creation of VFAT partition images. See 'make-partition-image'." diff --git a/gnu/image.scm b/gnu/image.scm index b434ed50e3..0a92d168e9 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -24,6 +24,7 @@ partition-size partition-offset partition-file-system + partition-file-system-options partition-label partition-uuid partition-flags @@ -46,14 +47,16 @@ (define-record-type* partition make-partition partition? - (device partition-device (default #f)) - (size partition-size) - (offset partition-offset (default 0)) - (file-system partition-file-system (default "ext4")) - (label partition-label (default #f)) - (uuid partition-uuid (default #f)) - (flags partition-flags (default '())) - (initializer partition-initializer (default #f))) + (device partition-device (default #f)) + (size partition-size) + (offset partition-offset (default 0)) + (file-system partition-file-system (default "ext4")) + (file-system-options partition-file-system-options + (default '())) + (label partition-label (default #f)) + (uuid partition-uuid (default #f)) + (flags partition-flags (default '())) + (initializer partition-initializer (default #f))) ;;; diff --git a/gnu/system/image.scm b/gnu/system/image.scm index cb770a17e8..a1214dd20a 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -117,6 +117,7 @@ 'make-partition-image'." #~'(#$@(list (partition-size partition)) #$(partition-file-system partition) + #$(partition-file-system-options partition) #$(partition-label partition) #$(and=> (partition-uuid partition) uuid-bytevector))) -- cgit 1.4.1 From a933ee559127561a0d628a5f9c6ede9ba1ab2ebb Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:52 +0200 Subject: gnu: ffmpeg: Update to 4.2.3. * gnu/packages/video.scm (ffmpeg): Update to 4.2.3. Signed-off-by: Leo Famulari --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6529ae6507..e541016010 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -930,7 +930,7 @@ operate properly.") (define-public ffmpeg (package (name "ffmpeg") - (version "4.2.2") + (version "4.2.3") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" @@ -939,7 +939,7 @@ operate properly.") (patches (search-patches "ffmpeg-prefer-dav1d.patch")) (sha256 (base32 - "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb")))) + "0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx")))) (build-system gnu-build-system) (inputs `(("dav1d" ,dav1d) -- cgit 1.4.1 From c827c52ac355a28f0e64c293a2b2a653ad3809d9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 26 May 2020 14:18:01 -0400 Subject: gnu: DarkIce: Update to 1.4. * gnu/packages/audio.scm (darkice): Update to 1.4. [source]: Update URL. Remove obsolete patch. * gnu/packages/patches/darkice-workaround-fpermissive-error.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/audio.scm | 12 ++--- .../darkice-workaround-fpermissive-error.patch | 62 ---------------------- 3 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/darkice-workaround-fpermissive-error.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7d23b04723..3d5653b0b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -851,7 +851,6 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ - %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4f1667b9d5..893c56514c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3930,15 +3930,15 @@ other Gnaural instances, allowing synchronous sessions between many users.") (define-public darkice (package (name "darkice") - (version "1.3") + (version "1.4") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/darkice/darkice/" - version "/darkice-" version ".tar.gz")) + (uri (string-append "https://github.com/rafael2k/darkice/releases/" + "download/v" version "/darkice-" + version ".tar.gz")) (sha256 - (base32 "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c")) - (patches - (search-patches "darkice-workaround-fpermissive-error.patch")))) + (base32 + "05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("lame" ,lame) diff --git a/gnu/packages/patches/darkice-workaround-fpermissive-error.patch b/gnu/packages/patches/darkice-workaround-fpermissive-error.patch deleted file mode 100644 index 5ee29147c2..0000000000 --- a/gnu/packages/patches/darkice-workaround-fpermissive-error.patch +++ /dev/null @@ -1,62 +0,0 @@ -Copied from Debian: - - -From 1e2eb18d349f205c70cb2836232825442359b6e3 Mon Sep 17 00:00:00 2001 -From: belette -Date: Wed, 26 Oct 2016 02:43:43 +0200 -Subject: Cast float* in SRC lib calls to delete fpermissive compilation error - ---- - darkice/trunk/src/FaacEncoder.cpp | 2 +- - darkice/trunk/src/OpusLibEncoder.cpp | 2 +- - darkice/trunk/src/VorbisLibEncoder.cpp | 2 +- - darkice/trunk/src/aacPlusEncoder.cpp | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - ---- a/src/FaacEncoder.cpp -+++ b/src/FaacEncoder.cpp -@@ -164,7 +164,7 @@ FaacEncoder :: write ( const void * buf, - if ( converter ) { - unsigned int converted; - #ifdef HAVE_SRC_LIB -- src_short_to_float_array ((short *) b, converterData.data_in, samples); -+ src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples); - converterData.input_frames = nSamples; - converterData.data_out = resampledOffset + (resampledOffsetSize * channels); - int srcError = src_process (converter, &converterData); ---- a/src/OpusLibEncoder.cpp -+++ b/src/OpusLibEncoder.cpp -@@ -403,7 +403,7 @@ OpusLibEncoder :: write ( const void * buf, - #ifdef HAVE_SRC_LIB - (void)inCount; - converterData.input_frames = processed; -- src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples); -+ src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples); - int srcError = src_process (converter, &converterData); - if (srcError) - throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); ---- a/src/VorbisLibEncoder.cpp -+++ b/src/VorbisLibEncoder.cpp -@@ -337,7 +337,7 @@ VorbisLibEncoder :: write ( const void * buf, - int converted; - #ifdef HAVE_SRC_LIB - converterData.input_frames = nSamples; -- src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples); -+ src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples); - int srcError = src_process (converter, &converterData); - if (srcError) - throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); ---- a/src/aacPlusEncoder.cpp -+++ b/src/aacPlusEncoder.cpp -@@ -155,7 +155,7 @@ aacPlusEncoder :: write ( const void * buf, - if ( converter ) { - unsigned int converted; - #ifdef HAVE_SRC_LIB -- src_short_to_float_array ((short *) b, converterData.data_in, samples); -+ src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples); - converterData.input_frames = nSamples; - converterData.data_out = resampledOffset + (resampledOffsetSize * channels); - int srcError = src_process (converter, &converterData); --- -2.11.0 - -- cgit 1.4.1 From 41701f4b2394036dc3d6616c349d0374516cd7fb Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:40:44 -0500 Subject: gnu: netsurf-buildsystem: Update to 1.9. * gnu/packages/web.scm (netsurf-buildsystem): Update to 1.9. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c7bea4c5ae..da392937d5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4735,7 +4735,7 @@ tools they trust (e.g. wget).") (define netsurf-buildsystem (package (name "netsurf-buildsystem") - (version "1.7") + (version "1.9") (source (origin (method url-fetch) @@ -4743,7 +4743,7 @@ tools they trust (e.g. wget).") "buildsystem-" version ".tar.gz")) (sha256 (base32 - "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw")))) + "0alsmaig9ln8dgllb3z63gq90fiz75jz0ic71fi0k0k898qix14k")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments -- cgit 1.4.1 From 3f0f147a5f21791be3e57b4f117887db3590262e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:43:15 -0500 Subject: gnu: hubbub: Update to 0.3.7. * gnu/packages/web.scm (hubbub): Update to 0.3.7. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index da392937d5..de28c3c711 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4799,7 +4799,7 @@ C. It is developed as part of the NetSurf project.") (define-public hubbub (package (name "hubbub") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) @@ -4807,7 +4807,7 @@ C. It is developed as part of the NetSurf project.") "libhubbub-" version "-src.tar.gz")) (sha256 (base32 - "1x3v7xvagx85v9h3pypzc86rcxs4mij87mmcqkp8pq50q6awfmnp")) + "1dimfyblmym98qa1b80c5jslv2zk8r44xbdrgrsrw1n9wr9y4yly")) (patches (search-patches "hubbub-sort-entities.patch")))) (build-system gnu-build-system) (native-inputs -- cgit 1.4.1 From b0228793704298c2d40154ed63fd75e95b9b1180 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:43:46 -0500 Subject: gnu: libwapcaplet: Update to 0.4.3. * gnu/packages/web.scm (libwapcaplet): Update to 0.4.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index de28c3c711..a2e4c80fe2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4938,7 +4938,7 @@ commenting.") (define-public libwapcaplet (package (name "libwapcaplet") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) @@ -4946,7 +4946,7 @@ commenting.") "libwapcaplet-" version "-src.tar.gz")) (sha256 (base32 - "1fjwzbn7j8bi1b9bvwxsy3i2cr6byq2s2d29866801pjnf528g86")))) + "0p0c2q9lsj4vs97aa7vjllfhw33zv3dpysdkjblzhib6dpfs2alv")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit 1.4.1 From 1953b48966379c9e324c3fa05d959a3cdc15807e Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:44:13 -0500 Subject: gnu: libcss: Update to 0.9.1. * gnu/packages/web.scm (libcss): Update to 0.9.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a2e4c80fe2..95d11bcf43 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4964,7 +4964,7 @@ developed as part of the Netsurf project.") (define-public libcss (package (name "libcss") - (version "0.9.0") + (version "0.9.1") (source (origin (method url-fetch) @@ -4972,7 +4972,7 @@ developed as part of the Netsurf project.") "libcss-" version "-src.tar.gz")) (sha256 (base32 - "1vw9j3d2mr4wbvs8fyqmgslkbxknvac10456775hflxxcivbm3xr")))) + "1p66sdiiqm7w4jkq23hsf08khsnmq93hshh9f9m8sbirjdpf3p6j")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit 1.4.1 From a1c6bab52acf244e7f2410837ee2d1ffa4631ee9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:47:14 -0500 Subject: gnu: libdom: Update to 0.4.1. * gnu/packages/web.scm (libdom): Update to 0.4.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 95d11bcf43..adef56d9d1 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5032,7 +5032,7 @@ in which the loaded data is arranged in memory.") (define-public libdom (package (name "libdom") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) @@ -5040,7 +5040,7 @@ in which the loaded data is arranged in memory.") "libdom-" version "-src.tar.gz")) (sha256 (base32 - "1ixkqsl3f7dl1kajksm0c231w1v5xy8z6hm3v67hgm9nh4qcvfcy")))) + "0jpg5hx3y0mdxk5szd47dyijqimd2321brbqk2620pp5f4j0gvlq")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit 1.4.1 From 82441f35c2d52fb1bce8545145a88086853bc97f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:47:51 -0500 Subject: gnu: libnsbmp: Update to 0.1.6. * gnu/packages/web.scm (libnsbmp): Update to 0.1.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index adef56d9d1..278fd5d263 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5099,7 +5099,7 @@ project.") (define-public libnsbmp (package (name "libnsbmp") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -5107,7 +5107,7 @@ project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35")))) + "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit 1.4.1 From 2f3cf0b655c553097f7caafcc0ecd4279860add6 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:48:18 -0500 Subject: gnu: libnslog: Update to 0.1.3. * gnu/packages/web.scm (libnslog): Update to 0.1.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 278fd5d263..4bf1199c2a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5145,7 +5145,7 @@ C. It is developed as part of the NetSurf project.") (define-public libnslog (package (name "libnslog") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -5153,7 +5153,7 @@ C. It is developed as part of the NetSurf project.") "libnslog-" version "-src.tar.gz")) (sha256 (base32 - "1ggs6xvxp8fbg5w8pifalipm458ygr9ab6j2yvj8fnnmxwvdh4jd")))) + "1l2k0kdv9iv18svhv360vszjavhl4g09cp8a8yb719pgsylxr67w")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit 1.4.1 From 7c91bca9a14345a4eb782665f20d3d3d7b1bd965 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:48:41 -0500 Subject: gnu: libnsutils: Update to 0.1.0. * gnu/packages/web.scm (libnsutils): Update to 0.1.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4bf1199c2a..bebfa0eb53 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5173,7 +5173,7 @@ client applications. It is developed as part of the NetSurf project.") (define-public libnsutils (package (name "libnsutils") - (version "0.0.5") + (version "0.1.0") (source (origin (method url-fetch) @@ -5181,7 +5181,7 @@ client applications. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf")))) + "1w5fyy2i60a3v3if3iqcn9sy9sycx6966rcx53v85gja6hb6a33r")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit 1.4.1 From a7597d2dce8377390896ba5222eb4dfb7e3f69be Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:49:16 -0500 Subject: gnu: libnspsl: Update to 0.1.6. * gnu/packages/web.scm (libnspsl): Update to 0.1.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bebfa0eb53..4f5646df24 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5196,7 +5196,7 @@ developed as part of the NetSurf project.") (define-public libnspsl (package (name "libnspsl") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) @@ -5204,7 +5204,7 @@ developed as part of the NetSurf project.") "libnspsl-" version "-src.tar.gz")) (sha256 (base32 - "0siq8zjfxv75i9fw6q5hkaijpdm1w3zskd5qk6vsvz8cqan4vifd")))) + "02q28n5i6fwqcz1nn167rb71k1q95mx38mfah6zi1lvqrc2q5ifk")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit 1.4.1 From 981d80b331afc39365ccf393684b9b94cd0eaec0 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:49:48 -0500 Subject: gnu: nsgenbind: Update to 0.8. * gnu/packages/web.scm (nsgenbind): Update to 0.8. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4f5646df24..68b0336781 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5219,7 +5219,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") (define-public nsgenbind (package (name "nsgenbind") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) @@ -5227,7 +5227,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") "nsgenbind-" version "-src.tar.gz")) (sha256 (base32 - "0rplmky4afsjwiwh7grkmcdmzg86zksa55j93dvq92f91yljwqqq")))) + "1cqwgwca49jvmijwiyaab2bwxicgxdrnlpinf8kp3nha02nm73ad")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit 1.4.1 From 5c133ca561acfc1a1b9fe6dfc03d2bd12784242c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 14:50:10 -0500 Subject: gnu: netsurf: Update to 3.10. * gnu/packages/web.scm (netsurf): Update to 3.10. * gnu/packages/patches/netsurf-system-utf8proc.patch: Adjust to new source. --- gnu/packages/patches/netsurf-system-utf8proc.patch | 51 +++------------------- gnu/packages/web.scm | 4 +- 2 files changed, 9 insertions(+), 46 deletions(-) diff --git a/gnu/packages/patches/netsurf-system-utf8proc.patch b/gnu/packages/patches/netsurf-system-utf8proc.patch index a2ee52ca05..04bf828f37 100644 --- a/gnu/packages/patches/netsurf-system-utf8proc.patch +++ b/gnu/packages/patches/netsurf-system-utf8proc.patch @@ -1,50 +1,13 @@ -Use upstream utf8proc package, as suggested in -http://source.netsurf-browser.org/libutf8proc.git/commit/?id=770e329cceaf0620c7b482589a9b17ed1d19c16d +Fix include directory for system utf8proc. -Work around upstream's lack of a pkg-config file and update API. - ---- netsurf-3.6/Makefile -+++ netsurf-3.6/Makefile -@@ -527,10 +527,9 @@ - $(eval $(call pkg_config_find_and_add,libcss,CSS)) - $(eval $(call pkg_config_find_and_add,libdom,DOM)) - $(eval $(call pkg_config_find_and_add,libnsutils,nsutils)) --$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc)) - - # Common libraries without pkg-config support --LDFLAGS += -lz -+LDFLAGS += -lz -lutf8proc +--- netsurf-3.10/utils/idna.c ++++ netsurf-3.10/utils/idna.c +@@ -167,7 +167,7 @@ - # Optional libraries with pkgconfig + #ifdef WITH_UTF8PROC ---- netsurf-3.8/utils/idna.c -+++ netsurf-3.8/utils/idna.c -@@ -27,7 +27,7 @@ - #include - #include - #include -#include +#include - #include "netsurf/inttypes.h" - ---- netsurf-3.8/test/Makefile -+++ netsurf-3.8/test/Makefile -@@ -142,14 +142,15 @@ - -Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \ - -Dnsgtk \ - $(SAN_FLAGS) \ -- $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \ -+ $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \ - $(LIB_CFLAGS) - TESTCFLAGS := $(BASE_TESTCFLAGS) \ - $(COV_CFLAGS) \ - $(COV_CPPFLAGS) - - TESTLDFLAGS := -L$(TESTROOT) \ -- $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \ -+ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) \ -+ $(LDFLAGS) \ - $(SAN_FLAGS) \ - $(LIB_LDFLAGS)\ - $(COV_LDFLAGS) + int32_t idna_contexto[] = { + /* CONTEXTO codepoints which have a rule defined */ diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 68b0336781..d8290ff53a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5247,7 +5247,7 @@ w3c webidl files and a binding configuration file.") (define-public netsurf (package (name "netsurf") - (version "3.9") + (version "3.10") (source (origin (method url-fetch) @@ -5255,7 +5255,7 @@ w3c webidl files and a binding configuration file.") "releases/source/netsurf-" version "-src.tar.gz")) (sha256 (base32 - "1hzcm2s2wh5sapgr000lg63hcdbj6hyajxl43xa1x80kc5piqbyp")) + "0plra64c5xyiw12yx2q13brxsv8apmany97zqa2lcqckw4ll8j1n")) (patches (search-patches "netsurf-system-utf8proc.patch" "netsurf-y2038-tests.patch" "netsurf-longer-test-timeout.patch" -- cgit 1.4.1 From cfdefb863c274ecdbd452836364e68e1028c7bb1 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 26 May 2020 15:15:10 -0500 Subject: gnu: netsurf: Remove tabulations in source. * gnu/packages/web.scm (netsurf): Remove tabulations. --- gnu/packages/web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d8290ff53a..66774c4a2d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5322,18 +5322,18 @@ w3c webidl files and a binding configuration file.") (display (read-line in 'concat) out) (sxml->xml (let rec ((sxml (xml->sxml in - #:default-entity-handler - (lambda (port name) - (string-append "" - (symbol->string name) - ""))))) + #:default-entity-handler + (lambda (port name) + (string-append "" + (symbol->string name) + ""))))) ;; We'd like to use sxml-match here, but it can't ;; match against generic tag symbols... (match sxml (`(div (@ (class "links")) . ,rest) '()) - (`(ENTITY ,ent) - `(*ENTITY* ,ent)) + (`(ENTITY ,ent) + `(*ENTITY* ,ent)) ((x ...) (map rec x)) (x x))) -- cgit 1.4.1 From 1bea1b3549537df75fd22a34ab15d1cdb3af72d7 Mon Sep 17 00:00:00 2001 From: TomZ Date: Tue, 26 May 2020 22:53:14 +0200 Subject: gnu: flowee: Update to 2020.04.1. * gnu/packages/finance.scm (flowee): Update to 2020.04.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3e23fcceea..f182057bb4 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1521,14 +1521,14 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") (define-public flowee (package (name "flowee") - (version "2020.03.3") + (version "2020.04.1") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/FloweeTheHub/thehub/-/archive/" version "/thehub-" version ".tar.gz")) (sha256 - (base32 "0ksyh7ll3v9p8f5y15vcb2vkrpzb4h0ricag9j90ad4b4rfsnpjw")))) + (base32 "1vwvaxm3b71pfx8l4rrv06wqks6xdf2333w856b36s1bzvj53rhc")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dbuild_tests=ON" "-Denable_gui=OFF") -- cgit 1.4.1 From 8880db51d2e052621e4c54f4d594bbc5867d7af2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 00:35:29 +0200 Subject: gnu: fet: Update to 5.44.7. * gnu/packages/education.scm (fet): Update to 5.44.7. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 980cec5443..f8e77f07ad 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -606,14 +606,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.44.4") + (version "5.44.7") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "1bji4910v6adhngdh5ajz5bxam9z3yqnh8d1h1xajy6npm6qq3nx")))) + (base32 "19b22brpb2mpvg14c2a0xmv8ipq5jg7yjmly8y3gfy8gmc3wqg5m")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 10857feaeb69cfbbdbba13dfe2a4d106a400f4d6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 00:41:27 +0200 Subject: gnu: emacs-chronometrist: Update to 0.4.3. * gnu/packages/emacs-xyz.scm (emacs-chronometrist): Update to 0.4.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b99acb7815..cf4bd00217 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1906,7 +1906,7 @@ Lock key.") (define-public emacs-chronometrist (package (name "emacs-chronometrist") - (version "0.4.2") + (version "0.4.3") (source (origin (method git-fetch) @@ -1915,7 +1915,7 @@ Lock key.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ccy7qz1wcmggqlf3hwigbqq4wrx1amds4x9bxz9py6bypglyjc5")))) + (base32 "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit 1.4.1 From f41f8822721571625f3fa315681dc2717d3d4a5c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:45:21 +0200 Subject: gnu: bbmap: Use HTTPS home page URI. * gnu/packages/bioinformatics.scm (bbmap)[home-page]: Use HTTPS URI. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a738aa51a8..8def77c6dc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14684,7 +14684,7 @@ is a Cython wrapper for FIt-SNE.") ("java-eclipse-jdt-core" ,java-eclipse-jdt-core) ("java-eclipse-jdt-compiler-apt" ,java-eclipse-jdt-compiler-apt) ("java-openmpi" ,java-openmpi))) - (home-page "http://sourceforge.net/projects/bbmap/") + (home-page "https://sourceforge.net/projects/bbmap/") (synopsis "Aligner and other tools for short sequencing reads") (description "This package provides bioinformatic tools to align, deduplicate, -- cgit 1.4.1 From 2798d5b5843b7ad644b63c808cf848bae9cfb954 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:47:31 +0200 Subject: gnu: catcodec: Use HTTPS home page URI. * gnu/packages/game-development.scm (catcodec)[home-page]: Use HTTPS URI. --- gnu/packages/game-development.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 99c0711e1a..185f1bebf3 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -256,15 +256,14 @@ necessary. (uri (string-append "https://binaries.openttd.org/extra/catcodec/" version "/catcodec-" version "-source.tar.xz")) (sha256 - (base32 - "1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7")))) + (base32 "1qg0c2i4p29sxj0q6qp2jynlrzm5pphz2xhcjqlxa69ycrnlxzs7")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests #:make-flags (list (string-append "prefix=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://dev.openttdcoop.org/projects/catcodec") + (home-page "https://dev.openttdcoop.org/projects/catcodec") (synopsis "Encode/decode OpenTTD sounds") (description "catcodec encodes and decodes sounds for OpenTTD. These sounds are not much more than some metadata (description and filename) and raw -- cgit 1.4.1 From 98d6edb621ac69b8a5108b4452a2daa078ed0fcc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:48:37 +0200 Subject: gnu: blast+: Use HTTPS home page URI. * gnu/packages/bioinformatics.scm (blast+)[home-page]: Use HTTPS URI. --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8def77c6dc..cfa0263e46 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1401,7 +1401,7 @@ package provides command line tools using the Bio++ library.") ("python" ,python-wrapper))) (native-inputs `(("cpio" ,cpio))) - (home-page "http://blast.ncbi.nlm.nih.gov") + (home-page "https://blast.ncbi.nlm.nih.gov") (synopsis "Basic local alignment search tool") (description "BLAST is a popular method of performing a DNA or protein sequence -- cgit 1.4.1 From 272d5ada9a3cc951f81e000f51ad7dd506073a5b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:49:41 +0200 Subject: gnu: dvtm: Use HTTPS home page URI. * gnu/packages/dvtm.scm (dvtm)[home-page]: Use HTTPS URI. --- gnu/packages/dvtm.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/dvtm.scm b/gnu/packages/dvtm.scm index af16aa8f91..8515c5d06b 100644 --- a/gnu/packages/dvtm.scm +++ b/gnu/packages/dvtm.scm @@ -47,8 +47,7 @@ popularized by X11-window managers like dwm, to the console. As a console window manager it tries to make it easy to work with multiple console based programs.") - (home-page "http://www.brain-dump.org/projects/dvtm/") - + (home-page "https://www.brain-dump.org/projects/dvtm/") ;; "dvtm reuses some code of dwm and is released under the same MIT/X11 ;; license. The terminal emulation part is licensed under the ISC license." ;; source: http://www.brain-dump.org/projects/dvtm/#license -- cgit 1.4.1 From d9bb896f0b809eb1f7c826ad818c1303ea04802a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:54:28 +0200 Subject: gnu: emacs-evil-markdown: Small fixes. * gnu/packages/emacs-xyz.scm (emacs-evil-markdown)[propagated-inputs]: Re-order inputs. [home-page]: Fix URL. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cf4bd00217..ed06df54c6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6973,9 +6973,9 @@ in Emacs.") "0mad8sp5y9vyk28595qygspnyh8bfmb1fbxjlw70qwc1kdn822n4")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-markdown-mode" ,emacs-markdown-mode) - ("emacs-evil" ,emacs-evil))) - (home-page "http://jblevins.org/projects/evil-markdown/") + `(("emacs-evil" ,emacs-evil) + ("emacs-markdown-mode" ,emacs-markdown-mode))) + (home-page "https://github.com/Somelauw/evil-markdown/") (synopsis "Evil keybindings for @code{markdown-mode}") (description "This package provides custom text objects and bindings for -- cgit 1.4.1 From e450373bd67056c0bfcd9e9abfda5d0dcac5660f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:56:32 +0200 Subject: gnu: emacs-evil-markdown: Update to 0.0.2-2-685d7fb. * gnu/packages/emacs-xyz.scm (emacs-evil-markdown): Update to 0.0.2-2-685d7fb. --- gnu/packages/emacs-xyz.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ed06df54c6..492a313dae 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6957,20 +6957,20 @@ in Emacs.") (license license:gpl3+))) (define-public emacs-evil-markdown - (let ((commit "46cd81b37991c4325fc24015a610f832b0ff995d") - (revision "1")) + (let ((commit "685d7fbb81bc02fa32779d2a127b99a0c8c7436b") + (revision "2")) (package (name "emacs-evil-markdown") (version (git-version "0.0.2" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Somelauw/evil-markdown.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0mad8sp5y9vyk28595qygspnyh8bfmb1fbxjlw70qwc1kdn822n4")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Somelauw/evil-markdown.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z1sjn6dcqv8mmkh6nfcwhnql2z6xr9yx3hs77bfxj79pf3c466p")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit 1.4.1 From ec285222e9dd08f8ac780d5ec46be5672000c4b9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 01:59:03 +0200 Subject: gnu: emacs-load-relative: Use HTTPS home page URI. * gnu/packages/emacs-xyz.scm (emacs-load-relative)[home-page]: Use HTTPS URI. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 492a313dae..c287649333 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5913,7 +5913,7 @@ test tags. It supports both interactive and non-interactive use.") (sha256 (base32 "1m37scr82lqqy954fchjxrmdh4lngrl4d1yzxhp3yfjhsydizhrj")))) (build-system emacs-build-system) - (home-page "http://github.com/rocky/emacs-load-relative") + (home-page "https://github.com/rocky/emacs-load-relative") (synopsis "Emacs Lisp relative file loading related functions") (description "Provides functions which facilitate writing multi-file Emacs packages -- cgit 1.4.1 From 646d231d8f2f8cdcc534adfb36250aba93b35491 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:00:47 +0200 Subject: gnu: emacs-ryo-modal: Use HTTPS home page URI. * gnu/packages/emacs-xyz.scm (emacs-ryo-modal)[home-page]: Use HTTPS URI. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c287649333..45a10f4689 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7491,7 +7491,7 @@ names, e.g. #0000ff is displayed in white with a blue background.") (sha256 (base32 "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95")))) (build-system emacs-build-system) - (home-page "http://github.com/Kungsgeten/ryo-modal") + (home-page "https://github.com/Kungsgeten/ryo-modal") (synopsis "Emacs minor mode for defining modal editing environments") (description "RYO modal provides a convenient way of defining modal keybindings in Emacs, and does not come with any predefined bindings.") -- cgit 1.4.1 From 45a21ee45d1781cb6a4dad1d53eeef16cd573436 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:02:40 +0200 Subject: gnu: fastcap: Use HTTPS home page URI. * gnu/packages/engineering.scm (fastcap)[home-page]: Use HTTPS URI. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3653f10aeb..edf701e087 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -535,7 +535,7 @@ featuring various improvements and bug fixes."))) (copy-recursively "doc" doc) (copy-recursively "examples" examples) #t)))))) - (home-page "http://www.rle.mit.edu/cpg/research_codes.htm") + (home-page "https://www.rle.mit.edu/cpg/research_codes.htm") (synopsis "Multipole-accelerated capacitance extraction program") (description "Fastcap is a capacitance extraction program based on a -- cgit 1.4.1 From ebeaf280bc269411b040a3f8d4d883b99db57533 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:03:23 +0200 Subject: gnu: fasthenry: Use HTTPS home page URI. * gnu/packages/engineering.scm (fasthenry)[home-page]: Use HTTPS URI. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index edf701e087..369110a044 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -583,7 +583,7 @@ multipole-accelerated algorithm.") (copy-recursively "doc" doc) (copy-recursively "examples" examples) #t)))))) - (home-page "http://www.rle.mit.edu/cpg/research_codes.htm") + (home-page "https://www.rle.mit.edu/cpg/research_codes.htm") (synopsis "Multipole-accelerated inductance analysis program") (description "Fasthenry is an inductance extraction program based on a -- cgit 1.4.1 From 6fe3a0b6be998b3c1f5ca46f5328fbda76b6d73a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:04:39 +0200 Subject: gnu: gcide: Use HTTPS home page URI. * gnu/packages/dictionaries.scm (gcide)[home-page]: Use HTTPS URI. --- gnu/packages/dictionaries.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 4f8c35d040..c13dbc2454 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -119,7 +119,7 @@ acronyms distributed as an info document.") "GCIDE is a free dictionary based on a combination of sources. It can be used via the GNU Dico program or accessed online at http://gcide.gnu.org.ua/") - (home-page "http://gcide.gnu.org.ua/") + (home-page "https://gcide.gnu.org.ua/") (license license:gpl3+))) (define-public diction -- cgit 1.4.1 From a5374cde918cfeae5c16b43b9f2dd2b24bc3564d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:06:36 +0200 Subject: gnu: gpm: Use HTTPS URI. * gnu/packages/linux.scm (gpm)[home-page, source]: Use HTTPS URI. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2788f9d319..dad7b6e992 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4504,8 +4504,8 @@ Ridge, Joliet, and zisofs.") (source (origin (method url-fetch) (uri (string-append - "http://www.nico.schottelius.org/software/gpm/archives/gpm-" - version ".tar.bz2")) + "https://www.nico.schottelius.org/software/gpm/archives/" + "gpm-" version ".tar.bz2")) (patches (search-patches "gpm-glibc-2.26.patch")) (sha256 (base32 @@ -4534,7 +4534,7 @@ Ridge, Joliet, and zisofs.") ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool))) - (home-page "http://www.nico.schottelius.org/software/gpm/") + (home-page "https://www.nico.schottelius.org/software/gpm/") (synopsis "Mouse support for the Linux console") (description "The GPM (general-purpose mouse) daemon is a mouse server for -- cgit 1.4.1 From 5507ff8e850bf443965a8aa03385895714ae02d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:59:26 +0200 Subject: gnu: radare2: Remove unused gmp input. * gnu/packages/engineering.scm (radare2)[inputs]: Remove gmp. --- gnu/packages/engineering.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 369110a044..96526cbbf6 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1358,11 +1358,11 @@ bindings for Python, Java, OCaml and more.") "--with-openssl" "--with-rpath") #:make-flags (list "CC=gcc"))) + ;; TODO: Add gmp and libzip and make the build system actually find them. (inputs - `(("openssl" ,openssl) - ("zip" ,zip) - ("gmp" ,gmp) - ("capstone" ,capstone))) + `(("capstone" ,capstone) + ("openssl" ,openssl) + ("zip" ,zip))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://radare.org/") -- cgit 1.4.1 From ecc8cd984e69d33c625df775fb779275c90612a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:01:31 +0200 Subject: gnu: radare2: Add more inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (radare2)[arguments]: Add ‘--with-sysxxhash’ to #:configure-flags. [inputs]: Add libuv. [propagated-inputs]: Add xxhash. --- gnu/packages/engineering.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 96526cbbf6..2102f8d295 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages digest) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) @@ -82,6 +83,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) ;FIXME: for pcb #:use-module (gnu packages m4) #:use-module (gnu packages maths) @@ -1354,17 +1356,25 @@ bindings for Python, Java, OCaml and more.") (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) #t))) #:configure-flags - (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" - "--with-openssl" "--with-rpath") + (list "--with-openssl" + "--with-rpath" + "--with-syscapstone" + "--with-sysmagic" + "--with-syszip" + "--with-sysxxhash") #:make-flags (list "CC=gcc"))) ;; TODO: Add gmp and libzip and make the build system actually find them. (inputs `(("capstone" ,capstone) + ("libuv" ,libuv) ("openssl" ,openssl) ("zip" ,zip))) (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + ;; In the Libs: section of r_hash.pc. + `(("xxhash" ,xxhash))) (home-page "https://radare.org/") (synopsis "Reverse engineering framework") (description -- cgit 1.4.1 From 057c7f1c6707c0585cc84d6e770eb8de84b965b8 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:51 +0200 Subject: gnu: ansible: Update to 2.9.9. * gnu/packages/admin.scm (ansible): Update to 2.9.9. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7ec68d1d64..08131a8dd0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2025,13 +2025,13 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.9.6") + (version "2.9.9") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "1jfbp1i3nl4yvqwd5ssy43dz3pq2x03mn875vb8r56gqh43kmksr")))) + (base32 "1l99vwkl48iwr8ffd1ihqia995mz8h8hwk4akm4w0cgiifp88gg8")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit 1.4.1 From 9554fb105802e122177a7a604ddd3b5530a250c0 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:53 +0200 Subject: gnu: unbound: Update to 1.10.1. * gnu/packages/dns.scm (unbound): Update to 1.10.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index d0c03ff2d5..8b21c79385 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -391,14 +391,14 @@ to result in system-wide compromise.") (define-public unbound (package (name "unbound") - (version "1.10.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm")))) + (base32 "0dnmh9jjh2v274f0hl31bgv40pl77mmfgky8bkqr5kvi3b17fdmp")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit 1.4.1 From 71b000bf0353358b14174f06403c804312a4a772 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:55 +0200 Subject: gnu: gitolite: Update to 3.6.11. * gnu/packages/version-control.scm (gitolite): Update to 3.6.11. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 09ffd8f271..4f3968286d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1307,7 +1307,7 @@ also walk each side of a merge and test those changes individually.") (define-public gitolite (package (name "gitolite") - (version "3.6.7") + (version "3.6.11") (source (origin (method git-fetch) @@ -1316,7 +1316,7 @@ also walk each side of a merge and test those changes individually.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb")))) + (base32 "1rkj7gknwjlc5ij9w39zf5mr647bm45la57yjczydmvrb8c56yrh")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit 1.4.1 From 15475f0ceca17b0ed68a4b3e4a89d1f483eaca94 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:56 +0200 Subject: gnu: nagios: Update to 4.4.6. * gnu/packages/monitoring.scm (nagios): Update to 4.4.6. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/monitoring.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index d88bbc3aa3..f6a1153548 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -62,7 +62,7 @@ (define-public nagios (package (name "nagios") - (version "4.3.4") + (version "4.4.6") ;; XXX: Nagios 4.2.x and later bundle a copy of AngularJS. (source (origin (method url-fetch) @@ -71,7 +71,7 @@ version "/nagios-" version ".tar.gz")) (sha256 (base32 - "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9")) + "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db")) (modules '((guix build utils))) (snippet ;; Ensure reproducibility. -- cgit 1.4.1 From 3e7a48677e612775c07d80b17ca9a585c8a8cf8e Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:58 +0200 Subject: gnu: xerces-c: Update to 3.2.3. * gnu/packages/xml.scm (xerces-c): Update to 3.2.3. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d9efd5264b..90181a1773 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1286,14 +1286,14 @@ spreadsheet.") (define-public xerces-c (package (name "xerces-c") - (version "3.1.4") + (version "3.2.3") (source (origin (method url-fetch) (uri (string-append "mirror://apache/xerces/c/3/sources/" "xerces-c-" version ".tar.xz")) (sha256 (base32 - "0hb29c0smqlpxj0zdm09s983z5jx37szlliccnvgh0qq91wwqwwr")))) + "0jf1khvlssg31vkxbc25dxjxcxm56xb8nywj1sypj6hxzjlrkz0j")))) (build-system gnu-build-system) (arguments (let ((system (or (%current-target-system) -- cgit 1.4.1 From 695fb93e3b25d4b8f78da773e20135c4b2508b68 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:59 +0200 Subject: gnu: java-xerces: Update to 2.12.1. * gnu/packages/java.scm (java-xerces): Update to 2.12.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a4659240fc..b12c3ca95c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10523,14 +10523,14 @@ classes prior to Java SE 8.") (define-public java-xerces (package (name "java-xerces") - (version "2.11.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (string-append "mirror://apache/xerces/j/source/" "Xerces-J-src." version ".tar.gz")) (sha256 - (base32 "1006igwy2lqrmjvdk64v8dg6qbk9c29pm8xxx7r87n0vnpvmx6pm")) + (base32 "0494kq36gw3nah19ifb720vwxbpg4ww0k6m3zq6wyanw6a083p6s")) (patches (search-patches "java-xerces-xjavac_taskdef.patch" "java-xerces-build_dont_unzip.patch" -- cgit 1.4.1 From 3c0d165ad3627aa8c7696e4ec064da0bb947f23f Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 27 May 2020 01:04:42 +0100 Subject: gnu: Add lsp-plugins. * gnu/packages/music.scm (lsp-plugins): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2c6be8eba8..dec986e5e5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4863,6 +4863,53 @@ effects. It contains a bitcrusher, delay, distortion, equalizer, compressor, and reverb.") (license license:gpl2+))) +(define-public lsp-plugins + (package + (name "lsp-plugins") + (version "1.1.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sadko4u/lsp-plugins.git") + (commit (string-append "lsp-plugins-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zw0iip6ki9k65kh8dp53x7l4va4mi5rj793n2yn4p9y84qzwrz9")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list + (string-append "CC=" + (if ,(%current-target-system) + (string-append (assoc-ref %build-inputs "cross-gcc") + "/bin/" ,(%current-target-system) "-gcc") + "gcc")) + "BUILD_MODULES=\"lv2 ladspa jack\"" "VST_UI=0" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "ETC_PATH=" (assoc-ref %outputs "out") "/etc")) + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure + #:test-target "test")) + (inputs + `(("cairo", cairo) + ("hicolor-icon-theme", hicolor-icon-theme) + ("jack", jack-1) + ("ladspa", ladspa) + ("libsndfile", libsndfile) + ("lv2", lv2) + ("mesa", mesa))) + (native-inputs + `(("pkg-config", pkg-config))) + (synopsis "Audio plugin collection") + (description "LSP (Linux Studio Plugins) is a collection of audio +plugins available as LADSPA/LV2 plugins and as standalone JACK +applications.") + (home-page "https://lsp-plug.in/") + (license license:lgpl3))) + (define-public sherlock-lv2 (package (name "sherlock-lv2") -- cgit 1.4.1 From 8c1d7c8511ceca1fe650f3dd94b63a4945a1f9b7 Mon Sep 17 00:00:00 2001 From: Josh Marshall Date: Tue, 26 May 2020 23:12:26 -0400 Subject: gnu: aegis: Fix build failure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (aegis)[arguments]: Add ‘CXXFLAGS=-std=c++03’ to #:configure-flags. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/version-control.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4f3968286d..27c1f3beb9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1885,7 +1885,10 @@ accessed and migrated on modern systems.") ("ed" ,ed))) (arguments `(#:configure-flags (list "--with-no-aegis-configured" - "--sharedstatedir=/var/com/aegis") + "--sharedstatedir=/var/com/aegis" + ;; Uses the old 'throw()' specifier with 'new' + ;; which changed in C++11. + "CXXFLAGS=-std=c++03") #:parallel-build? #f ; There are some nasty racy rules in the Makefile. #:phases (modify-phases %standard-phases -- cgit 1.4.1 From 812dad08764af5ae4d80394732dcc1481742db3a Mon Sep 17 00:00:00 2001 From: Josh Marshall Date: Tue, 26 May 2020 23:12:26 -0400 Subject: gnu: aegis: Update home page. * gnu/packages/version-control.scm (aegis)[home-page]: Update and use HTTPS. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 27c1f3beb9..df00c4a5eb 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1931,7 +1931,7 @@ accessed and migrated on modern systems.") ;; The author decided to call the check rule "sure". (invoke "make" "sure"))))))) - (home-page "http://aegis.sourceforge.net") + (home-page "https://sourceforge.net/projects/aegis/") (synopsis "Project change supervisor") (description "Aegis is a project change supervisor, and performs some of the Software Configuration Management needed in a CASE environment. Aegis -- cgit 1.4.1 From 4b01930f5497b2b8ab85dbdfd171868712f20857 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 17:05:32 +0200 Subject: gnu: nauty: Update to 2.7r1. * gnu/packages/maths.scm (nauty): Update to 2.7r1. [arguments]: Prevent using "-march-native". Install new executable. --- gnu/packages/maths.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 3424aaa15e..76e9eacc1a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5349,20 +5349,20 @@ management via the GIMPS project's Primenet server.") (define-public nauty (package (name "nauty") - (version "2.6r12") - (source (origin - (method url-fetch) - (uri (string-append - "https://pallini.di.uniroma1.it/" - "nauty" (string-join (string-split version #\.) "") - ".tar.gz")) - (sha256 - (base32 - "1p4mxf8q5wm47nxyskxbqwa5p1vvkycv1zgswvnk9nsn6vff0al6")))) + (version "2.7r1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pallini.di.uniroma1.it/" + "nauty" (string-join (string-split version #\.) "") ".tar.gz")) + (sha256 + (base32 "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn")))) (build-system gnu-build-system) (outputs '("out" "lib")) (arguments `(#:test-target "checks" + #:configure-flags '("--enable-generic") ;prevent -march-native #:phases (modify-phases %standard-phases ;; Default make target does not build all available @@ -5382,15 +5382,16 @@ management via the GIMPS project's Primenet server.") (include (string-append lib-output "/include/nauty")) (lib (string-append lib-output "/lib/nauty"))) (for-each (lambda (f) (install-file f bin)) - '("dreadnaut" "NRswitchg" "addedgeg" "amtog" "biplabg" - "blisstog" "bliss2dre" "catg" "checks6" "complg" - "converseg" "copyg" "countg" "cubhamg" "deledgeg" - "delptg" "directg" "dretodot" "dretog" "genbg" + '("addedgeg" "amtog" "assembleg" "biplabg" "blisstog" + "bliss2dre" "catg" "checks6" "complg" "converseg" + "copyg" "countg" "cubhamg" "deledgeg" "delptg" + "directg" "dreadnaut" "dretodot" "dretog" "genbg" "genbgL" "geng" "genquarticg" "genrang" "genspecialg" "gentourng" "gentreeg" "hamheuristic" "labelg" "linegraphg" "listg" "multig" "newedgeg" "pickg" "planarg" "ranlabg" "shortg" "showg" "subdivideg" - "sumlines" "twohamg" "vcolg" "watercluster2")) + "sumlines" "twohamg" "underlyingg" "vcolg" + "watercluster2" "NRswitchg")) (for-each (lambda (f) (install-file f include)) (find-files "." "\\.h$")) (for-each (lambda (f) (install-file f lib)) -- cgit 1.4.1 From c889fbbf1f48ab09e9c2ca4ce6d4ceabcdbe8623 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 15:07:50 +0200 Subject: gnu: yoshimi: Update to 1.7.0.1-0.bfcadc6 to fix build. * gnu/packages/music.scm (yoshimi): Update to 1.7.0.1-0.bfcadc6. [source]: Use GIT-FETCH for now. --- gnu/packages/music.scm | 131 +++++++++++++++++++++++++------------------------ 1 file changed, 68 insertions(+), 63 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index dec986e5e5..89edcae43e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2237,61 +2237,66 @@ capabilities, custom envelopes, effects, etc.") (license license:gpl2))) (define-public yoshimi - (package - (name "yoshimi") - (version "1.7.0.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/yoshimi/" - (version-major+minor version) - "/yoshimi-" version ".tar.bz2")) - (sha256 - (base32 - "1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; there are no tests - #:configure-flags - (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR=" - (assoc-ref %outputs "out") "/share")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'enter-dir - (lambda _ (chdir "src") #t)) - ;; Move SSE compiler optimization flags from generic target to - ;; athlon64 and core2 targets, because otherwise the build would fail - ;; on non-Intel machines. - (add-after 'unpack 'remove-sse-flags-from-generic-target - (lambda _ - (substitute* "src/CMakeLists.txt" - (("-msse -msse2 -mfpmath=sse") "") - (("-march=(athlon64|core2)" flag) - (string-append flag " -msse -msse2 -mfpmath=sse"))) - #t))))) - (inputs - `(("boost" ,boost) - ("fftwf" ,fftwf) - ("alsa-lib" ,alsa-lib) - ("jack" ,jack-1) - ("fontconfig" ,fontconfig) - ("minixml" ,minixml) - ("mesa" ,mesa) - ("fltk" ,fltk) - ("lv2" ,lv2) - ("readline" ,readline) - ("ncurses" ,ncurses) - ("cairo" ,cairo) - ("zlib" ,zlib))) - (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://yoshimi.sourceforge.net/") - (synopsis "Multi-paradigm software synthesizer") - (description - "Yoshimi is a fork of ZynAddSubFX, a feature-heavy real-time software + ;; Release 1.7.1 doesn't build with our version of LV2. Applying only + ;; 86996cbb235f0fe138ae814a6758c2c8ba1c2a38 is not enough. + (let ((commit "bfcadc6537dbcb301cd93346f21d36bcbffa36c7") + (revision "0")) + (package + (name "yoshimi") + (version (git-version "1.7.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/yoshimi/code") + (commit commit))) + (sha256 + (base32 "0vhdxj7ky4iyq11r5wj9jwavjih4xvcn2djbrlmwpkdhrzpy6myl")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:configure-flags + (list (string-append "-DCMAKE_INSTALL_DATAROOTDIR=" + (assoc-ref %outputs "out") "/share")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'enter-dir + (lambda _ (chdir "src") #t)) + ;; Move SSE compiler optimization flags from generic target to + ;; athlon64 and core2 targets, because otherwise the build would fail + ;; on non-Intel machines. + (add-after 'unpack 'remove-sse-flags-from-generic-target + (lambda _ + (substitute* "src/CMakeLists.txt" + (("-msse -msse2 -mfpmath=sse") "") + (("-march=(athlon64|core2)" flag) + (string-append flag " -msse -msse2 -mfpmath=sse"))) + #t))))) + (inputs + `(("boost" ,boost) + ("fftwf" ,fftwf) + ("alsa-lib" ,alsa-lib) + ("jack" ,jack-1) + ("fontconfig" ,fontconfig) + ("minixml" ,minixml) + ("mesa" ,mesa) + ("fltk" ,fltk) + ("lv2" ,lv2) + ("readline" ,readline) + ("ncurses" ,ncurses) + ("cairo" ,cairo) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://yoshimi.sourceforge.net/") + (synopsis "Multi-paradigm software synthesizer") + (description + "Yoshimi is a fork of ZynAddSubFX, a feature-heavy real-time software synthesizer. It offers three synthesizer engines, multitimbral and polyphonic synths, microtonal capabilities, custom envelopes, effects, etc. Yoshimi improves on support for JACK features, such as JACK MIDI.") - (license license:gpl2))) + (license license:gpl2)))) (define-public libgig (package @@ -2961,7 +2966,7 @@ websites such as Libre.fm.") (home-page "https://github.com/yask123/Instant-Music-Downloader") (synopsis "Command-line program to download a song from YouTube") (description "InstantMusic downloads a song from YouTube in MP3 format. -Songs can be searched by artist, name or even by a part of the song text.") + Songs can be searched by artist, name or even by a part of the song text.") (license license:expat)))) (define-public beets @@ -3010,9 +3015,9 @@ Songs can be searched by artist, name or even by a part of the song text.") (home-page "https://beets.io") (synopsis "Music organizer") (description "The purpose of beets is to get your music collection right -once and for all. It catalogs your collection, automatically improving its -metadata as it goes using the MusicBrainz database. Then it provides a variety -of tools for manipulating and accessing your music.") + once and for all. It catalogs your collection, automatically improving its + metadata as it goes using the MusicBrainz database. Then it provides a variety + of tools for manipulating and accessing your music.") (license license:expat))) (define-public beets-bandcamp @@ -3038,8 +3043,8 @@ of tools for manipulating and accessing your music.") (synopsis "Bandcamp plugin for beets") (description "This plugin for beets automatically obtains tag data from @uref{Bandcamp, -https://bandcamp.com/}. It's also capable of getting song lyrics and album art -using the beets FetchArt plugin.") + https://bandcamp.com/}. It's also capable of getting song lyrics and album art + using the beets FetchArt plugin.") (license license:gpl2))) (define-public milkytracker @@ -3080,9 +3085,9 @@ using the beets FetchArt plugin.") `(("pkg-config" ,pkg-config))) (synopsis "Music tracker for working with .MOD/.XM module files") (description "MilkyTracker is a music application for creating .MOD and .XM -module files. It attempts to recreate the module replay and user experience of -the popular DOS program Fasttracker II, with special playback modes available -for improved Amiga ProTracker 2/3 compatibility.") + module files. It attempts to recreate the module replay and user experience of + the popular DOS program Fasttracker II, with special playback modes available + for improved Amiga ProTracker 2/3 compatibility.") (home-page "https://milkytracker.titandemo.org/") ;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later. (license (list license:bsd-3 license:gpl3+)))) @@ -3106,8 +3111,8 @@ for improved Amiga ProTracker 2/3 compatibility.") `(begin (substitute* "schism/version.c" (("Schism Tracker built %s %s.*$") - (string-append "Schism Tracker version " ,version "\");"))) - #t)))) + (string-append "Schism Tracker version " ,version "\") ;"))) + #t)))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From ea3e94e5fe0dbba3928c7a6380392b1495bfbcac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:41:41 +0200 Subject: gnu: nnn: Update to 3.2. * gnu/packages/admin.scm (nnn): Update to 3.2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 08131a8dd0..b0a43d9644 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3116,14 +3116,14 @@ everyone's screenshots nowadays.") (define-public nnn (package (name "nnn") - (version "2.8.1") + (version "3.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1g47bndxld875d0xb3pgmlw223mz47p1xcvwym861y6l4zkgiyp0")))) + (base32 "1zflz7yj5wzdnl0728g8qrld2z6dqn7sblbmkjvyqlv1fwjd1fsf")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit 1.4.1 From 3217140398a3f791c3c3122ec93fced47660e419 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:51:16 +0200 Subject: gnu: nginx: Update to 1.19.0. * gnu/packages/web.scm (nginx): Update to 1.19.0. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 66774c4a2d..392264391e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -229,14 +229,14 @@ Interface} specification.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.17.9") + (version "1.19.0") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx")))) + "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) @@ -278,7 +278,6 @@ Interface} specification.") (string-append "--crossbuild=" system ":" release ":" machine))))) (setenv "CC" "gcc") - (format #t "environment variable `CC' set to `gcc'~%") (format #t "configure flags: ~s~%" flags) (apply invoke "./configure" flags) #t))) -- cgit 1.4.1 From ffd2cfc8627c9e37451f0bb7a4ff0edd664e094b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:51:41 +0200 Subject: gnu: nginx-documentation: Update to 1.19.0-2549-c13a55aae487. * gnu/packages/web.scm (nginx-documentation): Update to 1.19.0-2549-c13a55aae487. --- gnu/packages/web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 392264391e..169f9499fa 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -359,13 +359,13 @@ documentation.") (license license:bsd-2)))) (define-public nginx-documentation - ;; This documentation should be relevant for nginx@1.15.9. - (let ((revision 2345) - (changeset "7ef11708457e")) + ;; This documentation should be relevant for the current nginx package. + (let ((version "1.19.0") + (revision 2549) + (changeset "c13a55aae487")) (package (name "nginx-documentation") - (version - (simple-format #f "2019-03-01-~A-~A" revision changeset)) + (version (simple-format #f "~A-~A-~A" version revision changeset)) (source (origin (method hg-fetch) (uri (hg-reference @@ -374,7 +374,7 @@ documentation.") (file-name (string-append name "-" version)) (sha256 (base32 - "15975jvh53mnsgi4hhgrwdwy3by23v4kxnhy2vnkziq8v7wkmy4y")))) + "0vwwvk6wf8f6c6n6yffmya9a287s6dbx1p739hdl3hwxfyh2ygc5")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit 1.4.1 From 18e86ea9825a0c336f34f167ed3529e463c773b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 18:51:57 +0200 Subject: gnu: wimlib: Update to 1.13.2. * gnu/packages/backup.scm (wimlib): Update to 1.13.2. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index e79fe4a85e..49db612eb9 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -737,14 +737,14 @@ changes are stored.") (define-public wimlib (package (name "wimlib") - (version "1.13.1") + (version "1.13.2") (source (origin (method url-fetch) (uri (string-append "https://wimlib.net/downloads/" "wimlib-" version ".tar.gz")) (sha256 (base32 - "0pxgrpr3dr81rcf2jh71aiiq3v4anc5sj1nld18f2vhvbijbrx27")))) + "0id9ym3hzij4kpdrk0sz3ijxp5r0z1md5jch83pml9hdy1zbx5bj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 20771f4043990632b73187b10d1851a1244df4e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 19:09:46 +0200 Subject: gnu: fossil: Update to 2.11. * gnu/packages/version-control.scm (fossil): Update to 2.11. --- gnu/packages/version-control.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index df00c4a5eb..2e3607f8f3 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2171,7 +2171,7 @@ by rclone usable with git-annex.") (define-public fossil (package (name "fossil") - (version "2.10") + (version "2.11") (source (origin (method url-fetch) @@ -2179,8 +2179,7 @@ by rclone usable with git-annex.") "https://www.fossil-scm.org/index.html/uv/" "fossil-src-" version ".tar.gz")) (sha256 - (base32 - "041bs4fgk52fw58p7s084pxk9d9vs5v2f2pjbznqawz75inpg8yq")) + (base32 "0c9nzx42wxfmym9vf1pnbdb1c7gp7a7zqky60izxsph7w2xh8nix")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 7b419b026e59141bdb0caae876f0f50928de1052 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 27 May 2020 19:10:45 +0200 Subject: gnu: knot: Update to 2.9.5. * gnu/packages/dns.scm (knot): Update to 2.9.5. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 8b21c79385..7ff0501ab2 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -595,14 +595,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.9.4") + (version "2.9.5") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" "knot-" version ".tar.xz")) (sha256 - (base32 "00d5lkan1yfxphw8q1vrmfpmg8kykdaky8082m1s1ps03cxckwsp")) + (base32 "0xmzmhd2m9rb24clrrd9k058harsq67nyjplpbyxvy1g46xah28i")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From c08f235b12900e8079677fe90d075f03867e0be2 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 27 May 2020 19:09:20 +0200 Subject: gnu: Add guile-rdf. * gnu/packages/guile-xyz.scm (guile-rdf): New variable. --- gnu/packages/guile-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8225604a0f..c7349af790 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Evan Straw ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Julien Lepiler ;;; ;;; This file is part of GNU Guix. ;;; @@ -3608,3 +3609,40 @@ WebSocket protocol as defined by RFC 6455.") (define-public guile3.0-websocket (deprecated-package "guile3.0-websocket" guile-websocket)) + +(define-public guile-rdf + (package + (name "guile-rdf") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/tyreunom/guile-rdf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dwn3app1fscbpmpgvjs5jy1y0gwy3j5gdx8br79af6a88zjlnqf")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)); tests require network + (inputs + `(("guile" ,guile-3.0))) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (home-page "https://framagit.org/tyreunom/guile-rdf") + (synopsis "Guile implementation of the RDF abstract and concrete syntaxes") + (description "Guile RDF is an implementation of the RDF (Resource Description +Framework) format defined by the W3C for GNU Guile. RDF structures include +triples (facts with a subject, a predicate and an object), graphs which are +sets of triples, and datasets, which are collections of graphs. + +RDF specifications include the specification of concrete syntaxes and of +operations on graphs. This library implements some basic functionalities, +such as parsing and producing turtle and nquads syntax, as well as +manipulating graphs and datasets.") + (license license:gpl3+))) -- cgit 1.4.1 From 9ea9e97b9c6d886151f4fd4394c315fda8efa9cb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 27 Mar 2020 21:21:37 -0400 Subject: gnu: Add emacs-libgit. * gnu/packages/emacs-xyz.scm (emacs-libgit): New variable. * gnu/packages/patches/emacs-libgit-use-system-libgit2.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. --- gnu/local.mk | 3 +- gnu/packages/emacs-xyz.scm | 78 ++++++++++++++++++- .../patches/emacs-libgit-use-system-libgit2.patch | 88 ++++++++++++++++++++++ 3 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/emacs-libgit-use-system-libgit2.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d5653b0b1..6be47b9a9a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -19,7 +19,7 @@ # Copyright © 2018 Amirouche Boubekki # Copyright © 2018, 2019, 2020 Oleg Pykhalov # Copyright © 2018 Stefan Stefanović -# Copyright © 2018 Maxim Cournoyer +# Copyright © 2018, 2020 Maxim Cournoyer # Copyright © 2019 Guillaume Le Vaillant # Copyright © 2019, 2020 John Soo # Copyright © 2019 Jonathan Brielmaier @@ -886,6 +886,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ + %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-magit-log-format-author-margin.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 45a10f4689..e6cbd44453 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Mike Gerwitz -;;; Copyright © 2017, 2018, 2019 Maxim Cournoyer +;;; Copyright © 2017, 2018, 2019, 2020 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee ;;; Copyright © 2018, 2019 Mathieu Lirzin ;;; Copyright © 2018, 2019, 2020 Pierre Neidhardt @@ -318,6 +318,82 @@ For remote processes a substitute is provided, which communicates with Emacs on stdout instead of using a socket as the Emacsclient does.") (license license:gpl3+))) +(define-public emacs-libgit + (let ((commit "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a") + (revision "1")) + (package + (name "emacs-libgit") + (version (git-version "20200515" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/libegit2.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f")) + (patches (search-patches + ;; Submitted for inclusion upstream (see: + ;; https://github.com/magit/libegit2/pull/96). + "emacs-libgit-use-system-libgit2.patch")))) + ;; Use the cmake-build-system as it provides support for cross builds. + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DUSE_SYSTEM_LIBGIT2=x") + ;; Add the emacs-build-system byte compilation and install phases. + #:imported-modules (,@%cmake-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:modules ((guix build cmake-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build emacs-utils) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-libgit--module-file + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (make-file-writable "libgit.el") + (emacs-substitute-variables "libgit.el" + ("libgit--module-file" + (string-append out "/share/emacs/site-lisp/libegit2.so"))) + #t))) + (add-before 'install 'prepare-for-install + (lambda _ + (let ((s (string-append "../" ,name "-" ,version "-checkout"))) + (copy-file "libegit2.so" (string-append s "/libegit2.so")) + (chdir s) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((install (assoc-ref emacs:%standard-phases 'install))) + (install #:outputs outputs + #:include (cons "\\.so$" + emacs:%default-include))))) + (add-after 'install 'make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads)) + (add-after 'make-autoloads 'enable-autoloads-compilation + (assoc-ref emacs:%standard-phases 'enable-autoloads-compilation)) + (add-after 'enable-autoloads-compilation 'patch-el-files + (assoc-ref emacs:%standard-phases 'patch-el-files)) + (add-after 'patch-el-files 'emacs-build + (assoc-ref emacs:%standard-phases 'build)) + (add-after 'emacs-build 'validate-compiled-autoloads + (assoc-ref emacs:%standard-phases 'validate-compiled-autoloads))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("emacs" ,emacs-no-x) + ("git" ,git-minimal))) + (inputs + `(("libgit2" ,libgit2))) + (home-page "https://github.com/magit/libegit2") + (synopsis "Emacs bindings for libgit2") + (description "This is an experimental module written in C providing +libgit2 bindings for Emacs, intended to boost the performance of Magit.") + ;; The LICENSE file says GPL v2+, but libgit.el says GPL v3+. + (license license:gpl3+)))) + (define-public emacs-magit ;; `magit-setup-buffer' macro introduced in c761d28d and required in ;; `emacs-forge'. diff --git a/gnu/packages/patches/emacs-libgit-use-system-libgit2.patch b/gnu/packages/patches/emacs-libgit-use-system-libgit2.patch new file mode 100644 index 0000000000..4a5546b06b --- /dev/null +++ b/gnu/packages/patches/emacs-libgit-use-system-libgit2.patch @@ -0,0 +1,88 @@ +From de3c48d72ec7064e7f0522877fe759c729df0c50 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Wed, 25 Mar 2020 11:32:18 -0400 +Subject: [PATCH] Allow using a system provided libgit2 library + +Setting the USE_SYSTEM_LIBGIT2 Make or CMake variable (through the +BUILD_OPTIONS variable) to any value enables using the system library. +The default behavior of using a bundled copy of libgit2 is unchanged. +--- + CMakeLists.txt | 9 +++++++-- + Makefile | 11 +++++++++++ + src/CMakeLists.txt | 9 +++++++-- + 3 files changed, 25 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a393d7c..75d6ca6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,9 +7,14 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "shared" FORCE) + set(BUILD_CLAR OFF CACHE BOOL "clar" FORCE) + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DEGIT_DEBUG") + +-add_subdirectory(libgit2) ++if(USE_SYSTEM_LIBGIT2) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(git2 REQUIRED IMPORTED_TARGET libgit2) ++else() ++ add_subdirectory(libgit2) ++ find_library(git2 libgit2.a) ++endif() + +-find_library(git2 libgit2.a) + add_subdirectory(src) + + enable_testing() +diff --git a/Makefile b/Makefile +index 8199532..6a6a4e1 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,6 +13,13 @@ ifeq ($(UNAME),MSYS) + BUILD_OPTIONS+= -G "MSYS Makefiles" + endif + ++# If the variable USE_SYSTEM_LIBGIT2 is set to *any* value, use the ++# system provided libgit2 library. ++USE_SYSTEM_LIBGIT2? := \ ++ $(if $(or $(USE_SYSTEM_LIBGIT2),\ ++ $(findstring USE_SYSTEM_LIBGIT2,$(BUILD_OPTIONS))),\ ++ true) ++ + ifeq "$(TRAVIS)" "true" + ## Makefile for Travis ################################################### + # +@@ -87,7 +94,11 @@ submodule-update: + @git submodule update + + libgit2: ++ifeq ($(USE_SYSTEM_LIBGIT2?),) + @git submodule update --init ++else ++ @echo "Using the system provided libgit2 library" ++endif + + CLEAN = $(ELCS) $(PKG)-autoloads.el build + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cfb5777..0dbad8a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -13,8 +13,13 @@ if(WIN32) + set_target_properties(egit2 PROPERTIES PREFIX lib) + endif(WIN32) + +-target_link_libraries(egit2 git2) +-target_include_directories(egit2 SYSTEM PRIVATE "${libgit2_SOURCE_DIR}/include") ++if(USE_SYSTEM_LIBGIT2) ++ target_link_libraries(egit2 PRIVATE PkgConfig::git2) ++else() ++ target_link_libraries(egit2 git2) ++ target_include_directories( ++ egit2 SYSTEM PRIVATE "${libgit2_SOURCE_DIR}/include") ++endif() + + if(CMAKE_COMPILER_IS_GNUCC) + target_compile_options(egit2 PRIVATE -Wall -Wextra) +-- +2.26.2 + -- cgit 1.4.1 From a10349d2bb09e3a3e0c84f290a7e57989c695467 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 27 Mar 2020 21:20:03 -0400 Subject: gnu: emacs-magit: Update to commit d05545e. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to commit 68b5a13fa1b6b122d4a2547b8c415aadff83d8ca. [origin]: Remove obsoleted patches and snippets. [build-system]: Switch to the emacs-build-system. [arguments]: Remove the #:modules and #:imported-modules arguments. Enable tests. Remove the #:make-flags and #:test-target argument. Specify the \#:test-command argument. [phases]{patch}: Remove phase. {build-info-manual, set-magit-version, configure-git} {disable-tramp-test}: New phases. {configure}: Do not delete phase. {patch-exec-paths}: Adapt file names. * gnu/packages/patches/emacs-magit-log-format-author-margin.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 144 +++++++++------------ .../emacs-magit-log-format-author-margin.patch | 72 ----------- 3 files changed, 63 insertions(+), 154 deletions(-) delete mode 100644 gnu/packages/patches/emacs-magit-log-format-author-margin.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6be47b9a9a..80cefe5b63 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -887,7 +887,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ - %D%/packages/patches/emacs-magit-log-format-author-margin.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e6cbd44453..cb699c0197 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -395,12 +395,11 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (license license:gpl3+)))) (define-public emacs-magit - ;; `magit-setup-buffer' macro introduced in c761d28d and required in - ;; `emacs-forge'. - (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770")) + ;; There hasn't been an official release since 2018-11-16. + (let ((commit "d05545ec2fd7edf915eaf1b9c15c785bb08975cc")) (package (name "emacs-magit") - (version (git-version "2.90.1" "3" commit)) + (version (git-version "2.90.1" "4" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -409,93 +408,76 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (file-name (git-file-name name version)) (sha256 (base32 - "16qx0404l05q1m6w7y5j8ck1z5nfmpinm00w0p2yh1hn5zzwy6dd")) - ;; FIXME: emacs-forge uses a function defined in this patch, - ;; which is newer than the current commit. - (patches - (search-patches - "emacs-magit-log-format-author-margin.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fix syntax error - (substitute* "lisp/magit-extras.el" - (("rev\\)\\)\\)\\)\\)\\)") "rev)))))")) - #t)))) - (build-system gnu-build-system) - (native-inputs `(("texinfo" ,texinfo) - ("emacs" ,emacs-minimal))) - (inputs - `(("git" ,git) - ("perl" ,perl))) - (propagated-inputs - `(("dash" ,emacs-dash) - ("with-editor" ,emacs-with-editor) - ("transient" ,emacs-transient))) + "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg")))) + (build-system emacs-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:test-target "test" - #:tests? #f ; tests are not included in the release - #:make-flags - (list (string-append "PREFIX=" %output) - ;; Don't put .el files in a sub-directory. - (string-append "lispdir=" %output "/share/emacs/site-lisp")) + `(#:emacs ,emacs-no-x ;module support is required + #:tests? #t + #:test-command '("make" "test") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch + (add-after 'unpack 'build-info-manual (lambda _ - (chmod "lisp/magit-extras.el" #o644) - (emacs-batch-edit-file "lisp/magit-extras.el" - `(progn (progn - (goto-char (point-min)) - (re-search-forward "(defun magit-copy-buffer-revision ()") - (forward-sexp 2) - (kill-sexp) - (insert ,(format #f "~S" - '(if (use-region-p) - (copy-region-as-kill nil nil 'region) - (when-let ((rev (cl-case major-mode - ((magit-cherry-mode - magit-log-select-mode - magit-reflog-mode - magit-refs-mode - magit-revision-mode - magit-stash-mode - magit-stashes-mode) - (car magit-refresh-args)) - ((magit-diff-mode magit-log-mode) - (let ((r (caar magit-refresh-args))) - (if (string-match "\\.\\.\\.?\\(.+\\)" r) - (match-string 1 r) - r))) - (magit-status-mode "HEAD")))) - (when (magit-commit-p rev) - (setq rev (magit-rev-parse rev)) - (push (list rev default-directory) magit-revision-stack) - (kill-new (message "%s" rev)))))))) - (basic-save-buffer))) + (invoke "make" "info") + ;; Copy info files to the lisp directory, which acts as + ;; the root of the project for the emacs-build-system. + (for-each (lambda (f) + (install-file f "lisp")) + (find-files "Documentation" "\\.info$")) + (chdir "lisp") #t)) - (delete 'configure) - (add-before - 'build 'patch-exec-paths + (add-after 'build-info-manual 'set-magit-version + (lambda _ + (make-file-writable "magit.el") + (emacs-substitute-variables "magit.el" + ("magit-version" ,version)) + #t)) + (add-after 'set-magit-version 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys) (let ((perl (assoc-ref inputs "perl"))) - (make-file-writable "lisp/magit-sequence.el") - (emacs-substitute-variables "lisp/magit-sequence.el" + (make-file-writable "magit-sequence.el") + (emacs-substitute-variables "magit-sequence.el" ("magit-perl-executable" (string-append perl "/bin/perl"))) - #t)))))) + #t))) + (add-before 'check 'configure-git + (lambda _ + ;; Otherwise some tests fail with error "unable to auto-detect + ;; email address". + (setenv "HOME" (getcwd)) + (invoke "git" "config" "--global" "user.name" "toto") + (invoke "git" "config" "--global" "user.email" + "toto@toto.com"))) + (add-after 'configure-git 'disable-tramp-test + (lambda _ + ;; There is an issue causing TRAMP to fail in the build + ;; environment. Setting the tramp-remote-shell parameter of + ;; the sudo-method to the file name of the shell didn't help. + (chdir "..") + (substitute* "t/magit-tests.el" + (("^\\(ert-deftest magit-toplevel:tramp.*" all) + (string-append all " (skip-unless nil)"))) + #t)) + (add-before 'install 'enter-lisp-directory + (lambda _ + (chdir "lisp") + #t))))) + (native-inputs + `(("texinfo" ,texinfo))) + (inputs + `(("git" ,git) + ("perl" ,perl))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-libgit" ,emacs-libgit) + ("emacs-transient" ,emacs-transient) + ("emacs-with-editor" ,emacs-with-editor))) (home-page "https://magit.vc/") (synopsis "Emacs interface for the Git version control system") - (description - "With Magit, you can inspect and modify your Git repositories with Emacs. -You can review and commit the changes you have made to the tracked files, for -example, and you can browse the history of past changes. There is support for -cherry picking, reverting, merging, rebasing, and other common Git -operations.") + (description "With Magit, you can inspect and modify your Git +repositories with Emacs. You can review and commit the changes you have made +to the tracked files, for example, and you can browse the history of past +changes. There is support for cherry picking, reverting, merging, rebasing, +and other common Git operations.") (license license:gpl3+)))) (define-public emacs-magit-svn diff --git a/gnu/packages/patches/emacs-magit-log-format-author-margin.patch b/gnu/packages/patches/emacs-magit-log-format-author-margin.patch deleted file mode 100644 index fc52157a32..0000000000 --- a/gnu/packages/patches/emacs-magit-log-format-author-margin.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 94914ca4690c0cff12d600a0c8ba6bfb3fb38dc5 Mon Sep 17 00:00:00 2001 -From: Jonas Bernoulli -Date: Tue, 25 Jun 2019 21:44:32 +0200 -Subject: [PATCH] magit-log-format-author-margin: New function - -Split it from `magit-log-format-margin'. ---- - lisp/magit-log.el | 48 +++++++++++++++++++++++++---------------------- - 1 file changed, 26 insertions(+), 22 deletions(-) - -diff --git a/lisp/magit-log.el b/lisp/magit-log.el -index c8e6ef63..c0a79b19 100644 ---- a/lisp/magit-log.el -+++ b/lisp/magit-log.el -@@ -1374,28 +1374,32 @@ The shortstat style is experimental and rather slow." - (when-let ((option (magit-margin-option))) - (if magit-log-margin-show-shortstat - (magit-log-format-shortstat-margin rev) -- (pcase-let ((`(,_ ,style ,width ,details ,details-width) -- (or magit-buffer-margin -- (symbol-value option)))) -- (magit-make-margin-overlay -- (concat (and details -- (concat (propertize (truncate-string-to-width -- (or author "") -- details-width -- nil ?\s (make-string 1 magit-ellipsis)) -- 'face 'magit-log-author) -- " ")) -- (propertize -- (if (stringp style) -- (format-time-string -- style -- (seconds-to-time (string-to-number date))) -- (pcase-let* ((abbr (eq style 'age-abbreviated)) -- (`(,cnt ,unit) (magit--age date abbr))) -- (format (format (if abbr "%%2i%%-%ic" "%%2i %%-%is") -- (- width (if details (1+ details-width) 0))) -- cnt unit))) -- 'face 'magit-log-date))))))) -+ (magit-log-format-author-margin author date)))) -+ -+(defun magit-log-format-author-margin (author date &optional previous-line) -+ (pcase-let ((`(,_ ,style ,width ,details ,details-width) -+ (or magit-buffer-margin -+ (symbol-value option)))) -+ (magit-make-margin-overlay -+ (concat (and details -+ (concat (propertize (truncate-string-to-width -+ (or author "") -+ details-width -+ nil ?\s (make-string 1 magit-ellipsis)) -+ 'face 'magit-log-author) -+ " ")) -+ (propertize -+ (if (stringp style) -+ (format-time-string -+ style -+ (seconds-to-time (string-to-number date))) -+ (pcase-let* ((abbr (eq style 'age-abbreviated)) -+ (`(,cnt ,unit) (magit--age date abbr))) -+ (format (format (if abbr "%%2i%%-%ic" "%%2i %%-%is") -+ (- width (if details (1+ details-width) 0))) -+ cnt unit))) -+ 'face 'magit-log-date)) -+ previous-line))) - - (defun magit-log-format-shortstat-margin (rev) - (magit-make-margin-overlay --- -2.23.0 - -- cgit 1.4.1 From 3a2c69d9e9ac5d5e4fb571af1e393aeb3d70bf03 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 May 2020 11:09:16 -0400 Subject: gnu: emacs-evil-magit: Update to commit 253c644. This resolves tests failures that appeared with the update to emacs-magit. * gnu/packages/emacs-xyz.scm (emacs-evil-magit): Update to commit 253c644. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cb699c0197..3d21c6e3cb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16153,8 +16153,8 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (license license:gpl3+))) (define-public emacs-evil-magit - (let ((commit "4b66a1db8285457147a5436f209391016a819ea1") - (revision "3")) + (let ((commit "253c644807013fe92429acdef418748794b8f254") + (revision "4")) (package (name "emacs-evil-magit") (version (git-version "0.4.2" revision commit)) @@ -16167,7 +16167,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (file-name (git-file-name name version)) (sha256 (base32 - "0kkmbswfh34k3amfl3v140vsnz1gq4n4mg9g4khjd9yjph3zms4h")))) + "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) -- cgit 1.4.1 From 25043eb42baf5dbd45789123aeff1f11ea926fc8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 24 Mar 2020 21:43:55 -0400 Subject: gnu: emacs-transient: Update to commit a6e4cced. This is necessary to build a recent version of emacs-forge. * gnu/packages/emacs-xyz.scm (emacs-transient): Update to commit a6e4cced. [build-system]: Switch to the emacs-build-system. [arguments]: Remove the #:modules, #:imported-modules and #:make-flags arguments. [phases]{configure}: Do not delete. {install}: Do not replace. {build-info-manual}: New phase. {enter-lisp-directory}: New phase. [native-inputs]: Remove emacs-minimal, which is implicitly provided by the emacs-build-system. --- gnu/packages/emacs-xyz.scm | 56 ++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3d21c6e3cb..3b80218c45 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19293,11 +19293,11 @@ as Emacs Lisp.") (license license:gpl3+)))) (define-public emacs-transient - ;; 0.1.0 depends on lv.el but not later versions. - (let ((commit "7e45a57ec81185631fe763733f64c99021df2a06")) + (let ((revision "1") + (commit "a6e4cced303b3febd59412b24a97eaf1e855e6d7")) (package (name "emacs-transient") - (version (git-version "0.1.0" "1" commit)) + (version (git-version "0.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -19306,41 +19306,33 @@ as Emacs Lisp.") (file-name (git-file-name name version)) (sha256 (base32 - "0r6d4c1lga3bk0s7q7y4v4hbpxnd9h40cjxybqvax2z902931fz1")))) - (build-system gnu-build-system) - (native-inputs `(("texinfo" ,texinfo) - ("emacs" ,emacs-minimal))) - (propagated-inputs - `(("dash" ,emacs-dash))) + "01xsw9sxr50valc2q590ngy3ra2ll01p39l9cbzvqqz6mxyymxmd")))) + (build-system emacs-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:tests? #f ; tests are not included in the release - #:make-flags (list "lisp" "info") + `(#:tests? #f ;no test suite #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lisp (string-append out "/share/emacs/site-lisp")) - (info (string-append out "/share/info"))) - (for-each (cut install-file <> lisp) - (find-files "." "\\.elc*$")) - (install-file "docs/transient.info" (string-append info))) + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "info") + ;; Move the info file to lisp so that it gets installed by the + ;; emacs-build-system. + (rename-file "docs/transient.info" "lisp/transient.info"))) + (add-after 'build-info-manual 'enter-lisp-directory + (lambda _ + (chdir "lisp") #t))))) + (native-inputs + `(("texinfo" ,texinfo))) + (propagated-inputs + `(("dash" ,emacs-dash))) (home-page "https://magit.vc/manual/transient") (synopsis "Transient commands in Emacs") - (description - "Taking inspiration from prefix keys and prefix arguments in Emacs, -Transient implements a similar abstraction involving a prefix command, infix -arguments and suffix commands. We could call this abstraction a \"transient -command\", but because it always involves at least two commands (a prefix and -a suffix) we prefer to call it just a \"transient\".") + (description "Taking inspiration from prefix keys and prefix arguments +in Emacs, Transient implements a similar abstraction involving a prefix +command, infix arguments and suffix commands. We could call this abstraction +a \"transient command\", but because it always involves at least two +commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (license license:gpl3+)))) (define-public emacs-forge -- cgit 1.4.1 From ffd2696bd8c898cb69b8b443db5584d84986d419 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 May 2020 11:55:17 -0400 Subject: gnu: emacs-forge: Update to commit 09bf8ad. * gnu/packages/emacs-xyz.scm (emacs-forge): Update to 09bf8ad. [native-inputs]: Remove emacs-minimal, which is implicitly provided by the emacs-build-system. --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3b80218c45..e845ca9097 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19336,10 +19336,10 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (license license:gpl3+)))) (define-public emacs-forge - (let ((commit "63cbf81f166fc71861d8e3d246df8e5ccedcb9bb")) + (let ((commit "09bf8adc9c9afb492632e612f51f39e1cc15fca0")) (package (name "emacs-forge") - (version (git-version "0.1.0" "3" commit)) + (version (git-version "0.1.0" "4" commit)) (source (origin (method git-fetch) @@ -19349,11 +19349,10 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (file-name (git-file-name name version)) (sha256 (base32 - "1yf2xjx3459py6rji740jm8bmh2pv66ghnbjxsvjd4jf9kcdav83")))) + "148h1rvmfmxyrfy2q5l0vzblr7lpsyw1si30hfwhzsj8fvj21qcr")))) (build-system emacs-build-system) (native-inputs - `(("texinfo" ,texinfo) - ("emacs" ,emacs-minimal))) + `(("texinfo" ,texinfo))) (propagated-inputs `(("emacs-closql" ,emacs-closql) ("emacs-dash" ,emacs-dash) -- cgit 1.4.1 From db38840198a62e84e0754975dfece75132fd6672 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 May 2020 13:53:11 -0400 Subject: Revert some Go package updates. This reverts commit 5f833e0495f00a72f8d34a63e8afbc531afdd22d through 681ac9a66c26d2c739e41f03228f8c63fc0df482. It's not idiomatic to update Go packages independently of their users. This reversion was approved by Efraim on #guix: http://logs.guix.gnu.org/guix/2020-05-26.log * gnu/packages/golang.scm, gnu/packages/syncthing.scm, gnu/packages/tls.scm: Revert. --- gnu/packages/golang.scm | 100 ++++++++++++------------ gnu/packages/syncthing.scm | 184 +++++++++++++++++++++++---------------------- gnu/packages/tls.scm | 42 ++++++----- 3 files changed, 166 insertions(+), 160 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e11c52b0e4..8dd276562a 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -978,26 +978,28 @@ optimized for performance yet simple to use.") (license license:expat)))) (define-public go-github-com-blang-semver - (package - (name "go-github-com-blang-semver") - (version "4.0.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/blang/semver.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14h9ys4n4kx9cbj42lkdf4i5k3nkll6sd62jcvl7cs565v6fiknz")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/blang/semver")) - (home-page "https://github.com/blang/semver") - (synopsis "Semantic versioning library written in Go") - (description "Semver is a library for Semantic versioning written in Go.") - (license license:expat))) + (let ((commit "60ec3488bfea7cca02b021d106d9911120d25fe9") + (revision "0")) + (package + (name "go-github-com-blang-semver") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/blang/semver.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/blang/semver")) + (home-page "https://github.com/blang/semver") + (synopsis "Semantic versioning library written in Go") + (description "Semver is a library for Semantic versioning written in Go.") + (license license:expat)))) (define-public go-github-com-emicklei-go-restful (let ((commit "89ef8af493ab468a45a42bb0d89a06fccdd2fb22") @@ -2341,31 +2343,29 @@ statistics for wrapped connections.") (license license:expat)))) (define-public go-github-com-mitchellh-go-homedir - (package - (name "go-github-com-mitchellh-go-homedir") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mitchellh/go-homedir.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/mitchellh/go-homedir" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-home-directory - (lambda _ - (setenv "HOME" "/") - #t))))) - (home-page "https://github.com/mitchellh/go-homedir") - (synopsis "Go library for detecting and expanding the user's home directory without cgo") - (description "This is a Go library for detecting the user's home + (let ((commit "ae18d6b8b3205b561c79e8e5f69bff09736185f4") + (revision "0")) + (package + (name "go-github-com-mitchellh-go-homedir") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mitchellh/go-homedir.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq")))) + (build-system go-build-system) + (arguments + (quote (#:import-path "github.com/mitchellh/go-homedir" + ;; TODO: Tests fail because it tries to access home. + #:tests? #f))) + (home-page "https://github.com/mitchellh/go-homedir") + (synopsis "Go library for detecting and expanding the user's home directory without cgo") + (description "This is a Go library for detecting the user's home directory without the use of @command{cgo}, so the library can be used in cross-compilation environments. @@ -2379,7 +2379,7 @@ package cannot cross compile. But 99% of the time the use for @command{os/user} is just to retrieve the home directory, which we can do for the current user without cgo. This library does that, enabling cross-compilation.") - (license license:expat))) + (license license:expat)))) (define-public go-github-com-multiformats-go-multiaddr (let ((commit "fe1c46f8be5af4aff4db286e08839295bd922efb") @@ -2824,7 +2824,7 @@ format in Go.") (define-public go-github-com-kr-text (package (name "go-github-com-kr-text") - (version "0.2.0") + (version "0.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -2833,7 +2833,7 @@ format in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "0hf58ypz6rxsw6nx3i856whir9lvy4sdx946wbw1nfaf2rdmr9vx")))) + "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1")))) (build-system go-build-system) (arguments '(#:import-path "github.com/kr/text")) @@ -3191,7 +3191,7 @@ error handling primitives in Go.") (define-public go-github-com-maruel-panicparse (package (name "go-github-com-maruel-panicparse") - (version "1.4.1") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -3200,7 +3200,7 @@ error handling primitives in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "0sff44kqmpwzpa6h84fssdsv9glfm8bjjcnspsr64qzmqxpbc7m4")))) + "13qkn7f64yln8jdmma37h6ra4c7anxkp3vfgvfyb6lb07dpr1ibq")))) (build-system go-build-system) (arguments '(#:import-path "github.com/maruel/panicparse")) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index bb264df717..99bdd7704b 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -232,7 +232,7 @@ configuration that is stored in a Go struct.") (revision "0")) (package (name "go-github-com-bkaradzic-go-lz4") - (version (git-version "1.0.0" revision commit)) + (version (git-version "0.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -416,7 +416,7 @@ address of the default LAN gateway.") (define-public go-github-com-lib-pq (package (name "go-github-com-lib-pq") - (version "1.5.2") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -425,7 +425,7 @@ address of the default LAN gateway.") (file-name (git-file-name name version)) (sha256 (base32 - "1wjw5pfjgc63n9934mgvg8hr1v9381mcdz62jkn9xqxqcv6b95lw")))) + "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz")))) (build-system go-build-system) (arguments `(#:import-path "github.com/lib/pq" @@ -468,7 +468,7 @@ GeoLite2 and GeoIP2 databases in Go.") (define-public go-github-com-oschwald-maxminddb-golang (package (name "go-github-com-oschwald-maxminddb-golang") - (version "1.6.0") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -477,7 +477,7 @@ GeoLite2 and GeoIP2 databases in Go.") (file-name (git-file-name name version)) (sha256 (base32 - "1xdqaazxddnajh0qic1c70skad44kxxr7m46fypbnawn61v3f7gc")))) + "100wd5qv00pkcm6cb8c4x5gavc9jnn7drh6xrqh85hzci4rils66")))) (build-system go-build-system) (propagated-inputs `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) @@ -492,25 +492,27 @@ higher-level API for doing so.") (license isc))) (define-public go-github-com-stathat-go - (package - (name "go-github-com-stathat-go") - (version "1.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stathat/go") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zzlsl24dyr202qkr2pay22m6d0gb7ssms77wgdx0r0clgm7dihw")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/stathat/go")) - (synopsis "Post statistics to StatHat") - (description "This is a Go package for posting to a StatHat account.") - (home-page "https://github.com/stathat/go") - (license expat))) + (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e") + (revision "0")) + (package + (name "go-github-com-stathat-go") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stathat/go") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zzlsl24dyr202qkr2pay22m6d0gb7ssms77wgdx0r0clgm7dihw")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/stathat/go")) + (synopsis "Post statistics to StatHat") + (description "This is a Go package for posting to a StatHat account.") + (home-page "https://github.com/stathat/go") + (license expat)))) (define-public go-github-com-rcrowley-go-metrics (let ((commit "cac0b30c2563378d434b5af411844adff8e32960") @@ -747,28 +749,30 @@ notification library in Go.") (license expat)))) (define-public go-github-com-beorn7-perks-quantile - (package - (name "go-github-com-beorn7-perks-quantile") - (version "1.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beorn7/perks.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/beorn7/perks/quantile" - #:unpack-path "github.com/beorn7/perks")) - (synopsis "Compute approximate quantiles over an unbounded data stream") - (description "Perks contains the Go package @code{quantile} that computes + (let ((commit "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9") + (revision "0")) + (package + (name "go-github-com-beorn7-perks-quantile") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/beorn7/perks.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/beorn7/perks/quantile" + #:unpack-path "github.com/beorn7/perks")) + (synopsis "Compute approximate quantiles over an unbounded data stream") + (description "Perks contains the Go package @code{quantile} that computes approximate quantiles over an unbounded data stream within low memory and CPU bounds.") - (home-page "https://github.com/beorn7/perks") - (license expat))) + (home-page "https://github.com/beorn7/perks") + (license expat)))) (define-public go-github-com-prometheus-client-model (let ((commit "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016") @@ -876,31 +880,29 @@ Prometheus metrics.") (license asl2.0))) (define-public go-github-com-prometheus-procfs - (package - (name "go-github-com-prometheus-procfs") - (version "0.0.11") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/prometheus/procfs.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/prometheus/procfs" - ;; The tests require Go modules, which are not yet supported in Guix's - ;; Go build system. - #:tests? #f)) - (propagated-inputs - `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) - (synopsis "Go library for reading @file{/proc}") - (description "The @code{procfs} Go package provides functions to retrieve + (package + (name "go-github-com-prometheus-procfs") + (version "0.0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/procfs.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/prometheus/procfs" + ;; The tests require Go modules, which are not yet supported in Guix's + ;; Go build system. + #:tests? #f)) + (synopsis "Go library for reading @file{/proc}") + (description "The @code{procfs} Go package provides functions to retrieve system, kernel, and process metrics from the @file{/proc} pseudo file system.") - (home-page "https://github.com/prometheus/procfs") - (license asl2.0))) + (home-page "https://github.com/prometheus/procfs") + (license asl2.0))) (define-public go-github-com-prometheus-client-golang (package @@ -943,7 +945,7 @@ server tools for Prometheus metrics.") (define-public go-github-com-go-asn1-ber-asn1-ber (package (name "go-github-com-go-asn1-ber-asn1-ber") - (version "1.4.1") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -952,7 +954,7 @@ server tools for Prometheus metrics.") (file-name (git-file-name name version)) (sha256 (base32 - "0d7yl1f7ak0djkflw8wx1wlhym2whg7bh57m419arfym9ncwrhg1")))) + "0dxfmgk84fn0p6pz3i0cspynh6rly5pfk9wghm1q07mx99npln02")))) (build-system go-build-system) (arguments '(#:import-path "github.com/go-asn1-ber/asn1-ber")) @@ -1035,27 +1037,29 @@ virtual connections from a single physical connection.") (license expat))) (define-public go-github-com-ccding-go-stun - (package - (name "go-github-com-ccding-go-stun") - (version "0.1.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ccding/go-stun.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "133r2s4h9vv5lmjd680my2c5973gfi0gg5cxcwzjwdjad83a2dm0")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/ccding/go-stun")) - (synopsis "STUN client implementation") - (description "Go-stun is a go implementation of the STUN client (RFC 3489 + (let ((commit "be486d185f3dfcb2dbf8429332da50a0da7f95a6") + (revision "2")) + (package + (name "go-github-com-ccding-go-stun") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccding/go-stun.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gr0rw1c1y7wh6913lyn5k4ig023by27i36bly6am8dwgrgp34ww")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/ccding/go-stun")) + (synopsis "STUN client implementation") + (description "Go-stun is a go implementation of the STUN client (RFC 3489 and RFC 5389).") - (home-page "https://github.com/ccding/go-stun") - (license asl2.0))) + (home-page "https://github.com/ccding/go-stun") + (license asl2.0)))) (define-public go-github-com-cespare-xxhash (package diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f6746ebe21..ec81b7bf07 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Leo Famulari -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Ricardo Wurmus @@ -1021,23 +1021,25 @@ relatively simple Bash script.") (license license:expat))) (define-public go-github-com-certifi-gocertifi - (package - (name "go-github-com-certifi-gocertifi") - (version "2020.02.11") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/certifi/gocertifi") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "018bsy1vclsdk2kns9f37giabibg3kggk3vpj0yr3dv0k72gzybk")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/certifi/gocertifi")) - (synopsis "X.509 TLS root certificate bundle for Go") - (description "This package is a Go language X.509 TLS root certificate bundle, + (let ((commit "a5e0173ced670013bfb649c7e806bc9529c986ec") + (revision "1")) + (package + (name "go-github-com-certifi-gocertifi") + (version (git-version "2018.01.18" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/certifi/gocertifi") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1n9drccl3q1rr8wg3nf60slkf1lgsmz5ahifrglbdrc6har3rryj")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/certifi/gocertifi")) + (synopsis "X.509 TLS root certificate bundle for Go") + (description "This package is a Go language X.509 TLS root certificate bundle, derived from Mozilla's collection.") - (home-page "https://certifi.io") - (license license:mpl2.0))) + (home-page "https://certifi.io") + (license license:mpl2.0)))) -- cgit 1.4.1 From fadd962f4b7aa5a5a26a3efa705a359e29f60fc5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 14:50:01 +0200 Subject: gnu: hdf4: Provide an absolute reference to libjpeg. * gnu/packages/maths.scm (hdf4)[arguments]: Add phase 'provide-absolute-libjpeg-reference'. --- gnu/packages/maths.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 76e9eacc1a..8e35188d80 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -920,7 +920,17 @@ computations.") (("(/gnu/store/)([a-Z0-9]*)" all prefix hash) (string-append prefix (string-take hash 10) "..."))) #t)) - ))) + (add-after 'install 'provide-absolute-libjpeg-reference + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libjpeg (assoc-ref inputs "libjpeg"))) + ;; libjpeg-turbo does not provide a .la file, so libtool is + ;; unable to add an absolute reference for -ljpeg in the .la + ;; files. Fix it manually to avoid having to propagate it. + (substitute* (find-files (string-append out "/lib") "\\.la$") + (("-ljpeg") + (string-append "-L" libjpeg "/lib -ljpeg"))) + #t)))))) (home-page "https://www.hdfgroup.org/products/hdf4/") (synopsis "Library and multi-object file format for storing and managing data") -- cgit 1.4.1 From af59d4b43d711c1033b16b0a94d7eaef3de770eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 15:07:11 +0200 Subject: gnu: Add ruby-ptools. * gnu/packages/ruby.scm (ruby-ptools): New public variable. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 94b16957e0..cb9495a266 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1799,6 +1799,41 @@ and inspect the environment.") (home-page "https://github.com/e2/nenv") (license license:expat))) +(define-public ruby-ptools + (package + (name "ruby-ptools") + (version "1.3.5") + (source (origin + (method url-fetch) + (uri (rubygems-uri "ptools" version)) + (sha256 + (base32 + "1jb1h1nsk9zwykpniw8filbsk26kjsdlpk5wz6w0zyamcd41h87j")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/ls + (lambda _ + (substitute* "test/test_binary.rb" + (("/bin/ls") + (which "ls"))) + #t)) + (add-before 'install 'create-gem + (lambda _ + ;; Do not attempt to sign the gem. + (substitute* "Rakefile" + (("spec\\.signing_key = .*") + "")) + (invoke "rake" "gem:create")))))) + (synopsis "Extra methods for Ruby's @code{File} class") + (description + "The @dfn{ptools} (power tools) library extends Ruby's core @code{File} +class with many additional methods modelled after common POSIX tools, such as +@code{File.which} for finding executables, @code{File.tail} to print the last +lines of a file, @code{File.wc} to count words, and so on.") + (home-page "https://github.com/djberg96/ptools") + (license license:artistic2.0))) + (define-public ruby-permutation (package (name "ruby-permutation") -- cgit 1.4.1 From fae1c86605046b3fbc93384170438382248faab3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 15:07:31 +0200 Subject: gnu: Add ruby-mkmf-lite. * gnu/packages/ruby.scm (ruby-mkmf-lite): New public variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cb9495a266..2ab6dc2394 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2839,6 +2839,28 @@ objects.") (home-page "https://github.com/floehopper/metaclass") (license license:expat))) +(define-public ruby-mkmf-lite + (package + (name "ruby-mkmf-lite") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "mkmf-lite" version)) + (sha256 + (base32 + "0br9k6zijj1zc25n8p7f2j1mwl58nfgdknf3q13h9k156jvrir06")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-ptools" ,ruby-ptools))) + (synopsis "Lightweight alternative to @code{mkmf}") + (description + "@code{mkmf-lite} is a light version of Ruby's @code{mkmf.rb} designed +for use as a library. It does not create packages, builds, or log files of +any kind. Instead, it provides mixin methods that you can use in FFI or tests +to check for the presence of header files, constants, and so on.") + (home-page "https://github.com/djberg96/mkmf-lite") + (license license:asl2.0))) + (define-public ruby-mspec (package (name "ruby-mspec") -- cgit 1.4.1 From 9c566d1b23f574298d1ff0fc1d2a904a441ec7b3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 15:07:52 +0200 Subject: gnu: Add ruby-sys-filesystem. * gnu/packages/ruby.scm (ruby-sys-filesystem): New public variable. --- gnu/packages/ruby.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2ab6dc2394..e32f93bec0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9320,6 +9320,35 @@ the Thin library.") (home-page "https://github.com/sj26/skinny") (license license:expat))) +(define-public ruby-sys-filesystem + (package + (name "ruby-sys-filesystem") + (version "1.3.4") + (source (origin + (method url-fetch) + (uri (rubygems-uri "sys-filesystem" version)) + (sha256 + (base32 + "0mizqnsiagagmracadr16s5na2ks2j3ih1w0f3gp4ssrda6szl01")))) + (build-system ruby-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'check 'set-HOME + (lambda _ + ;; Some tests attempt to stat $HOME. Let them. + (setenv "HOME" "/tmp") + #t))))) + (propagated-inputs + `(("ruby-ffi" ,ruby-ffi))) + (native-inputs + `(("ruby-mkmf-lite" ,ruby-mkmf-lite))) + (synopsis "Gather file system information") + (description + "The @code{sys-filesystem} library provides a cross-platform interface +for gathering file system information, such as disk space and mount points.") + (home-page "https://github.com/djberg96/sys-filesystem") + (license license:asl2.0))) + (define-public mailcatcher (package (name "mailcatcher") -- cgit 1.4.1 From bb719d6ae37569abf43a80684451081b16864221 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 16:15:48 +0200 Subject: gnu: ruby-thor: Update to 1.0.1. * gnu/packages/ruby.scm (ruby-thor): Update to 1.0.1. [source]: Switch to GIT-FETCH. [arguments]: Remove #:tests?. Add #:phases. [native-inputs]: Remove BUNDLER. Add RUBY-RSPEC and RUBY-SIMPLECOV. --- gnu/packages/ruby.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e32f93bec0..c80bab47cc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1680,18 +1680,70 @@ Ruby.") (define-public ruby-thor (package (name "ruby-thor") - (version "0.19.4") + (version "1.0.1") (source (origin - (method url-fetch) - (uri (rubygems-uri "thor" version)) + ;; Pull from git because the gem has no tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/erikhuda/thor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns")))) + "1anrx5vynk57hn5c8ig5pgkmcsbj9q5mvckd5rviw1jid7n89k57")))) (build-system ruby-build-system) (arguments - '(#:tests? #f)) ; no test suite + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-readline-tests + (lambda _ + ;; Ensure Readline is initialized before running the + ;; test to avoid a type clash with the mock ::Readline. + ;; See . + (substitute* "spec/line_editor/readline_spec.rb" + (("unless defined\\? ::Readline" all) + (string-append "Thor::LineEditor::Readline.available?\n" + all))) + #t)) + (add-after 'unpack 'remove-coveralls-dependency + (lambda _ + ;; Do not hook the test suite into the online + ;; coveralls service. + (substitute* "Gemfile" + ((".*coveralls.*") "")) + (substitute* "spec/helper.rb" + (("require \"coveralls\"") "") + (("Coveralls::SimpleCov::Formatter") "") + ;; Also drop the WebMock dependency which is only + ;; present to allow a coveralls.io connection, and + ;; would otherwise introduce a circular dependency. + (("require \"webmock/rspec\"") "") + (("WebMock\\.disable_net_connect.*") "")) + #t)) + (add-after 'unpack 'disable-network-tests + (lambda _ + ;; These tests attempt to look up example.com. + (substitute* "spec/actions/file_manipulation_spec.rb" + (("it \"accepts (https?) remote sources" _ proto) + (string-append "xit \"accepts " proto " remote sources"))) + #t)) + (add-after 'unpack 'disable-quality-tests + (lambda _ + ;; These tests attempt to check the git repository for + ;; tabs vs spaces, double vs single quotes, etc, and + ;; depend on the git checkout. + (delete-file "spec/quality_spec.rb") + #t)) + (add-before 'check 'make-files-writable + (lambda _ + ;; The tests needs rw access to the test suite. + (for-each make-file-writable (find-files "spec")) + #t)) + (replace 'check + (lambda _ + (invoke "rspec" "spec")))))) (native-inputs - `(("bundler" ,bundler))) + `(("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov))) (synopsis "Ruby toolkit for building command-line interfaces") (description "Thor is a toolkit for building powerful command-line interfaces.") -- cgit 1.4.1 From 2d2d5b29fb461850858638e023cee3a3a04beb77 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 17:04:36 +0200 Subject: gnu: Add facter. * gnu/packages/admin.scm (facter): New public variable. --- gnu/packages/admin.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b0a43d9644..36f063ca96 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -58,6 +58,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system ruby) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) @@ -121,6 +122,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages sphinx) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) @@ -429,6 +431,71 @@ services.") graphs and can export its output to different formats.") (license license:bsd-3))) +(define-public facter + (package + (name "facter") + (version "4.0.24") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/puppetlabs/facter-ng") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1n8yd2p7m0jf0wld6q43f2gqxyz8fiamz3p79wbl53q5qih0vba2")))) + (build-system ruby-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-facter-ng-gemspec + (lambda _ + ;; XXX: ruby-build-system incorrectly finds + ;; facter-ng.gemspec from this directory and tries to + ;; build that instead of the proper facter.gemspec. + ;; Just delete it as a workaround, as it appears to + ;; only exist for backwards-compatibility after the + ;; facter-ng->facter rename. + (delete-file "agent/facter-ng.gemspec") + #t)) + (add-after 'unpack 'embed-iproute-reference + (lambda* (#:key inputs #:allow-other-keys) + (let ((iproute (assoc-ref inputs "iproute"))) + ;; Provide an absolute reference to the 'ip' executable + ;; to avoid propagating it. + (substitute* "lib/resolvers/networking_linux_resolver.rb" + (("execute\\('ip") + (string-append "execute('" iproute "/sbin/ip"))) + #t))) + (delete 'check) + (add-after 'wrap 'check + (lambda* (#:key tests? outputs #:allow-other-keys) + ;; XXX: The test suite wants to run Bundler and + ;; complains that the gemspec is invalid. For now + ;; just make sure that we can run the wrapped + ;; executable directly. + (if tests? + (invoke (string-append (assoc-ref outputs "out") + "/bin/facter") + ;; Many facts depend on /sys, /etc/os-release, + ;; etc, so we only run a small sample. + "facterversion" "architecture" + "kernel" "kernelversion") + (format #t "tests disabled~%")) + #t))))) + (inputs + `(("iproute" ,iproute) + ("ruby-hocon" ,ruby-hocon) + ("ruby-sys-filesystem" ,ruby-sys-filesystem) + ("ruby-thor" ,ruby-thor))) + (synopsis "Collect and display system facts") + (description + "Facter is a tool that gathers basic facts about nodes (systems) such +as hardware details, network settings, OS type and version, and more. These +facts can be collected on the command line with the @command{facter} command +or via the @code{facter} Ruby library.") + (home-page "https://github.com/puppetlabs/facter-ng") + (license license:expat))) + (define-public htop (package (name "htop") -- cgit 1.4.1 From 1b8c7d12e94d5b630d48471f1490f5691e17900b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 20:13:22 +0200 Subject: gnu: code.scm: Sort module imports. * gnu/packages/code.scm (define-module): Sort imports. --- gnu/packages/code.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index ee47582ec8..d6aacadfe7 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -48,16 +48,16 @@ #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages graphviz) + #:use-module (gnu packages llvm) + #:use-module (gnu packages lua) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) - #:use-module (gnu packages texinfo) - #:use-module (gnu packages ncurses) - #:use-module (gnu packages llvm) - #:use-module (gnu packages lua)) + #:use-module (gnu packages texinfo)) ;;; Tools to deal with source code: metrics, cross-references, etc. -- cgit 1.4.1 From d1c6b0979f763980729bb11a98d2e003a37e403d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 21:22:13 +0200 Subject: gnu: Add packcc. * gnu/packages/c.scm (packcc): New public variable. --- gnu/packages/c.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 5718ec66ac..5c0209f42d 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -254,6 +255,57 @@ string formatting and autoresizing, option and config file parsing, type checking casts and more.") (license license:lgpl2.1+))) +(define-public packcc + (package + (name "packcc") + ;; We need a few fixes on top of the latest release to prevent test + ;; failures in Universal Ctags. + (version "1.2.5-19-g58d1b9d") + (home-page "https://github.com/enechaev/packcc") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0biyv835jlk43fvmmd3p8jafs7k2iw9qlaj37hvsl604ai6rd5aj")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ;no tests + #:make-flags '("-DUSE_SYSTEM_STRNLEN=1") + #:phases (modify-phases %standard-phases + ;; The project consists of a single source file and has + ;; no actual build system, so we need to do it manually. + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "gcc" "-o" "packcc" "packcc.c" + make-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "packcc" (string-append out "/bin")) + (install-file "README.md" + (string-append out "/share/doc/packcc")) + #t)))))) + (synopsis "Packrat parser generator for C") + (description + "PackCC is a packrat parser generator for the C programming language. +Its main features are: +@itemize +@item Generates a parser in C from a grammar described in a PEG. +@item Gives your parser great efficiency by packrat parsing. +@item Supports direct and indirect left-recursive grammar rules. +@end itemize +The grammar of your parser can be described in a @acronym{PEG, Parsing +Expression Grammar}. The PEG is a top-down parsing language, and is similar +to the regular-expression grammar. The PEG does not require tokenization to +be a separate step, and tokenization rules can be written in the same way as +any other grammar rules.") + (license license:expat))) + (define-public sparse (package (name "sparse") -- cgit 1.4.1 From 58056d5bf27e802a689eb1a1800304494a88a1f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 21:22:55 +0200 Subject: gnu: Add Universal Ctags. * gnu/packages/code.scm (universal-ctags): New public variable. --- gnu/packages/code.scm | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index d6aacadfe7..2285b519a0 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,12 +44,14 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages graphviz) #:use-module (gnu packages llvm) + #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -57,7 +60,9 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) - #:use-module (gnu packages texinfo)) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) ;;; Tools to deal with source code: metrics, cross-references, etc. @@ -321,6 +326,83 @@ features that are not supported by the standard @code{stdio} implementation.") (license (license:non-copyleft "http://sourceforge.net/p/ctrio/git/ci/master/tree/README")))) +(define-public universal-ctags + ;; The project is unable to decide whether to use 1.0 or 6.0 as the + ;; first public release version (it started as a fork of another ctags + ;; project that was on version 5.8), and five years later have been + ;; unable to tag a release. Thus, we just take the master branch. + (let ((commit "0c78c0c4a68030df0d025c90bad291108b5e7107") + (revision "0")) + (package + (name "universal-ctags") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/universal-ctags/ctags") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lnxc3kwi6srw0015m16vyjfdc7pdr9d1qzxjsbfv3c69ag87jhc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove the bundled PackCC and associated build rules. + (substitute* "Makefile.am" + (("\\$\\(packcc_verbose\\)\\$\\(PACKCC\\)") + "packcc") + (("\\$\\(PEG_SRCS\\) \\$\\(PEG_HEADS\\): packcc\\$\\(EXEEXT\\)") + "$(PEG_SRCS) $(PEG_HEADS):") + (("noinst_PROGRAMS \\+= packcc") + "")) + (delete-file-recursively "misc/packcc") + #t)))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (add-before 'bootstrap 'patch-optlib2c + (lambda _ + ;; The autogen.sh script calls out to optlib2c to + ;; generate translations, so we can not wait for the + ;; patch-source-shebangs phase. + (patch-shebang "misc/optlib2c") + #t)) + (add-before 'check 'patch-tests + (lambda _ + (substitute* "misc/units" + (("SHELL=/bin/sh") + (string-append "SHELL=" (which "sh")))) + (substitute* "Tmain/utils.sh" + (("/bin/echo") (which "echo"))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("packcc" ,packcc) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("jansson" ,jansson) + ("libseccomp" ,libseccomp) + ("libxml2" ,libxml2) + ("libyaml" ,libyaml))) + (home-page "https://ctags.io/") + (synopsis "Generate tag files for source code") + (description + "Universal Ctags generates an index (or tag) file of language objects +found in source files for many popular programming languages. This index +makes it easy for text editors and other tools to locate the indexed items. +Universal Ctags improves on traditional ctags because of its multilanguage +support, its ability for the user to define new languages searched by regular +expressions, and its ability to generate emacs-style TAGS files.") + (license license:gpl2+)))) + (define-public withershins (package (name "withershins") -- cgit 1.4.1 From ef64f9ca8f73809119a0ffaed79a756ec1924b65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 21:24:02 +0200 Subject: gnu: jucipp: Update to 1.6.0. * gnu/packages/text-editors.scm (jucipp): Update to 1.6.0. [arguments]: Remove obsolete phase. [inputs]: Add UNIVERSAL-CTAGS. --- gnu/packages/text-editors.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f415fd7f65..d6c0aa7acb 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) + #:use-module (gnu packages code) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) @@ -196,7 +197,7 @@ bindings and many of the powerful features of GNU Emacs.") (define-public jucipp (package (name "jucipp") - (version "1.5.1") + (version "1.6.0") (home-page "https://gitlab.com/cppit/jucipp") (source (origin (method git-fetch) @@ -208,7 +209,7 @@ bindings and many of the powerful features of GNU Emacs.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0v7fmsya2zn1xx59bkv4cbyinmcnv52hm4j40nbfwalcks631xrr")))) + (base32 "177myy6qvjlb6j3f3i3xmfml5r3p9in8xzpvm0n59dn56s81gpnr")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON" @@ -225,19 +226,6 @@ bindings and many of the powerful features of GNU Emacs.") (chdir "build") #t)) - ;; This phase is necessary to fix a test failure, see - ;; . - (add-after 'unpack 'add-reference-to-clang-internal-header - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/compile_commands.cc" - ((".*-I/usr/lib/clang.*" all) - (string-append "arguments.emplace_back(\"-I" - (assoc-ref inputs "libclang") - "/lib/clang/" - ,@(list (package-version clang)) - "/include\");\n" - all))) - #t)) (add-after 'unpack 'patch-tiny-process-library (lambda _ (with-directory-excursion "lib/tiny-process-library" @@ -269,6 +257,7 @@ bindings and many of the powerful features of GNU Emacs.") (inputs `(("aspell" ,aspell) ("boost" ,boost) + ("ctags" ,universal-ctags) ("gtkmm" ,gtkmm) ("gtksourceviewmm" ,gtksourceviewmm) ("libclang" ,clang) -- cgit 1.4.1 From f18d5d75979f5374962c03a8f3c266054a489e11 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Wed, 27 May 2020 16:52:53 +0200 Subject: doc: Use existing URLs and file names in installation instructions. Some users are confused that these URLs and file names don't work, so change them to the most popular architecture, while still mentioning alternatives. * doc/guix.texi (USB Stick and DVD Installation, Binary Installation): Use x86_64-linux URLs by default. --- doc/guix.texi | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4dbbf96db9..9c56f657d6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36,7 +36,7 @@ Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nikita Gillmann@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@* -Copyright @copyright{} 2016 Julien Lepiller@* +Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@* @@ -567,17 +567,18 @@ Installing goes along these lines: @item @cindex downloading Guix binary Download the binary tarball from -@indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz}, -where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine -already running the kernel Linux, and so on. +@indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz}, +where @code{x86_64-linux} can be replaced with @code{i686-linux} for an +@code{i686} (32-bits) machine already running the kernel Linux, and so on +(@pxref{GNU Distribution}). @c The following is somewhat duplicated in ``System Installation''. Make sure to download the associated @file{.sig} file and to verify the authenticity of the tarball against it, along these lines: @example -$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig -$ gpg --verify guix-binary-@value{VERSION}.@var{system}.tar.xz.sig +$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig +$ gpg --verify guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig @end example If that command fails because you do not have the required public key, @@ -603,7 +604,7 @@ you may have to run @code{su -} or @code{sudo -i}. As @code{root}, run: @example # cd /tmp # tar --warning=no-timestamp -xf \ - /path/to/guix-binary-@value{VERSION}.@var{system}.tar.xz + /path/to/guix-binary-@value{VERSION}.x86_64-linux.tar.xz # mv var/guix /var/ && mv gnu / @end example @@ -1917,8 +1918,8 @@ about their support in GNU/Linux. An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from -@indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz}, -where @var{system} is one of: +@indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz}, +where you can replace @code{x86_64-linux} with one of: @table @code @item x86_64-linux @@ -1933,8 +1934,8 @@ Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines: @example -$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig -$ gpg --verify guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig +$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig +$ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig @end example If that command fails because you do not have the required public key, @@ -1965,7 +1966,7 @@ To copy the image to a USB stick, follow these steps: Decompress the image using the @command{xz} command: @example -xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz +xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz @end example @item @@ -1974,7 +1975,7 @@ its device name. Assuming that the USB stick is known as @file{/dev/sdX}, copy the image with: @example -dd if=guix-system-install-@value{VERSION}.@var{system}.iso of=/dev/sdX +dd if=guix-system-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX sync @end example @@ -1990,7 +1991,7 @@ To copy the image to a DVD, follow these steps: Decompress the image using the @command{xz} command: @example -xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz +xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz @end example @item @@ -1999,7 +2000,7 @@ its device name. Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with: @example -growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso +growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.x86_64-linux.iso @end example Access to @file{/dev/srX} usually requires root privileges. -- cgit 1.4.1 From d47ae07d1958878d32212080066a601244666ff6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:22:56 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.225. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.225. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dad7b6e992..8234fd146c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,10 +409,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.224") +(define-public linux-libre-4.4-version "4.4.225") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1lb8ypn558vk73bj4a20wq40cig9vmzjn2xzzdws78gfair6hxpg"))) + (hash (base32 "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From 26f548f400aec03c43ac1e7c337750d0da029c38 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:23:50 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.225. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.225. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8234fd146c..112498d495 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,10 +401,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.224") +(define-public linux-libre-4.9-version "4.9.225") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0jf92cx0b3wq9fxa3169wk4wqvy58hglfk6lsynszy8kjplhfvfz"))) + (hash (base32 "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From e3d20816bd9b5897de9c15ac952bec287f8347b2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:24:17 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.182. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.182. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 112498d495..1ae686b5dc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,10 +393,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.181") +(define-public linux-libre-4.14-version "4.14.182") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0kaasqhmg9in7pf4ldk9z4z1cjgv1c9xdr1ca0pznngygibym6xb"))) + (hash (base32 "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From 08ae4a528d2950a007a0b66324482e8143435e63 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:24:54 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.125. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.125. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1ae686b5dc..4a463b4af9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.124") +(define-public linux-libre-4.19-version "4.19.125") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "005dznldnj1m03cbkc5pd2q2cv9jj1j6a0x2vh4p79ypg4c01nfm"))) + (hash (base32 "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 3294ac691c786a8964c0c8b738ac2d82df116297 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:25:39 -0400 Subject: gnu: linux-libre@5.6: Update to 5.6.15. * gnu/packages/linux.scm (linux-libre-5.6-version): Update to 5.6.15. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4a463b4af9..ef0fbd9bf9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.14") +(define-public linux-libre-5.6-version "5.6.15") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "18vyxi64i93v4qyky5q62kkasm1da7wmz91xfkx3j7ki84skyxik"))) + (hash (base32 "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit 1.4.1 From 3ddd4b28a8c3ae8b4db7923bdeca1c44afb66b7b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 27 May 2020 17:26:23 -0400 Subject: gnu: linux-libre: Update to 5.4.43. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.43. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ef0fbd9bf9..b159ff7b22 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.42") +(define-public linux-libre-5.4-version "5.4.43") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0cdwazpzfrrb2y5fp87v9yihy7v8mlbqjzxpzmv7p83609y1nhsf"))) + (hash (base32 "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 9549f0283a78fe36f2d4ff2a04ef8ad6b0c02604 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 27 May 2020 17:35:20 -0500 Subject: gnu: libnslog: Use latest version of check for tests. Test failures with latest check were fixed in most recent release. See bug report: https://bugs.netsurf-browser.org/mantis/view.php?id=2736 * gnu/packages/web.scm (libnslog)[native-inputs]: Use latest check. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 169f9499fa..64671842a7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5157,7 +5157,7 @@ C. It is developed as part of the NetSurf project.") (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) ("pkg-config" ,pkg-config) - ("check" ,check-0.12) ; For tests + ("check" ,check) ; For tests ("bison" ,bison) ("flex" ,flex))) (arguments netsurf-buildsystem-arguments) -- cgit 1.4.1 From c041c360b7145997b723c66065b1a0a22265efe7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 12:12:46 +0200 Subject: system: hurd: Remove custom gexp compiler. This is superseded by , which was added in ef674a24c527eaf54801707d34dbf5d12ec139cb. * gnu/system/hurd.scm (compile-manifest): Remove. (cross-hurd-image)[system-profile]: Define using 'profile'. --- gnu/system/hurd.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 58bfdf88f6..3ccf47aa21 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -41,16 +41,6 @@ ;;; ;;; Code: -;; XXX: Surely this belongs in (guix profiles), but perhaps we need high-level -;; objects so one can specify hooks, etc.? -(define-gexp-compiler (compile-manifest (manifest - (@@ (guix profiles) )) - system target) - "Lower MANIFEST as a profile." - (profile-derivation manifest - #:system system - #:target target)) - (define %base-packages/hurd (list hurd bash coreutils file findutils grep sed guile-3.0 guile-colorized guile-readline @@ -71,8 +61,10 @@ (manifest-entry-dependencies entry))))) (define system-profile - (map-manifest-entries cross-built-entry - (packages->manifest %base-packages/hurd))) + (profile + (content + (map-manifest-entries cross-built-entry + (packages->manifest %base-packages/hurd))))) (define grub.cfg (let ((hurd (cross-built hurd)) -- cgit 1.4.1 From c1dc50ab202fafedde3a6b70ce6339496ad53a51 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 27 May 2020 14:28:00 +0200 Subject: maint: Check whether Guile-Gcrypt is recent enough. Suggested by Danny Milosavljevic in . * m4/guix.m4 (GUIX_CHECK_GUILE_GCRYPT): New macro. * configure.ac: Use it. --- configure.ac | 6 +++--- m4/guix.m4 | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 0a20b476eb..cbf92dad30 100644 --- a/configure.ac +++ b/configure.ac @@ -136,9 +136,9 @@ if test "x$guix_cv_have_recent_guile_sqlite3" != "xyes"; then AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.]) fi -GUILE_MODULE_AVAILABLE([have_guile_gcrypt], [(gcrypt hash)]) -if test "x$have_guile_gcrypt" != "xyes"; then - AC_MSG_ERROR([Guile-Gcrypt could not be found; please install it.]) +GUIX_CHECK_GUILE_GCRYPT +if test "x$guix_cv_have_recent_guile_gcrypt" != "xyes"; then + AC_MSG_ERROR([A recent Guile-Gcrypt could not be found; please install it.]) fi dnl Guile-newt is used by the graphical installer. diff --git a/m4/guix.m4 b/m4/guix.m4 index 961ce838ac..9eb3863482 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -1,5 +1,5 @@ dnl GNU Guix --- Functional package management for GNU -dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès +dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès dnl Copyright © 2014 Mark H Weaver dnl Copyright © 2017 Efraim Flashner dnl @@ -194,6 +194,24 @@ AC_DEFUN([GUIX_CHECK_GUILE_JSON], [ fi]) ]) +dnl GUIX_CHECK_GUILE_GCRYPT +dnl +dnl Check whether a recent-enough Guile-Gcrypt is available. +AC_DEFUN([GUIX_CHECK_GUILE_GCRYPT], [ + dnl Check whether we're using Guile-Gcrypt 0.2.x or later. 0.2.0 + dnl introduced the 'hash-algorithm' macro and related code. + AC_CACHE_CHECK([whether Guile-Gcrypt is available and recent enough], + [guix_cv_have_recent_guile_gcrypt], + [GUILE_CHECK([retval], + [(use-modules (gcrypt hash)) + (equal? (hash-algorithm sha256) + (lookup-hash-algorithm 'sha256))]) + if test "$retval" = 0; then + guix_cv_have_recent_guile_gcrypt="yes" + else + guix_cv_have_recent_guile_gcrypt="no" + fi]) +]) dnl GUIX_TEST_ROOT_DIRECTORY AC_DEFUN([GUIX_TEST_ROOT_DIRECTORY], [ -- cgit 1.4.1 From 060e44b14fbf424f1c72fe0cb4978b9827b9e833 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 May 2020 01:02:35 +0200 Subject: gnu: gdb: Add version 9.2. * gnu/packages/gdb.scm (gdb-9.2): New variable. --- gnu/packages/gdb.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 3fa8e53884..6b7e7c1ae9 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -130,3 +130,15 @@ written in C, C++, Ada, Objective-C, Pascal and more.") ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. gdb-9.1) + +(define-public gdb-9.2 + (package + (inherit gdb) + (version "9.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdb/gdb-" + version ".tar.xz")) + (sha256 + (base32 + "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n")))))) -- cgit 1.4.1 From bdfd5d6f51b5e9b916780ca896a3a7f76bc742ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:09:14 +0200 Subject: gnu: gnome-boxes: Update to 3.36.4. * gnu/packages/gnome.scm (gnome-boxes): Update to 3.36.4. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 94a649779e..23684aabba 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9911,7 +9911,7 @@ integrate seamlessly with the GNOME desktop.") (define-public gnome-boxes (package (name "gnome-boxes") - (version "3.35.91") + (version "3.36.4") (source (origin (method url-fetch) @@ -9919,8 +9919,7 @@ integrate seamlessly with the GNOME desktop.") (version-major+minor version) "/" "gnome-boxes-" version ".tar.xz")) (sha256 - (base32 - "0l96spz6pc8q4l5p9a58cc0kgvdr7pbc89hy6ixn72k5pl3s7fxj")))) + (base32 "16l0mq2ydmywcdya1795mcy8syg4zkmz9ws3pzjcqv5y4m7cjj03")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit 1.4.1 From 897897bda3ef2f7366560c45b92a6f39abca148f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:10:31 +0200 Subject: gnu: gnome: Add gnome-boxes. * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Add gnome-boxes. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 23684aabba..0d63579d4a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7895,7 +7895,7 @@ world.") ("evince" ,evince) ("file-roller" ,file-roller) ("gedit" ,gedit) - ; TODO: ("gnome-boxes" ,gnome-boxes) + ("gnome-boxes" ,gnome-boxes) ("gnome-calculator" ,gnome-calculator) ("gnome-calendar" ,gnome-calendar) ("gnome-characters" ,gnome-characters) -- cgit 1.4.1 From 6cff0af0d198fa51ef487fa61dc5f215d2cb1ccc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 May 2020 15:37:34 +0200 Subject: gnu: mu: Update to 1.4.7. * gnu/packages/mail.scm (mu): Update to 1.4.7. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fa0b22cd9c..b44afd360e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -711,15 +711,15 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" - "download/" version "/" + "download/1,4.7/" ; sic "mu-" version ".tar.xz")) (sha256 (base32 - "15spbplf9p8cdxqfwnv3x67451sfpna9q5n2kgqqwh2y78i7zlhc")))) + "19qmz9fgnjpj0cxb8y9nb2dfk7pc0a9kwfiysa0f13ps3d5k4mhm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From b6389525a48c7450fad89877327a8354ebef7503 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:24:14 +0200 Subject: gnu: eid-mw: Update to 4.4.27. * gnu/packages/security-token.scm (eid-mw): Update to 4.4.27. --- gnu/packages/security-token.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 2ab8a85702..e1df075bf3 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -103,7 +103,7 @@ readers and is needed to communicate with such devices through the (define-public eid-mw (package (name "eid-mw") - (version "4.4.23") + (version "4.4.27") (source (origin (method git-fetch) @@ -112,7 +112,7 @@ readers and is needed to communicate with such devices through the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kf147zxsp5ilghr46hjxa2nsikhv8198n04q81qzn9zln69av04")))) + (base32 "17lw8iwp7h5cs3db80sysr84ffi333cf2vrhncs9l6hy6glfl2v1")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -139,7 +139,7 @@ readers and is needed to communicate with such devices through the ;; Patch it to just return the real version number directly. (substitute* "scripts/build-aux/genver.sh" (("/bin/sh") (which "sh")) - (("^(GITDESC=).*" match) (string-append match ,version "\n"))) + (("^(GITDESC=).*" _ match) (string-append match ,version "\n"))) (invoke "sh" "./bootstrap.sh")))))) (synopsis "Belgian eID Middleware") (description "The Belgian eID Middleware is required to authenticate with -- cgit 1.4.1 From 637924ad7ea2a45ae7287b68fd8ec8ce97652717 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:40:23 +0200 Subject: gnu: cvs-fast-export: Update to 1.55. * gnu/packages/version-control.scm (cvs-fast-export): Update to 1.55. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 2e3607f8f3..f26d0ca2b4 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1718,14 +1718,14 @@ RCS, PRCS, and Aegis packages.") (define-public cvs-fast-export (package (name "cvs-fast-export") - (version "1.51") + (version "1.55") (source (origin (method url-fetch) (uri (string-append "http://www.catb.org/~esr/cvs-fast-export/" "cvs-fast-export-" version ".tar.gz")) (sha256 (base32 - "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf")))) + "06y2myhhv2ap08bq7d7shq0b7lq6wgznwrpz6622xq66cxkf2n5g")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit 1.4.1 From c5982689924cd1d5bf472ee4c2b1003318c31a58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:52:51 +0200 Subject: gnu: r-rversions: Update to 2.0.2. * gnu/packages/statistics.scm (r-rversions): Update to 2.0.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 224c19cea3..fd898a32c5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2052,13 +2052,13 @@ jackknifed confidence intervals are available for most estimates.") (define-public r-rversions (package (name "r-rversions") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (cran-uri "rversions" version)) (sha256 (base32 - "1ic6sxnyya24d5xsxjg3fba73fhya9fhs0kaf66yha6nwxj1zv2i")))) + "0ghpla5r3d6zh5dn6d6ii5p0a952lcdv004m88fk8r9k76vz88rm")))) (build-system r-build-system) (propagated-inputs `(("r-curl" ,r-curl) -- cgit 1.4.1 From 023eea68f53a6d2979f558fc7590f43aee3aff43 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 27 May 2020 22:21:35 -0400 Subject: gnu: apfs-fuse: Update to 0.0.0-1.7b89418. * gnu/packages/file-systems.scm (apfs-fuse): Update to 0.0.0-1.7b89418. [arguments]: Install the README. Select FUSE 2 in #:configure-flags. --- gnu/packages/file-systems.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index df6febb92e..03ad144fc2 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -491,8 +491,9 @@ network. LIBNFS offers three different APIs, for different use : )))) (define-public apfs-fuse - (let ((commit "c7036a3030d128bcecefc1eabc47c039ccfdcec9") - (revision "0")) + ;; Later versions require FUSE 3. + (let ((commit "7b89418e8dc27103d3c4f8fa348086ffcd634c17") + (revision "1")) (package (name "apfs-fuse") (version (git-version "0.0.0" revision commit)) @@ -504,11 +505,13 @@ network. LIBNFS offers three different APIs, for different use : (commit commit))) (sha256 (base32 - "1akd4cx1f9cyq6sfk9ybv4chhjwjlnqi8ic4z5ajnd5x0g76nz3r")) + "0x2siy3cmnm9wsdfazg3xc8r3kbg73gijmnn1vjw33pp71ckylxr")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test suite + #:configure-flags + '("-DUSE_FUSE3=OFF") ; FUSE 3 is not packaged yet. #:phases (modify-phases %standard-phases ;; No 'install' target in CMakeLists.txt @@ -523,6 +526,7 @@ network. LIBNFS offers three different APIs, for different use : (install-file "apfs-dump-quick" bin) (install-file "apfs-fuse" bin) (install-file "libapfs.a" lib) + (install-file "../source/README.md" doc) #t)))))) (inputs `(("bzip2" ,bzip2) -- cgit 1.4.1 From 03e6404936ef0974fdbc877d537b97b28e54124d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 May 2020 12:29:55 +0300 Subject: doc: Remove explicit support for mips64el-linux. It's been a good run, but no one is maintaining the architecture. So long, and thanks for all the fish. * doc/guix.texi (GNU Distribution): Change text for mips64el-linux to denote it is deprecated. (Daemon Offload Setup): Change occurrences of mips64el-linux to aarch64-linux and adjust local code snippets. (Guix Environment)[cross-compilation]: Change mips64el-linux-gnu to aarch64-linux-gnu. (GNU Build System)(package-cross-derivation]: Same. (G-Expressions)[cross compilation]: Same. (Additional Build Options)[cross-compilation, build logs]: Same. (qemu-binfmt-service-type): Remove mips64el. * doc/contributing.texi (Submitting Patches): Same. * m4/guix.m4: (GUIX_ASSERT_SUPPORTED_SYSTEM): Remove mips64el-linux. --- doc/contributing.texi | 3 +-- doc/guix.texi | 25 +++++++++++++------------ m4/guix.m4 | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 25b50e8e72..88128e5498 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -938,7 +938,7 @@ your @code{operating-system} configuration: @lisp (service qemu-binfmt-service-type (qemu-binfmt-configuration - (platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el")) + (platforms (lookup-qemu-platforms "arm" "aarch64")) (guix-support? #t))) @end lisp @@ -951,7 +951,6 @@ commands, respectively: @example guix build --system=armhf-linux --rounds=2 hello guix build --system=aarch64-linux --rounds=2 hello -guix build --system=mips64el-linux --rounds=2 hello @end example @item diff --git a/doc/guix.texi b/doc/guix.texi index 9c56f657d6..5b9942d420 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -464,11 +464,12 @@ and Linux-Libre kernel. @item aarch64-linux little-endian 64-bit ARMv8-A processors, Linux-Libre kernel. -@item mips64el-linux +@item mips64el-linux (deprecated) little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully -supported; in particular, the project's build farms no longer provide -substitutes for this architecture. +supported; in particular, there is no ongoing work to ensure that this +architecture still works. Should someone decide they wish to revive this +architecture then the code is still available. @end table @@ -1060,8 +1061,8 @@ The @file{/etc/guix/machines.scm} file typically looks like this: (speed 2.)) ;incredibly fast! (build-machine - (name "meeps.example.org") - (system "mips64el-linux") + (name "armeight.example.org") + (system "aarch64-linux") (host-key "ssh-rsa AAAAB3Nza@dots{}") (user "alice") (private-key @@ -1071,7 +1072,7 @@ The @file{/etc/guix/machines.scm} file typically looks like this: @noindent In the example above we specify a list of two build machines, one for -the @code{x86_64} architecture and one for the @code{mips64el} +the @code{x86_64} architecture and one for the @code{aarch64} architecture. In fact, this file is---not surprisingly!---a Scheme file that is @@ -5330,7 +5331,7 @@ the system type of the build host. @item --target=@var{triplet} @cindex cross-compilation Cross-build for @var{triplet}, which must be a valid GNU triplet, such -as @code{"mips64el-linux-gnu"} (@pxref{Specifying target triplets, GNU +as @code{"aarch64-linux-gnu"} (@pxref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf}). @item --compression=@var{tool} @@ -5719,7 +5720,7 @@ Return the @code{} object of @var{package} cross-built from @var{system} to @var{target}. @var{target} must be a valid GNU triplet denoting the target hardware -and operating system, such as @code{"mips64el-linux-gnu"} +and operating system, such as @code{"aarch64-linux-gnu"} (@pxref{Specifying Target Triplets,,, autoconf, Autoconf}). @end deffn @@ -7720,7 +7721,7 @@ native package build: "-s" (string-append #$emacs "/bin/emacs") (string-append #$output "/bin/vi"))) - #:target "mips64el-linux-gnu") + #:target "aarch64-linux-gnu") @end lisp @noindent @@ -8840,7 +8841,7 @@ also be offloaded to a remote machine of the right architecture. @item --target=@var{triplet} @cindex cross-compilation Cross-build for @var{triplet}, which must be a valid GNU triplet, such -as @code{"mips64el-linux-gnu"} (@pxref{Specifying Target Triplets, GNU +as @code{"aarch64-linux-gnu"} (@pxref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf}). @anchor{build-check} @@ -8910,7 +8911,7 @@ So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine: @example -$ guix build --log-file gdb -s mips64el-linux +$ guix build --log-file gdb -s aarch64-linux https://@value{SUBSTITUTE-SERVER}/log/@dots{}-gdb-7.10 @end example @@ -24477,7 +24478,7 @@ emulated: @lisp (service qemu-binfmt-service-type (qemu-binfmt-configuration - (platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el")))) + (platforms (lookup-qemu-platforms "arm" "aarch64")))) @end lisp In this example, we enable transparent emulation for the ARM and aarch64 diff --git a/m4/guix.m4 b/m4/guix.m4 index 9eb3863482..7c27ae74df 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -88,7 +88,7 @@ courageous and port the GNU System distribution to it (see # Currently only Linux-based systems are supported, and only on some # platforms. case "$guix_system" in - x86_64-linux|i686-linux|armhf-linux|aarch64-linux|mips64el-linux) + x86_64-linux|i686-linux|armhf-linux|aarch64-linux) ;; *) if test "x$guix_courageous" = "xyes"; then -- cgit 1.4.1 From 66e4db8cf828ba58bfd0bd5b41f38b93b5b71b3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:59:27 +0200 Subject: gnu: python-flask-sqlalchemy: Update to 2.4.2. * gnu/packages/python-web.scm (python-flask-sqlalchemy): Update to 2.4.2. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 00caf7f229..ff5b5b4ede 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2371,13 +2371,13 @@ applications.") (define-public python-flask-sqlalchemy (package (name "python-flask-sqlalchemy") - (version "2.4.0") + (version "2.4.2") (source (origin (method url-fetch) (uri (pypi-uri "Flask-SQLAlchemy" version)) (sha256 (base32 - "0nnllf0ddbh9jlhngnyjj98lbxgxr1csaplllx0caw98syq0k5hc")))) + "1ryb2y5gvpcglrmhk25hwzpi8a5q69m33gfqwxdcl67gjwdggnbc")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) -- cgit 1.4.1 From ccd9107ed9e8b918c6fb521cc69ac459fe4257ac Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 27 May 2020 23:13:48 +0200 Subject: update-guix-package: Use 'origin-hash'. * gnu/packages/package-management.scm (main): Use 'origin-hash' instead of 'origin-sha256'. Signed-off-by: Tobias Geerinckx-Rice --- build-aux/update-guix-package.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-aux/update-guix-package.scm b/build-aux/update-guix-package.scm index 83f6eca6bb..f695e91cfd 100644 --- a/build-aux/update-guix-package.scm +++ b/build-aux/update-guix-package.scm @@ -112,7 +112,8 @@ COMMIT." #:select? version-controlled?)) (hash (query-path-hash store source)) (location (package-definition-location)) - (old-hash (origin-sha256 (package-source guix)))) + (old-hash (content-hash-value + (origin-hash (package-source guix))))) (edit-expression location (update-definition commit hash #:old-hash old-hash -- cgit 1.4.1 From 77a87ad4aceed9d89d615540e0fd147e3a8b2f64 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 May 2020 11:46:59 +0200 Subject: gnu: clang: Build 'clang-tools-extra'. * gnu/packages/llvm.scm (clang-from-llvm): Add #:tools-extra. Add 'output' field. In 'inputs', add TOOLS-EXTRA when it's given. In 'arguments', add 'add-tools-extra' and 'move-extra-tools' phases when TOOLS-EXTRA is given. --- gnu/packages/llvm.scm | 87 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 47b490aac8..11e4cfbe4c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -201,7 +201,11 @@ compiler. In LLVM this library is called \"compiler-rt\".") (supported-systems (delete "mips64el-linux" %supported-systems)))) (define* (clang-from-llvm llvm clang-runtime hash - #:key (patches '())) + #:key (patches '()) tools-extra) + "Produce Clang with dependencies on LLVM and CLANG-RUNTIME, and applying the +given PATCHES. When TOOLS-EXTRA is given, it must point to the +'clang-tools-extra' tarball, which contains code for 'clang-tidy', 'pp-trace', +'modularize', and other tools." (package (name "clang") (version (package-version llvm)) @@ -218,11 +222,15 @@ compiler. In LLVM this library is called \"compiler-rt\".") ;; doesn't seem to be any way to do this with clang's autotools-based ;; build system. (build-system cmake-build-system) + (outputs (if tools-extra '("out" "extra") '("out"))) (native-inputs (package-native-inputs llvm)) (inputs `(("libxml2" ,libxml2) ("gcc-lib" ,gcc "lib") - ,@(package-inputs llvm))) + ,@(package-inputs llvm) + ,@(if tools-extra + `(("clang-tools-extra" ,tools-extra)) + '()))) (propagated-inputs `(("llvm" ,llvm) ("clang-runtime" ,clang-runtime))) @@ -243,6 +251,71 @@ compiler. In LLVM this library is called \"compiler-rt\".") #:build-type "Release" #:phases (modify-phases %standard-phases + ,@(if tools-extra + `((add-after 'unpack 'add-tools-extra + (lambda* (#:key inputs #:allow-other-keys) + ;; Unpack the 'clang-tools-extra' tarball under + ;; tools/. + (let ((extra (assoc-ref inputs + "clang-tools-extra"))) + (invoke "tar" "xf" extra) + (rename-file ,(string-append + "clang-tools-extra-" + (package-version llvm) + ".src") + "tools/extra") + #t))) + (add-after 'install 'move-extra-tools + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the extra tools to the "extra" output. + ;; These programs alone weigh in at 296 MiB, + ;; because they statically-link a whole bunch of + ;; Clang libraries. + (let* ((out (assoc-ref outputs "out")) + (extra (assoc-ref outputs "extra")) + (bin (string-append out "/bin")) + (bin* (string-append extra "/bin")) + (lib (string-append out "/lib"))) + (define (move program) + (rename-file (string-append bin "/" program) + (string-append bin* "/" + program))) + + (mkdir-p bin*) + (for-each move + '("clang-apply-replacements" + "clang-change-namespace" + "clangd" + "clang-doc" + "clang-include-fixer" + "clang-move" + "clang-query" + "clang-reorder-fields" + "clang-tidy" + "find-all-symbols" + "modularize" + "pp-trace")) + + ;; Remove MiBs of .a files coming from + ;; 'clang-tools-extra'. + (for-each (lambda (component) + (delete-file + (string-append lib "/libclang" + component ".a"))) + '("ApplyReplacements" + "ChangeNamespace" + "Daemon" + "DaemonTweaks" + "Doc" + "IncludeFixer" + "IncludeFixerPlugin" + "Move")) + (for-each delete-file + (find-files + lib + "^(libfindAllSymbols|libclangTidy)")) + #t)))) + '()) (add-after 'unpack 'add-missing-triplets (lambda _ ;; Clang iterates through known triplets to search for @@ -414,7 +487,15 @@ output), and Binutils.") (define-public clang-10 (clang-from-llvm llvm-10 clang-runtime-10 "08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8" - #:patches '("clang-10.0-libc-search-path.patch"))) + #:patches '("clang-10.0-libc-search-path.patch") + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-download-uri "clang-tools-extra" + (package-version llvm-10))) + (sha256 + (base32 + "074ija5s2jsdn0k035r2dzmryjmqxdnyg4xwvaqych2bazv8rpxc"))))) (define-public clang-toolchain-10 (make-clang-toolchain clang-10)) -- cgit 1.4.1 From 8ccac2c974223886e98417f7f49804d18388eaa9 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Thu, 28 May 2020 13:41:37 +0100 Subject: gnu: python-netcdf4: Update to 1.5.3 * gnu/packages/python-xyz.scm (python-netcdf4): Update to 1.5.3. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b359ffc955..b96a44e5fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -78,6 +78,7 @@ ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Matthew Kraai ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2020 Josh Holland ;;; ;;; This file is part of GNU Guix. ;;; @@ -848,14 +849,14 @@ of the netcdf4 package before.") (define-public python-netcdf4 (package (name "python-netcdf4") - (version "1.4.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (pypi-uri "netCDF4" version)) (sha256 (base32 - "0c0sklgrmv15ygliin8qq0hp7vanmbi74m6zpi0r1ksr0hssyd5r")))) + "1gn35mb2yc263pci720aik8ymz41lrvxlrn3z83vyjwghiashg1a")))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From 0d796201db2188e0a3abb6522f65458720b46fa6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 28 May 2020 10:40:34 -0400 Subject: gnu: Transmission: Fix CVE-2018-10756. * gnu/packages/patches/transmission-CVE-2018-10756.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/bittorrent.scm (transmission)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/bittorrent.scm | 1 + .../patches/transmission-CVE-2018-10756.patch | 71 ++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 gnu/packages/patches/transmission-CVE-2018-10756.patch diff --git a/gnu/local.mk b/gnu/local.mk index 80cefe5b63..de51c21014 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1531,6 +1531,7 @@ dist_patch_DATA = \ %D%/packages/patches/tipp10-fix-compiling.patch \ %D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tk-find-library.patch \ + %D%/packages/patches/transmission-CVE-2018-10756.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 947537b231..8b041cb3f5 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -73,6 +73,7 @@ (uri (string-append "https://github.com/transmission/transmission-releases/raw/" "master/transmission-" version ".tar.xz")) + (patches (search-patches "transmission-CVE-2018-10756.patch")) (sha256 (base32 "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m")))) diff --git a/gnu/packages/patches/transmission-CVE-2018-10756.patch b/gnu/packages/patches/transmission-CVE-2018-10756.patch new file mode 100644 index 0000000000..f9bdcf60aa --- /dev/null +++ b/gnu/packages/patches/transmission-CVE-2018-10756.patch @@ -0,0 +1,71 @@ +Fix CVE-2018-10756: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10756 + +Patch copied from Fedora: + +https://src.fedoraproject.org/rpms/transmission/blob/master/f/2123adf8e5e1c2b48791f9d22fc8c747e974180e.patch + +--- a/libtransmission/variant.c 2018-05-01 12:21:08.000000000 -0500 ++++ b/libtransmission/variant.c 2020-05-18 10:21:27.554214128 -0500 +@@ -820,7 +820,7 @@ + struct SaveNode + { + const tr_variant * v; +- tr_variant sorted; ++ tr_variant* sorted; + size_t childIndex; + bool isVisited; + }; +@@ -849,26 +849,33 @@ + + qsort (tmp, n, sizeof (struct KeyIndex), compareKeyIndex); + +- tr_variantInitDict (&node->sorted, n); ++ node->sorted = tr_new(tr_variant, 1); ++ tr_variantInitDict (node->sorted, n); + for (i=0; isorted.val.l.vals[i] = *tmp[i].val; ++ node->sorted->val.l.vals[i] = *tmp[i].val; + node->sorted.val.l.count = n; + + tr_free (tmp); + +- node->v = &node->sorted; ++ v = node->sorted; + } + else + { +- node->v = v; ++ node->sorted = NULL; + } ++ ++ node->v = v; + } + + static void + nodeDestruct (struct SaveNode * node) + { +- if (node->v == &node->sorted) +- tr_free (node->sorted.val.l.vals); ++ //TR_ASSERT(node != NULL); ++ if (node->sorted != NULL) ++ { ++ tr_free(node->sorted->val.l.vals); ++ tr_free(node->sorted); ++ } + } + + /** +--- a/libtransmission/variant.c 2020-05-18 10:21:49.000000000 -0500 ++++ b/libtransmission/variant.c 2020-05-18 10:24:34.673648865 -0500 +@@ -853,7 +853,7 @@ + tr_variantInitDict (node->sorted, n); + for (i=0; isorted->val.l.vals[i] = *tmp[i].val; +- node->sorted.val.l.count = n; ++ node->sorted->val.l.count = n; + + tr_free (tmp); + + -- cgit 1.4.1 From d1fa24afefa2efa4f11f17cacaaab700a290647c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 28 May 2020 17:21:52 +0200 Subject: gnu: Add guile-jsonld. * gnu/packages/guile-xyz.scm (guile-jsonld): New variable. --- gnu/packages/guile-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c7349af790..6a8bf54bf8 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3646,3 +3646,40 @@ operations on graphs. This library implements some basic functionalities, such as parsing and producing turtle and nquads syntax, as well as manipulating graphs and datasets.") (license license:gpl3+))) + +(define-public guile-jsonld + (package + (name "guile-jsonld") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/tyreunom/guile-jsonld") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zfn3nwlz6xzip1j8xbj768dc299r037cfc81bk6kwl9xhzkjbrg")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)); require network + (propagated-inputs + `(("guile-gnutls" ,gnutls) + ("guile-json" ,guile-json-3) + ("guile-rdf" ,guile-rdf))) + (inputs + `(("guile" ,guile-3.0))) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (home-page "https://framagit.org/tyreunom/guile-jsonld") + (synopsis "Guile implementation of the JsonLD API specification") + (description "Guile JsonLD is an implementation of the JsonLD (Json for +Linked Data) API defined by the W3C for GNU Guile. It allows you to express links +between data, in a way that is very similar to WikiData or RDF for instance. +An object can have relations (in the form of an IRI) that relates it to one or +more objects or strings, represented by a Json object or an IRI.") + (license license:gpl3+))) -- cgit 1.4.1 From 29ac40e9befb3fb9425e2d457fc52f0898ab24a7 Mon Sep 17 00:00:00 2001 From: Yuval Kogman Date: Thu, 28 May 2020 20:27:30 -0400 Subject: gnu: Add python-bashlex. * gnu/packages/python-xyz.scm (python-bashlex): New variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b96a44e5fc..4cbf20ebcd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -79,6 +79,7 @@ ;;; Copyright © 2020 Matthew Kraai ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Josh Holland +;;; Copyright © 2020 Yuval Kogman ;;; ;;; This file is part of GNU Guix. ;;; @@ -20021,3 +20022,39 @@ allows you, from Python code, to “fix” invalid (X)HTML markup.") (description "This packages selects the fastest JSON functions available at import time.") (license license:expat))) + +(define-public python-bashlex + (package + (name "python-bashlex") + (version "0.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bashlex" version)) + (sha256 + (base32 + "1z9g96fgsfpdwawp4sb5x6hbdhmda7kgmcrqlf9xx4bs1f8f14js")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'pregenerate-yacc-tables + (lambda _ + ;; parser.py caches tables, which attempts to write to site lib + ;; see https://github.com/idank/bashlex/issues/51 + (invoke "python" "-c" "import bashlex")))))) + (home-page + "https://github.com/idank/bashlex") + (synopsis "Python parser for bash") + (description "@code{bashlex} is a Python port of the parser used +internally by GNU bash. + +For the most part it's transliterated from C, the major differences are: + +@itemize +@item it does not execute anything +@item it is reentrant +@item it generates a complete AST +@end itemize +") + (license license:gpl3+))) -- cgit 1.4.1 From 6560c4976f775db5b494356df2beaa0fcec6f9c0 Mon Sep 17 00:00:00 2001 From: Yuval Kogman Date: Thu, 28 May 2020 20:28:49 -0400 Subject: gnu: Add compiledb. * gnu/packages/build-tools.scm (compiledb): New variable. Signed-off-by: Leo Famulari --- gnu/packages/build-tools.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index a8ffa56bc6..9ff32b22f9 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Yuval Kogman ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,12 +34,14 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages lua) #:use-module (gnu packages package-management) #: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 ninja) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -310,3 +313,38 @@ Service. It allows you to checkout, commit, perform reviews etc. The vast majority of the OBS functionality is available via commands and the rest can be reached via direct API calls.") (license license:gpl2+))) + +(define-public compiledb + (package + (name "compiledb") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "compiledb" version)) + (sha256 + (base32 "0vlngsdxfakyl8b7rnvn8h3l216lhbrrydr04yhy6kd03zflgfq6")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'no-compat-shim-dependency + ;; shutilwhich is only needed for python 3.3 and earlier + (lambda _ + (substitute* "setup.py" (("^ *'shutilwhich'\n") "")) + (substitute* "compiledb/compiler.py" (("shutilwhich") "shutil"))))))) + (propagated-inputs + `(("python-bashlex" ,python-bashlex) + ("python-click" ,python-click))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page + "https://github.com/nickdiego/compiledb") + (synopsis + "Generate Clang JSON Compilation Database files for make-based build systems") + (description + "@code{compiledb} provides a @code{make} python wrapper script which, +besides executing the make build command, updates the JSON compilation +database file corresponding to that build, resulting in a command-line +interface similar to Bear.") + (license license:gpl3))) -- cgit 1.4.1 From d870fcfb099cf5b0ad25220e1fa36162cc3284a5 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Thu, 28 May 2020 21:39:33 -0400 Subject: gnu: Add shiru-lv2. * gnu/packages/music.scm (shiru-lv2): New variable. Signed-off-by: Leo Famulari --- gnu/packages/music.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 89edcae43e..e4414dafd6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5589,3 +5589,66 @@ It is provided as an LV2 plugin and as a standalone Jack application.") It is provided as an LV2 plugin and as a standalone Jack application.") (home-page "https://github.com/pdesaulniers/wolf-spectrum") (license license:gpl3))) + +(define-public shiru-lv2 + (let ((commit "08853f99140012234649e67e5647906fda74f6cc") + (revision "1")) + (package + (name "shiru-lv2") + (version (git-version "0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmao-org/shiru-plugins.git") + (commit commit) + ;; Bundles a specific commit of the DISTRHO plugin framework. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00rf6im3rhg98h60sgl1r2s37za5vr5h14pybwi07h8zbc8mi6fm")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure target + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lv2 (string-append out "/lib/lv2"))) + ;; Install LV2. + (for-each + (lambda (file) + (copy-recursively file + (string-append lv2 "/" (basename file)))) + (find-files "bin" "\\.lv2$" #:directories? #t)) + ;; Install executables. + (for-each + (lambda (file) + (install-file file bin)) + (find-files "bin" + (lambda (name stat) + (and + (equal? (dirname name) "bin") + (not (string-suffix? ".so" name)) + (not (string-suffix? ".lv2" name)))))) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo", cairo) + ("glu", glu) + ("jack", jack-1) + ("lv2", lv2) + ("mesa", mesa) + ("pango", pango))) + (synopsis "Audio plugin collection") + (description "Shiru plugins is a collection of audio plugins created + by Shiru, ported to LV2 by the Linux MAO project using the DISTRHO plugin + framework.") + (home-page "http://shiru.untergrund.net/software.shtml") + (license license:wtfpl2)))) -- cgit 1.4.1 From d7aef3ab59837b9ed8abbe199debf8ed687f6782 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 16 Apr 2020 23:58:37 +0200 Subject: gnu: Add exfatprogs. * gnu/packages/file-systems.scm (exfatprogs): New public variable. Signed-off-by: Leo Famulari --- gnu/packages/file-systems.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 03ad144fc2..1f58917d0c 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -187,6 +187,38 @@ caching system, and lets you assign different roles to each device based on its performance and other characteristics.") (license license:gpl2+)))) +(define-public exfatprogs + (package + (name "exfatprogs") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/exfatprogs/exfatprogs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s47qvhr702z5c19wfqz8cwl9ammmincs7a8vjc6p974wnnjg77y")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--disable-static"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/exfatprogs/exfatprogs") + (synopsis "Tools to create, check, and repair exFAT file systems") + (description + "These are command-line user space tools for the @acronym{exFAT, +Extensible File Allocation Table} file systems. Included are +@command{mkfs.exfat} to create (format) new exFAT file systems, and +@command{fsck.exfat} to check their consistency and repair them.") + (license license:gpl2+))) + (define-public httpfs2 (package (name "httpfs2") -- cgit 1.4.1 From fa2811465b9ae5de278cfc3615c478a30eae49db Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Thu, 28 May 2020 23:12:08 -0400 Subject: gnu: Add r-brms. * gnu/packages/cran.scm (r-brms): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fff71790b6..fb450eb25d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21726,3 +21726,55 @@ of R without the need of linking to R code. Rserve supports remote connection, user authentication and file transfer. A simple R client is included in this package as well.") (license license:gpl2))) + +(define-public r-brms + (package + (name "r-brms") + (version "2.12.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "brms" version)) + (sha256 + (base32 + "1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs")))) + (properties `((upstream-name . "brms"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-backports" ,r-backports) + ("r-bayesplot" ,r-bayesplot) + ("r-bridgesampling" ,r-bridgesampling) + ("r-coda" ,r-coda) + ("r-future" ,r-future) + ("r-ggplot2" ,r-ggplot2) + ("r-glue" ,r-glue) + ("r-loo" ,r-loo) + ("r-matrix" ,r-matrix) + ("r-matrixstats" ,r-matrixstats) + ("r-mgcv" ,r-mgcv) + ("r-nleqslv" ,r-nleqslv) + ("r-nlme" ,r-nlme) + ("r-rcpp" ,r-rcpp) + ("r-rstan" ,r-rstan) + ("r-rstantools" ,r-rstantools) + ("r-shinystan" ,r-shinystan))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://github.com/paul-buerkner/brms") + (synopsis + "Bayesian Regression Models using 'Stan'") + (description + "Fit Bayesian generalized (non-)linear multivariate multilevel models +using 'Stan' for full Bayesian inference. A wide range of distributions and +link functions are supported, allowing users to fit -- among others -- linear, +robust linear, count data, survival, response times, ordinal, zero-inflated, +hurdle, and even self-defined mixture models all in a multilevel context. +Further modeling options include non-linear and smooth terms, auto-correlation +structures, censored data, meta-analytic standard errors, and quite a few +more. In addition, all parameters of the response distribution can be +predicted in order to perform distributional regression. Prior specifications +are flexible and explicitly encourage users to apply prior distributions that +actually reflect their beliefs. Model fit can easily be assessed and compared +with posterior predictive checks and leave-one-out cross-validation.") + (license license:gpl2))) -- cgit 1.4.1 From 3bafa88b40483040e5f8034561590cadd43514c8 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Thu, 28 May 2020 23:13:31 -0400 Subject: gnu: Add r-mstate. * gnu/packages/cran.scm (r-mstate): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb450eb25d..b27dd40871 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21778,3 +21778,29 @@ are flexible and explicitly encourage users to apply prior distributions that actually reflect their beliefs. Model fit can easily be assessed and compared with posterior predictive checks and leave-one-out cross-validation.") (license license:gpl2))) + +(define-public r-mstate + (package + (name "r-mstate") + (version "0.2.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "mstate" version)) + (sha256 + (base32 + "0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv")))) + (properties `((upstream-name . "mstate"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-survival" ,r-survival))) + (home-page + "https://www.lumc.nl/org/bds/research/medische-statistiek/survival-analysis/") + (synopsis + "Data Preparation, Estimation and Prediction in Multi-State Models") + (description + "Contains functions for data preparation, descriptives, hazard estimation +and prediction with Aalen-Johansen or simulation in competing risks and +multi-state models.") + (license license:gpl2+))) -- cgit 1.4.1 From b51f74ae0d45836e81dfacd12443b3059c814040 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 04:41:10 +0200 Subject: gnu: python-flask-sqlalchemy: Update to 2.4.3. * gnu/packages/python-web.scm (python-flask-sqlalchemy): Update to 2.4.3. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ff5b5b4ede..cd8ce8a83f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2371,13 +2371,13 @@ applications.") (define-public python-flask-sqlalchemy (package (name "python-flask-sqlalchemy") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (pypi-uri "Flask-SQLAlchemy" version)) (sha256 (base32 - "1ryb2y5gvpcglrmhk25hwzpi8a5q69m33gfqwxdcl67gjwdggnbc")))) + "19apnn2m9bl1d1h2nc52pnmiyx993mwzmfjrv04l3wn5hyznyr8b")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) -- cgit 1.4.1 From 9dbef2ce69dc5df906761ca90d8990b40f5eca42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 05:35:48 +0200 Subject: gnu: rust-version-check: Update to 0.9.2. * gnu/packages/crates-io.scm (rust-version-check-0.9): Update to 0.9.2. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9237a282b7..2c4c6d4bb6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Giacomo Leidi -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 John Soo ;;; Copyright © 2019, 2020 Hartmut Goebel ;;; Copyright © 2020 Jakub Kądziołka @@ -25681,15 +25681,14 @@ designed for reexporting.") (define-public rust-version-check-0.9 (package (name "rust-version-check") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (crate-uri "version_check" version)) (file-name (string-append name "-" version ".crate")) (sha256 - (base32 - "1kikqlnggii1rvnxrbls55sc46lxvinz5k3giscgncjj4p87b1q7")))) + (base32 "1vbaqdf802qinsq8q20w8w0qn2pv0rkq5p73ijcblrwxcvjp5adm")))) (build-system cargo-build-system) (home-page "https://github.com/SergioBenitez/version_check") (synopsis "Check that the installed rustc meets some version requirements") -- cgit 1.4.1 From b21d1735e855e7098cb8dc695054d0d64c2dba92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 05:48:44 +0200 Subject: gnu: font-comic-neue: Update to 2.5. * gnu/packages/fonts.scm (font-comic-neue): Update to 2.5. --- gnu/packages/fonts.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b77aaca059..14cf5b2dea 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1121,16 +1121,14 @@ later hand-tweaked with the gbdfed(1) editor: (define-public font-comic-neue (package (name "font-comic-neue") - ;; The ‘v2.3’ and ‘v2.4’ releases at https://github.com/crozynski/comicneue - ;; are equivalent. The home page hosts 2.3, not 2.4, so we use that here. - (version "2.3") + (version "2.5") (source (origin (method url-fetch/zipbomb) (uri (string-append "http://www.comicneue.com/comic-neue-" version ".zip")) (sha256 (base32 - "1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk")))) + "1ng0m0zs7qr91qy5ff0l01l27npr76961c6zfkxnhxf68zpwz5k4")))) (build-system font-build-system) (arguments `(#:phases -- cgit 1.4.1 From f6c454940a52c775693704e3e9768434a46273f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 06:19:25 +0200 Subject: gnu: babl: Update to 0.1.76. * gnu/packages/gimp.scm (babl): Update to 0.1.76. --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 2a0ca3ac25..b5bb29e010 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -51,7 +51,7 @@ (define-public babl (package (name "babl") - (version "0.1.74") + (version "0.1.76") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -65,7 +65,7 @@ "/babl-" version ".tar.xz"))) (sha256 (base32 - "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs")))) + "183kj2yq08vvldp8307vq61y2ravcqkyarrhak9w2l30gygp9100")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From ed67c4998cb9217dac0bf49df47d6f9c4c72e736 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 06:19:38 +0200 Subject: gnu: fluidsynth: Update to 2.1.3. * gnu/packages/audio.scm (fluidsynth): Update to 2.1.3. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 893c56514c..358eddb22e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1242,7 +1242,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.1.2") + (version "2.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -1251,7 +1251,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "0pf8hjn15isf772nz8qcqja700aay8nhdwmr24djkj42c7chf96j")))) + "0dv6jprz2bzasvk91x2rv2pqyyvxkc72s4r6vsqw723a3kqa5bhc")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From bd6eed4c36fb0e6fd12144b414db576da98e8641 Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Thu, 28 May 2020 23:38:50 +0000 Subject: gnu: oil: Update to 0.8.pre5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (oil): Update to 0.8.pre5. [arguments]: Perform ‘patch-compiler-invocation’ phase as part of 'configure. Remove ‘make-destination’ phase. Run a basic smoke test. [synopsis, description]: Update. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/shells.scm | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index fa3eccabd4..a82f1c8b26 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -793,47 +794,44 @@ Shell (pdksh).") (define-public oil (package (name "oil") - (version "0.7.0") - (source (origin - (method url-fetch) - (uri (string-append "https://www.oilshell.org/download/oil-" - version ".tar.xz")) - (sha256 - (base32 - "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3")))) + ;; https://www.oilshell.org/blog/2020/04/release-0.8.pre4.html#comment-on-version-numbering + (version "0.8.pre5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.oilshell.org/download/oil-" + version ".tar.gz")) + (sha256 + (base32 "02llxx10izxpv1y32qn8k6r0y7al01rzxjirc8h6x8nd9kiaqknl")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; the tests are not distributed in the tarballs - #:strip-binaries? #f ; the binaries cannot be stripped + `(#:strip-binaries? #f ; strip breaks the binary #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-compiler-invocation - (lambda _ - (substitute* "configure" - ((" cc ") " gcc ")) - #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (setenv "CC" "gcc") - ;; The configure script doesn't recognize CONFIG_SHELL. - (setenv "CONFIG_SHELL" (which "sh")) + (substitute* "configure" + ((" cc ") " $CC ")) (invoke "./configure" (string-append "--prefix=" out) "--with-readline")))) - (add-before 'install 'make-destination + (replace 'check + ;; The tests are not distributed in the tarballs but upstream + ;; recommends running this smoke test. + ;; https://github.com/oilshell/oil/blob/release/0.8.pre5/INSTALL.txt#L38-L48 (lambda _ - ;; The build scripts don't create the destination directory. - (mkdir-p (string-append (assoc-ref %outputs "out") "/bin"))))))) + (let* ((oil "_bin/oil.ovm")) + (invoke/quiet oil "osh" "-c" "echo hi") + (invoke/quiet oil "osh" "-n" "configure"))))))) (inputs `(("readline" ,readline))) - (synopsis "Bash-compatible Unix shell") - (description "Oil is a Unix / POSIX shell, compatible with Bash. It -implements the Oil language, which is a new shell language to which Bash can be -automatically translated. The Oil language is a superset of Bash. It also -implements the OSH language, a statically-parseable language based on Bash as it -is commonly written.") - (home-page "https://www.oilshell.org/") - (license (list psfl ; The Oil sources include a patched Python 2 source tree + (home-page "https://www.oilshell.org") + (synopsis "Programming language and Bash-compatible Unix shell") + (description "Oil is a programming language with automatic translation for +Bash. It includes osh, a Unix/POSIX shell that runs unmodified Bash +scripts.") + (license (list psfl ; tarball includes python2.7 asl2.0)))) (define-public oil-shell -- cgit 1.4.1 From 38ebe227b706c21d8f45df1b6e8aaf02b4f2f80e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 07:58:58 +0200 Subject: gnu: usbguard: Update to 0.7.8. * gnu/packages/hardware.scm (usbguard): Update to 0.7.8. --- gnu/packages/hardware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 7ca565e17f..7ebe8f48eb 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -387,7 +387,7 @@ applications.") (define-public usbguard (package (name "usbguard") - (version "0.7.6") + (version "0.7.8") (source (origin (method url-fetch) (uri (string-append @@ -395,7 +395,7 @@ applications.") version "/usbguard-" version ".tar.gz")) (file-name (git-file-name name version)) (sha256 - (base32 "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j")))) + (base32 "1il5immqfxh2cj8wn1bfk7l42inflzgjf07yqprpz7r3lalbxc25")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 73014984bbc4067b9ed9e8c72e89921004217693 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:01:15 +0200 Subject: gnu: piper: Update to 0.5. * gnu/packages/gnome.scm (piper): Update to 0.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0d63579d4a..360a4c03a3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10153,7 +10153,7 @@ your operating-system definition: (define-public piper (package (name "piper") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -10161,7 +10161,7 @@ your operating-system definition: (url "https://github.com/libratbag/piper.git") (commit version))) (sha256 - (base32 "17h06j8lxpbfygq8fzycl7lml4vv7r05bsyhh3gga2hp0zms4mvg")))) + (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From 81af0de99986ab28628822cbec59632edbf65570 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:02:21 +0200 Subject: gnu: piper: Include package name in source file name. * gnu/packages/gnome.scm (piper)[source]: Set FILE-NAME. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 360a4c03a3..9f7b3eeecb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10161,7 +10161,8 @@ your operating-system definition: (url "https://github.com/libratbag/piper.git") (commit version))) (sha256 - (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")))) + (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")) + (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From bb9f9e1d1b32c1de2c7c0431bd931d106da3c7a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:02:45 +0200 Subject: gnu: clp: Update to 1.17.6. * gnu/packages/maths.scm (clp): Update to 1.17.6. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8e35188d80..e1c8f8b559 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1612,14 +1612,14 @@ interfaces.") (define-public clp (package (name "clp") - (version "1.17.1") + (version "1.17.6") (source (origin (method url-fetch) (uri (string-append "https://www.coin-or.org/download/source/" "Clp/Clp-" version ".tgz")) (sha256 (base32 - "1wdg820g3iikf9344ijwsc8sy6c0m6im42bzzizm6rlmkvnmxhk9")) + "0ap1f0lxppa6pnbc4bg7ih7a96avwaki482nig8w5fr3vg9wvkzr")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. -- cgit 1.4.1 From 3059e12047a5074eb47da6ec69b08232fa737d9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:07:58 +0200 Subject: gnu: fldigi: Update to 4.1.13. * gnu/packages/radio.scm (fldigi): Update to 4.1.13. --- gnu/packages/radio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index f5dbbf7838..5d58602ab0 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Charlie Ritter +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -573,14 +574,14 @@ using GNU Radio and the Qt GUI toolkit.") (define-public fldigi (package (name "fldigi") - (version "4.1.12") + (version "4.1.13") (source (origin (method url-fetch) (uri (string-append "http://www.w1hkj.com/files/fldigi/fldigi-" version ".tar.gz")) (sha256 - (base32 "1yjjv2ss84xfiaidypp476mhrbpnw4zf7mb5cdqwhdh604x0svr1")))) + (base32 "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From c3beb7ced7ec632e7190c3e4e344e2f4164a75a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:20:34 +0200 Subject: gnu: ruby-fast-gettext: Update to 2.0.3. * gnu/packages/ruby.scm (ruby-fast-gettext): Update to 2.0.3. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c80bab47cc..5ffb4374b0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2495,7 +2495,7 @@ interface for Ruby programs.") (define-public ruby-fast-gettext (package (name "ruby-fast-gettext") - (version "2.0.2") + (version "2.0.3") (home-page "https://github.com/grosser/fast_gettext") (source (origin (method git-fetch) @@ -2504,7 +2504,7 @@ interface for Ruby programs.") (file-name (git-file-name name version)) (sha256 (base32 - "1rd48fp89k1sclgn2v26br2glwl3iv7z72mizzzmkdmqalqfn1sa")))) + "1dg14apq5sfjshhcq0idphhs7aq9ikzswhqmn689p1h76mxqr1v6")))) (build-system ruby-build-system) (arguments '(#:test-target "spec" -- cgit 1.4.1 From fd13ec5fecacdb65d0a76073c65e4f6f367a2b31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:23:29 +0200 Subject: gnu: ruby-hocon: Update to 1.3.1. * gnu/packages/ruby.scm (ruby-hocon): Update to 1.3.1. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5ffb4374b0..82911a6866 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3853,7 +3853,7 @@ and manipulate Git repositories by wrapping system calls to the git binary.") (define-public ruby-hocon (package (name "ruby-hocon") - (version "1.3.0") + (version "1.3.1") (home-page "https://github.com/puppetlabs/ruby-hocon") (source (origin (method git-fetch) @@ -3861,7 +3861,7 @@ and manipulate Git repositories by wrapping system calls to the git binary.") (file-name (git-file-name name version)) (sha256 (base32 - "1wz4cswjg3gs1y1bar7j4j88wjimfa9zhvy51jyi177i5dzax416")))) + "172hh2zr0n9nnszv0qvlgwszgkrq84yahrg053m68asy79zpmbqr")))) (build-system ruby-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 7c5c21fd467cb4554a39569087a118621fc42ec3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:31:36 +0200 Subject: gnu: openssh: Update to 8.3p1. * gnu/packages/ssh.scm (openssh): Update to 8.3p1. --- gnu/packages/ssh.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ec5c4d5a18..73841db6b5 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -133,7 +133,7 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "8.2p1") + (version "8.3p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" @@ -141,7 +141,7 @@ a server that supports the SSH-2 protocol.") (patches (search-patches "openssh-hurd.patch")) (sha256 (base32 - "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3")))) + "1cl74ghi9y21dc3f4xa0qamb7dhwacbynh1ks9syprrg8zhgpgpj")))) (build-system gnu-build-system) (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 7feefb3b82186be382725ac2d6b7e9f8953e4a83 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:14 +0200 Subject: bootloader: Add 'disk-image-installer'. * gnu/bootloader.scm ()[disk-image-installer]: New field, (bootloader-disk-image-installer): export it. * gnu/bootloader/grub.scm (install-grub-disk-image): New procedure ... (grub-bootloader): ... used as "disk-image-installer" here. (grub-efi-bootloader): set "disk-image-installer" to #f. * gnu/system/image.scm (root-partition?, find-root-partition): Move to "Helpers" section. (root-partition-index): New procedure. (system-disk-image): Honor disk-image-installer, and use it to install the bootloader directly on the disk-image, if supported. --- gnu/bootloader.scm | 5 ++++- gnu/bootloader/grub.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++- gnu/system/image.scm | 32 ++++++++++++++++++++++---------- 3 files changed, 70 insertions(+), 12 deletions(-) diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 01bdd4acaa..668caa7fc3 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 David Craven -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2019 Ludovic Courtès ;;; @@ -42,6 +42,7 @@ bootloader-name bootloader-package bootloader-installer + bootloader-disk-image-installer bootloader-configuration-file bootloader-configuration-file-generator @@ -125,6 +126,8 @@ record." (name bootloader-name) (package bootloader-package) (installer bootloader-installer) + (disk-image-installer bootloader-disk-image-installer + (default #f)) (configuration-file bootloader-configuration-file) (configuration-file-generator bootloader-configuration-file-generator)) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index bb40c551a7..57deaba912 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer ;;; @@ -436,6 +436,47 @@ fi~%")))) "--boot-directory" install-dir device)))) +(define install-grub-disk-image + #~(lambda (bootloader root-index image) + ;; Install GRUB on the given IMAGE. The root partition index is + ;; ROOT-INDEX. + (let ((grub-mkimage + (string-append bootloader "/bin/grub-mkimage")) + (modules '("biosdisk" "part_msdos" "fat" "ext2")) + (grub-bios-setup + (string-append bootloader "/sbin/grub-bios-setup")) + (root-device (format #f "hd0,msdos~a" root-index)) + (boot-img (string-append bootloader "/lib/grub/i386-pc/boot.img")) + (device-map "device.map")) + + ;; Create a minimal, standalone GRUB image that will be written + ;; directly in the MBR-GAP (space between the end of the MBR and the + ;; first partition). + (apply invoke grub-mkimage + "-O" "i386-pc" + "-o" "core.img" + "-p" (format #f "(~a)/boot/grub" root-device) + modules) + + ;; Create a device mapping file. + (call-with-output-file device-map + (lambda (port) + (format port "(hd0) ~a~%" image))) + + ;; Copy the default boot.img, that will be written on the MBR sector + ;; by GRUB-BIOS-SETUP. + (copy-file boot-img "boot.img") + + ;; Install both the "boot.img" and the "core.img" files on the given + ;; IMAGE. On boot, the MBR sector will execute the minimal GRUB + ;; written in the MBR-GAP. GRUB configuration and missing modules will + ;; be read from ROOT-DEVICE. + (invoke grub-bios-setup + "-m" device-map + "-r" root-device + "-d" "." + image)))) + (define install-grub-efi #~(lambda (bootloader efi-dir mount-point) ;; Install GRUB onto the EFI partition mounted at EFI-DIR, for the @@ -465,6 +506,7 @@ fi~%")))) (name 'grub) (package grub) (installer install-grub) + (disk-image-installer install-grub-disk-image) (configuration-file "/boot/grub/grub.cfg") (configuration-file-generator grub-configuration-file))) @@ -480,6 +522,7 @@ fi~%")))) (bootloader (inherit grub-bootloader) (installer install-grub-efi) + (disk-image-installer #f) (name 'grub-efi) (package grub-efi))) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index a1214dd20a..92b3f4424e 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -147,6 +147,18 @@ (guix build utils)) gexp* ...)))) +(define (root-partition? partition) + "Return true if PARTITION is the root partition, false otherwise." + (member 'boot (partition-flags partition))) + +(define (find-root-partition image) + "Return the root partition of the given IMAGE." + (srfi-1:find root-partition? (image-partitions image))) + +(define (root-partition-index image) + "Return the index of the root partition of the given IMAGE." + (1+ (srfi-1:list-index root-partition? (image-partitions image)))) + ;; ;; Disk image. @@ -276,9 +288,17 @@ image ~a { (let* ((substitutable? (image-substitutable? image)) (builder (with-imported-modules* - (let ((inputs '#+(list genimage coreutils findutils))) + (let ((inputs '#+(list genimage coreutils findutils)) + (bootloader-installer + #+(bootloader-disk-image-installer bootloader))) (set-path-environment-variable "PATH" '("bin" "sbin") inputs) - (genimage #$(image->genimage-cfg image) #$output)))) + (genimage #$(image->genimage-cfg image) #$output) + ;; Install the bootloader directly on the disk-image. + (when bootloader-installer + (bootloader-installer + #+(bootloader-package bootloader) + #$(root-partition-index image) + (string-append #$output "/" #$genimage-name)))))) (image-dir (computed-file "image-dir" builder))) (computed-file name #~(symlink @@ -371,14 +391,6 @@ used in the image. " ;; Image creation. ;; -(define (root-partition? partition) - "Return true if PARTITION is the root partition, false otherwise." - (member 'boot (partition-flags partition))) - -(define (find-root-partition image) - "Return the root partition of the given IMAGE." - (srfi-1:find root-partition? (image-partitions image))) - (define (image->root-file-system image) "Return the IMAGE root partition file-system type." (let ((format (image-format image))) -- cgit 1.4.1 From 7e6a42f215726b6ea5b1a2a8b8bc80481f7ebcd9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:38 +0200 Subject: bootloader: grub: Do not run grub-install when creating a disk-image. * gnu/bootloader/grub.scm (install-grub): When creating a disk-image, grub-install will fail because it lacks root permissions. In that case, do not run grub-install and only copy Grub modules to the /boot directory. --- gnu/bootloader/grub.scm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 57deaba912..23c7a82084 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -423,18 +423,24 @@ fi~%")))) (define install-grub #~(lambda (bootloader device mount-point) - ;; Install GRUB on DEVICE which is mounted at MOUNT-POINT. (let ((grub (string-append bootloader "/sbin/grub-install")) (install-dir (string-append mount-point "/boot"))) - ;; Tell 'grub-install' that there might be a LUKS-encrypted /boot or - ;; root partition. - (setenv "GRUB_ENABLE_CRYPTODISK" "y") - - ;; Hide potentially confusing messages from the user, such as - ;; "Installing for i386-pc platform." - (invoke/quiet grub "--no-floppy" "--target=i386-pc" - "--boot-directory" install-dir - device)))) + ;; Install GRUB on DEVICE which is mounted at MOUNT-POINT. If DEVICE + ;; is #f, then we populate the disk-image rooted at MOUNT-POINT. + (if device + (begin + ;; Tell 'grub-install' that there might be a LUKS-encrypted + ;; /boot or root partition. + (setenv "GRUB_ENABLE_CRYPTODISK" "y") + + ;; Hide potentially confusing messages from the user, such as + ;; "Installing for i386-pc platform." + (invoke/quiet grub "--no-floppy" "--target=i386-pc" + "--boot-directory" install-dir + device)) + ;; When creating a disk-image, only install GRUB modules. + (copy-recursively (string-append bootloader "/lib/") + install-dir))))) (define install-grub-disk-image #~(lambda (bootloader root-index image) -- cgit 1.4.1 From 7202895e5afa9922ba06eaba295645b08d6fd254 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:46 +0200 Subject: bootloader: grub: Use inheritance to define grub-minimal-bootloader. * gnu/bootloader/grub.scm (grub-minimal-bootloader): Inherit from grub-bootloader to avoid field redefinition. --- gnu/bootloader/grub.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 23c7a82084..40918ea307 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -516,13 +516,10 @@ fi~%")))) (configuration-file "/boot/grub/grub.cfg") (configuration-file-generator grub-configuration-file))) -(define grub-minimal-bootloader +(define* grub-minimal-bootloader (bootloader - (name 'grub) - (package grub-minimal) - (installer install-grub) - (configuration-file "/boot/grub/grub.cfg") - (configuration-file-generator grub-configuration-file))) + (inherit grub-bootloader) + (package grub-minimal))) (define* grub-efi-bootloader (bootloader -- cgit 1.4.1 From 9c1adb240016261d6263e8d7d0308040542f3c60 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:53 +0200 Subject: image: Add bootloader installation support. * gnu/build/image.scm (initialize-root-partition): Add bootloader-package and bootloader-installer arguments. Run the bootloader-installer if defined. * gnu/system/image.scm (system-disk-image): Adapt the partition initializer call accordingly. --- gnu/build/image.scm | 5 +++++ gnu/system/image.scm | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index b37ea9332a..49faeab466 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -155,6 +155,8 @@ deduplicates files common to CLOSURE and the rest of PREFIX." #:key bootcfg bootcfg-location + bootloader-package + bootloader-installer (deduplicate? #t) references-graphs (register-closures? #t) @@ -178,6 +180,9 @@ of the directory of the 'system' derivation." #:deduplicate? deduplicate?)) references-graphs)) + (when bootloader-installer + (display "installing bootloader...\n") + (bootloader-installer bootloader-package #f root)) (when bootcfg (install-boot-config bootcfg bootcfg-location root))) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 92b3f4424e..ece2d02f51 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -235,7 +235,9 @@ used in the image." #:deduplicate? #f #:system-directory #$os #:bootloader-package - #$(bootloader-package bootloader) + #+(bootloader-package bootloader) + #:bootloader-installer + #+(bootloader-installer bootloader) #:bootcfg #$bootcfg #:bootcfg-location #$(bootloader-configuration-file bootloader))))) -- cgit 1.4.1 From 7d4ecda63caa9f566620844dbc800a8158f861a6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:09:58 +0200 Subject: system: image: Correct genimage configuration file indentation. * gnu/system/image.scm (system-disk-image): Fix genimage configuration file indentation. --- gnu/system/image.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index ece2d02f51..67cf5fdddc 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -261,10 +261,10 @@ used in the image." (image (partition-image partition)) (offset (partition-offset partition))) #~(format #f "~/partition ~a { - ~/~/partition-type = ~a - ~/~/image = \"~a\" - ~/~/offset = \"~a\" - ~/}" +~/~/partition-type = ~a +~/~/image = \"~a\" +~/~/offset = \"~a\" +~/}" #$label #$dos-type #$image -- cgit 1.4.1 From 05f37c16a3b159e58ce7343383b44073bd6cac9f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:10:04 +0200 Subject: image: Use grub-efi to install the EFI bootloader. * gnu/build/image.scm (initialize-efi-partition): Rename bootloader-package argument to grub-efi. * gnu/system/image.scm (system-disk-image): Adapt accordingly to pass grub-efi package. --- gnu/build/image.scm | 4 ++-- gnu/system/image.scm | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 49faeab466..a8594e202b 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -146,10 +146,10 @@ deduplicates files common to CLOSURE and the rest of PREFIX." (define* (initialize-efi-partition root #:key - bootloader-package + grub-efi #:allow-other-keys) "Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE." - (install-efi-loader bootloader-package root)) + (install-efi-loader grub-efi root)) (define* (initialize-root-partition root #:key diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 67cf5fdddc..93b95b307b 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -234,6 +234,7 @@ used in the image." #:references-graphs '#$graph #:deduplicate? #f #:system-directory #$os + #:grub-efi #+grub-efi #:bootloader-package #+(bootloader-package bootloader) #:bootloader-installer -- cgit 1.4.1 From 749381051d9b43fd4944b44e734c6fd9fced9030 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:10:07 +0200 Subject: system: image: Fix image-with-os. * gnu/system/image.scm (image-with-os): Do not reorder partitions, as we want them to be created according to definition order. --- gnu/system/image.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 93b95b307b..53f68c097d 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -420,18 +420,18 @@ to OS. Also set the UUID and the size of the root partition." (string=? (file-system-mount-point fs) "/")) (operating-system-file-systems os))) - (let*-values (((partitions) (image-partitions base-image)) - ((root-partition other-partitions) - (srfi-1:partition root-partition? partitions))) - (image - (inherit base-image) - (operating-system os) - (partitions - (cons (partition - (inherit (car root-partition)) - (uuid (file-system-device root-file-system)) - (size (root-size base-image))) - other-partitions))))) + (image + (inherit base-image) + (operating-system os) + (partitions + (map (lambda (p) + (if (root-partition? p) + (partition + (inherit p) + (uuid (file-system-device root-file-system)) + (size (root-size base-image))) + p)) + (image-partitions base-image))))) (define (operating-system-for-image image) "Return an operating-system based on the one specified in IMAGE, but -- cgit 1.4.1 From b7b45372e713a53ffa852aec1d3bfb743bb79124 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 29 May 2020 09:05:53 +0200 Subject: image: Add a post-MBR gap to the default image. The generic 'efi-disk-image' needs to be bootable on systems without EFI. To do that, GRUB is installed in the post-MBR gap. Make sure that the first partition starts with an offset, to make this gap large enough for GRUB. * gnu/system/image.scm (root-offset, root-label): New variables, (esp-partition): use 'root-offset' as the partition offset, (root-partition): use 'root-label' as the partition label. --- gnu/system/image.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 53f68c097d..02c026b88c 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -65,9 +65,17 @@ ;;; Images definitions. ;;; +;; This is the offset before the first partition. GRUB will install itself in +;; this post-MBR gap. +(define root-offset (* 512 2048)) + +;; Generic root partition label. +(define root-label "Guix_image") + (define esp-partition (partition (size (* 40 (expt 2 20))) + (offset root-offset) (label "GNU-ESP") ;cosmetic only ;; Use "vfat" here since this property is used when mounting. The actual ;; FAT-ness is based on file system size (16 in this case). @@ -78,7 +86,7 @@ (define root-partition (partition (size 'guess) - (label "Guix_image") + (label root-label) (file-system "ext4") (flags '(boot)) (initializer (gexp initialize-root-partition)))) -- cgit 1.4.1 From e3f0155c41b28510f77e113ca2d37f0e7d90a2ca Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 23 May 2020 19:10:28 +0200 Subject: image: Do not use VM to create disk-images. Now that installing Grub on raw disk-images is supported, we do not need to rely on (gnu system vm) module. * gnu/system/image.scm (make-system-image): Rename to ... (system-image): ... this, and remove the compatibility wrapper. (find-image): Turn to a monadic procedure. This will become useful when introducing Hurd support, to be able to detect the target system. * gnu/ci.scm (qemu-jobs): Use lower-object now that system-image returns a file-like object. * gnu/tests/install.scm (run-install): Ditto. * guix/scripts/system.scm (system-derivation-for-action): Add a 'base-image' argument, (perform-action): adapt accordingly. --- gnu/ci.scm | 20 +++++++++++--------- gnu/system/image.scm | 40 ++++++---------------------------------- gnu/tests/install.scm | 8 ++++---- guix/scripts/system.scm | 16 +++++++++------- 4 files changed, 30 insertions(+), 54 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index b61181be51..fa67168e22 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -219,19 +219,21 @@ system.") (run-with-store store (mbegin %store-monad (set-guile-for-build (default-guile)) - (system-image - (image - (inherit efi-disk-image) - (size (* 1500 MiB)) - (operating-system installation-os)))))) + (lower-object + (system-image + (image + (inherit efi-disk-image) + (size (* 1500 MiB)) + (operating-system installation-os))))))) (->job 'iso9660-image (run-with-store store (mbegin %store-monad (set-guile-for-build (default-guile)) - (system-image - (image - (inherit iso9660-image) - (operating-system installation-os))))))) + (lower-object + (system-image + (image + (inherit iso9660-image) + (operating-system installation-os)))))))) '())) (define channel-build-system diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 02c026b88c..f44886c137 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -492,7 +492,7 @@ it can be used for bootloading." (type root-file-system-type)) file-systems-to-keep))))) -(define* (make-system-image image) +(define* (system-image image) "Return the derivation of IMAGE. It can be a raw disk-image or an ISO9660 image, depending on IMAGE format." (define substitutable? (image-substitutable? image)) @@ -525,38 +525,10 @@ image, depending on IMAGE format." "Find and return an image that could match the given FILE-SYSTEM-TYPE. This is useful to adapt to interfaces written before the addition of the record." - ;; XXX: Add support for system and target here, or in the caller. - (match file-system-type - ("iso9660" iso9660-image) - (_ efi-disk-image))) - -(define (system-image image) - "Wrap 'make-system-image' call, so that it is used only if the given IMAGE -is supported. Otherwise, fallback to image creation in a VM. This is -temporary and should be removed once 'make-system-image' is able to deal with -all types of images." - (define substitutable? (image-substitutable? image)) - (define volatile-root? (image-volatile-root? image)) - - (let* ((image-os (image-operating-system image)) - (image-root-filesystem-type (image->root-file-system image)) - (bootloader (bootloader-configuration-bootloader - (operating-system-bootloader image-os))) - (bootloader-name (bootloader-name bootloader)) - (size (image-size image)) - (format (image-format image))) - (mbegin %store-monad - (if (and (or (eq? bootloader-name 'grub) - (eq? bootloader-name 'extlinux)) - (eq? format 'disk-image)) - ;; Fallback to image creation in a VM when it is not yet supported - ;; by this module. - (system-disk-image-in-vm image-os - #:disk-image-size size - #:file-system-type image-root-filesystem-type - #:volatile? volatile-root? - #:substitutable? substitutable?) - (lower-object - (make-system-image image)))))) + (mbegin %store-monad + (return + (match file-system-type + ("iso9660" iso9660-image) + (_ efi-disk-image))))) ;;; image.scm ends here diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index cea26c8ef3..6bd8c7d3d2 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -228,18 +228,18 @@ packages defined in installation-os." (mlet* %store-monad ((_ (set-grafting #f)) (system (current-system)) (target (operating-system-derivation target-os)) + (base-image (find-image + installation-disk-image-file-system-type)) ;; Since the installation system has no network access, ;; we cheat a little bit by adding TARGET to its GC ;; roots. This way, we know 'guix system init' will ;; succeed. Also add guile-final, which is pulled in ;; through provenance.drv and may not always be present. - (image + (image -> (system-image (image - (inherit - (find-image - installation-disk-image-file-system-type)) + (inherit base-image) (size install-size) (operating-system (operating-system-with-gc-roots diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 3efd113ac8..3d7aa77cb7 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -670,7 +670,7 @@ checking this by themselves in their 'check' procedure." ;;; Action. ;;; -(define* (system-derivation-for-action os action +(define* (system-derivation-for-action os base-image action #:key image-size file-system-type full-boot? container-shared-network? mappings) @@ -694,11 +694,12 @@ checking this by themselves in their 'check' procedure." (* 70 (expt 2 20))) #:mappings mappings)) ((disk-image) - (system-image - (image - (inherit (find-image file-system-type)) - (size image-size) - (operating-system os)))) + (lower-object + (system-image + (image + (inherit base-image) + (size image-size) + (operating-system os))))) ((docker-image) (system-docker-image os #:shared-network? container-shared-network?)))) @@ -800,7 +801,8 @@ static checks." (check-initrd-modules os))) (mlet* %store-monad - ((sys (system-derivation-for-action os action + ((image (find-image file-system-type)) + (sys (system-derivation-for-action os image action #:file-system-type file-system-type #:image-size image-size #:full-boot? full-boot? -- cgit 1.4.1 From 72d1562a4da8909b1990687d6f33b543bd215541 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 29 May 2020 12:20:15 +0200 Subject: build: image: Fix initialize-efi-partition docstring. * gnu/build/image.scm (initialize-efi-partition): Turn BOOTLOADER-PACKAGE into GRUB-EFI. --- gnu/build/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index a8594e202b..14503b02ba 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -148,7 +148,7 @@ deduplicates files common to CLOSURE and the rest of PREFIX." #:key grub-efi #:allow-other-keys) - "Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE." + "Install in ROOT directory, an EFI loader using GRUB-EFI." (install-efi-loader grub-efi root)) (define* (initialize-root-partition root -- cgit 1.4.1 From ebfe0e65842d64d9cbc4987530aa361fec70a7f1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 27 May 2020 12:01:34 +0200 Subject: gnu: autorandr: Update to 1.10.1. * gnu/packages/xdisorg.scm (autorandr): Update to 1.10.1. --- gnu/packages/xdisorg.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5e4e275073..1325fbc821 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -162,7 +162,7 @@ program.") (define-public autorandr (package (name "autorandr") - (version "1.9") + (version "1.10.1") (home-page "https://github.com/phillipberndt/autorandr") (source (origin @@ -172,8 +172,10 @@ program.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n")))) + (base32 "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg")))) (build-system python-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("xrandr" ,xrandr) ("libxcb" ,libxcb))) @@ -188,7 +190,11 @@ program.") (("/usr") (assoc-ref outputs "out"))) (substitute* "autorandr.py" (("popen\\(\"xrandr") (string-append "popen(\"" xrandr)) - (("\\[\"xrandr") (string-append "[\"" xrandr)))) + (("\\[\"xrandr") (string-append "[\"" xrandr))) + (substitute* "contrib/autorandr_launcher/autorandr_launcher.c" + (("/usr/bin/autorandr") + (string-append (assoc-ref outputs "out") "/bin/autorandr"))) + (setenv "CC" "gcc")) #t)) (add-after 'install 'install-contrib (lambda* (#:key outputs #:allow-other-keys) @@ -196,10 +202,8 @@ program.") (string-append "DESTDIR=" (assoc-ref outputs "out")) "PREFIX=" "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" - "install_manpage" - "install_bash_completion" - "install_launcher" - "install_autostart_config")))))) + "install" + "TARGETS=autorandr launcher manpage bash_completion")))))) (synopsis "Auto-detect connected displays and load appropriate setup") (description "Autorandr wraps around xrandr to help with X11 multi-screen configuration management. It allows the user to create profiles -- cgit 1.4.1 From 93fc9b6abf6123c665288b180a8da6e9fac61602 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 14:18:14 +0200 Subject: gnu: love: Remove unused input. * gnu/packages/game-development.scm (love)[inputs]: Remove PHYSFS. --- gnu/packages/game-development.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 185f1bebf3..f16b84d5ae 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -680,7 +680,6 @@ archive on a per-file basis.") ("mesa" ,mesa) ("mpg123" ,mpg123) ("openal" ,openal) - ("physfs" ,physfs) ("sdl2" ,sdl2) ("zlib" ,zlib))) (synopsis "2D game framework for Lua") -- cgit 1.4.1 From a904223ec55a61e6597c88da01426d9ff8a40537 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 May 2020 14:18:52 +0200 Subject: gnu: physfs: Do not build the static library. * gnu/packages/game-development.scm (physfs)[arguments]: Add #:configure-flags. --- gnu/packages/game-development.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f16b84d5ae..fae5d591aa 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -631,6 +631,7 @@ garbage collection and can be extended with plugins.") (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target + #:configure-flags '("-DPHYSFS_BUILD_STATIC=OFF") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-CMakeLists.txt (lambda _ -- cgit 1.4.1 From 7c8eb479a4be745deddce3cc651aeba0ba99050f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 13:11:12 +0200 Subject: gnu: ruby-spec-its: Accept any version of ruby-ffi. * gnu/packages/ruby.scm (ruby-rspec-its)[arguments]: Change Gemfile substitution so that any ffi gem is accepted. While at it, tighten the regex and rename the phase to be more accurate. --- gnu/packages/ruby.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 82911a6866..bc48bc1576 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -645,10 +645,12 @@ outcomes of a code example.") (("rspec rspec-core rspec-expectations rspec-mocks rspec-support") "")) #t)) - (add-before 'build 'update-ffi-in-gemfile + (add-before 'build 'loosen-ffi-requirement (lambda _ + ;; Accept any version of ruby-ffi. (substitute* "Gemfile" - ((" gem 'ffi', '~> 1.9.25'") " gem 'ffi', '~> 1.10.0'")) + ((" gem 'ffi', '~> 1\\.9\\.25'") + " gem 'ffi'")) #t)) (add-before 'build 'remove-unnecessary-dependency-versions-from-gemfile (lambda _ -- cgit 1.4.1 From 77209ddd51f010b92ff18a865da10e8def7cde5e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 14:03:07 +0200 Subject: gnu: ruby-ffi: Update to 1.12.2. * gnu/packages/libffi.scm (ruby-ffi): Update to 1.12.2. --- gnu/packages/libffi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index b0098389c0..329eabd634 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -182,13 +182,13 @@ project.") (define-public ruby-ffi (package (name "ruby-ffi") - (version "1.10.0") + (version "1.12.2") (source (origin (method url-fetch) (uri (rubygems-uri "ffi" version)) (sha256 (base32 - "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p")))) + "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4")))) (build-system ruby-build-system) ;; FIXME: Before running tests the build system attempts to build libffi ;; from sources. -- cgit 1.4.1 From 7ac6bd0091188115af1a6c65e0f1718d70662aaa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 17:52:39 +0200 Subject: gnu: ruby-rake-compiler: Update to 1.1.0. * gnu/packages/ruby.scm (ruby-rake-compiler): Update to 1.1.0. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index bc48bc1576..8581d3e8e2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -381,13 +381,13 @@ announcement.") (define-public ruby-rake-compiler (package (name "ruby-rake-compiler") - (version "1.0.4") + (version "1.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "rake-compiler" version)) (sha256 (base32 - "1xpdi4w8zaklk1i9ps8g3k0icw3v5fcks092l84w28rgrpx82qip")))) + "0l4hg21v0phfrfsc2hilgmwvn2imxr0byqh8dv16bya1s5d3km0q")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; needs cucumber -- cgit 1.4.1 From f0f5f2d3c7d55f27516da1f0b18677a3f487cb9a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 17:53:44 +0200 Subject: gnu: ruby-rubygems-tasks: Update to 0.2.5. * gnu/packages/ruby.scm (ruby-rubygems-tasks): Update to 0.2.5. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8581d3e8e2..6e6add928d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2265,13 +2265,13 @@ two hashes.") (define-public ruby-rubygems-tasks (package (name "ruby-rubygems-tasks") - (version "0.2.4") + (version "0.2.5") (source (origin (method url-fetch) (uri (rubygems-uri "rubygems-tasks" version)) (sha256 (base32 - "16cp45qlbcglnqdm4f1vj3diywdz4v024saqpgrz6palf0wmgz2j")))) + "1x3sz3n2dlknd3v7w1mrq6f0ag6pwzhjvg7z29p75w3p42ma1gbx")))) (build-system ruby-build-system) ;; Tests need Internet access. (arguments `(#:tests? #f)) -- cgit 1.4.1 From 075afce25eb1de1710bd3f93bd42b49343af4222 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 18:51:32 +0200 Subject: gnu: ruby-libffi: Enable tests and unbundle LibFFI. * gnu/packages/libffi.scm (ruby-ffi)[source]: Change to GIT-FETCH. [arguments]: Remove #:tests?. Add #:phases. --- gnu/packages/libffi.scm | 58 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 329eabd634..da0c9dcf47 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Ben Woodcroft -;;; Copyright © 2017, 2019 Marius Bakke +;;; Copyright © 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; @@ -28,6 +28,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (gnu packages check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -184,15 +185,58 @@ project.") (name "ruby-ffi") (version "1.12.2") (source (origin - (method url-fetch) - (uri (rubygems-uri "ffi" version)) + ;; Pull from git because the RubyGems release bundles LibFFI, + ;; and comes with a gemspec that makes it difficult to unbundle. + (method git-fetch) + (uri (git-reference + (url "https://github.com/ffi/ffi") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4")))) + "1cvqsbjr2gfjgqggq9kdx90qhhzr7qkyr9wmxdsfsik6cnxnnpmd")))) (build-system ruby-build-system) - ;; FIXME: Before running tests the build system attempts to build libffi - ;; from sources. - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-depend-on-ccache + (lambda _ + (substitute* "spec/ffi/fixtures/GNUmakefile" + (("^CCACHE := .*") + "")) + #t)) + (replace 'replace-git-ls-files + (lambda _ + ;; Do not try to execute git, or include the (un)bundled LibFFI. + (substitute* "ffi.gemspec" + (("git ls-files -z") + "find * -type f -print0 | sort -z") + (("lfs \\+?= .*") + "lfs = []\n")) + (substitute* "Rakefile" + (("LIBFFI_GIT_FILES = .*") + "LIBFFI_GIT_FILES = []\n")) + #t)) + (replace 'build + (lambda _ + ;; Tests depend on the native extensions, so we build it + ;; beforehand without going through the gem machinery. + (invoke "rake" "compile") + + ;; XXX: Ideally we'd use "rake native gem" here to prevent the + ;; install phase from needlessly rebuilding everything, but that + ;; requires the bundled LibFFI, and the install phase can not + ;; deal with such gems anyway. + (invoke "gem" "build" "ffi.gemspec"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "MAKE" "make") + (setenv "CC" "gcc") + (invoke "rspec" "spec")) + (format #t "test suite not run~%")) + #t))))) (native-inputs `(("ruby-rake-compiler" ,ruby-rake-compiler) ("ruby-rspec" ,ruby-rspec) -- cgit 1.4.1 From a84a185abda610e6ebfb5601385bfdc09cd42c55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 14:08:55 +0200 Subject: gnu: ruby-crass: Update to 1.0.6. * gnu/packages/ruby.scm (ruby-crass): Update to 1.0.6. [source]: Switch to GIT-FETCH. [native-inputs]: Remove. --- gnu/packages/ruby.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 6e6add928d..fdba903cbb 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5269,21 +5269,22 @@ multibyte strings, internationalization, time zones, and testing.") (define-public ruby-crass (package (name "ruby-crass") - (version "1.0.4") + (version "1.0.6") + (home-page "https://github.com/rgrove/crass") (source (origin - (method url-fetch) - (uri (rubygems-uri "crass" version)) + ;; The gem does not contain tests, so pull from git. + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi")))) + "1gbsb81psgb6xhnwpx4s409jc0mk0gijh039sy5xyi8jpaaadp40")))) (build-system ruby-build-system) - (native-inputs - `(("bundler" ,bundler) - ("ruby-minitest" ,ruby-minitest))) (synopsis "Pure Ruby CSS parser") (description "Crass is a pure Ruby CSS parser based on the CSS Syntax Level 3 spec.") - (home-page "https://github.com/rgrove/crass/") (license license:expat))) (define-public ruby-nokogumbo -- cgit 1.4.1 From 62cc7344ffe90226a67e3fc4aaede7845e47b45a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 14:09:57 +0200 Subject: gnu: ruby-nokogiri: Update to 1.10.9. * gnu/packages/ruby.scm (ruby-nokogiri): Update to 1.10.9. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index fdba903cbb..87c1e999de 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4123,13 +4123,13 @@ to reproduce user environments.") (define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.10.5") + (version "1.10.9") (source (origin (method url-fetch) (uri (rubygems-uri "nokogiri" version)) (sha256 (base32 - "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7")))) + "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm")))) (build-system ruby-build-system) (arguments ;; Tests fail because Nokogiri can only test with an installed extension, -- cgit 1.4.1 From 2e366b0a8337b7b5f01a88edf209dc92c2530238 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 14:19:23 +0200 Subject: gnu: ruby-nokogumbo: Update to 2.0.2. * gnu/packages/ruby.scm (ruby-nokogumbo): Update to 2.0.2. [arguments]: Remove. [native-inputs]: Add RUBY-RAKE-COMPILER. --- gnu/packages/ruby.scm | 87 +++++++++++++++------------------------------------ 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 87c1e999de..396d4a021f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5288,68 +5288,33 @@ multibyte strings, internationalization, time zones, and testing.") (license license:expat))) (define-public ruby-nokogumbo - (let ((commit "fb51ff299a1c34346837580b6d1d9a60fadf5dbd")) - (package - (name "ruby-nokogumbo") - (version (string-append "1.4.7-1." (string-take commit 8))) - (source (origin - ;; We use the git reference, because there's no Rakefile in the - ;; published gem and the tarball on Github is outdated. - (method git-fetch) - (uri (git-reference - (url "https://github.com/rubys/nokogumbo.git") - (commit "d56f954d20a"))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0bnppjy96xiadrsrc9dp8y6wvdwnkfa930n7acrp0mqm4qywl2wl")))) - (build-system ruby-build-system) - (arguments - `(#:modules ((guix build ruby-build-system) - (guix build utils) - (ice-9 rdelim)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-gemspec - (lambda _ - (substitute* "Rakefile" - ;; Build Makefile even without a copy of gumbo-parser sources - (("'gumbo-parser/src',") "") - ;; We don't bundle gumbo-parser sources - (("'gumbo-parser/src/\\*',") "") - (("'gumbo-parser/visualc/include/\\*',") "") - ;; The definition of SOURCES will be cut in gemspec, and - ;; "FileList" will be undefined. - (("SOURCES \\+ FileList\\[") - "['ext/nokogumboc/extconf.rb', 'ext/nokogumboc/nokogumbo.c', ")) - - ;; Copy the Rakefile and cut out the gemspec. - (copy-file "Rakefile" ".gemspec") - (with-atomic-file-replacement ".gemspec" - (lambda (in out) - (let loop ((line (read-line in 'concat)) - (skipping? #t)) - (if (eof-object? line) - #t - (let ((skip-next? (if skipping? - (not (string-prefix? "SPEC =" line)) - (string-prefix? "end" line)))) - (when (or (not skipping?) - (and skipping? (not skip-next?))) - (format #t "~a" line) - (display line out)) - (loop (read-line in 'concat) skip-next?)))))) - #t))))) - (inputs - `(("gumbo-parser" ,gumbo-parser))) - (propagated-inputs - `(("ruby-nokogiri" ,ruby-nokogiri))) - (synopsis "Ruby bindings to the Gumbo HTML5 parser") - (description - "Nokogumbo allows a Ruby program to invoke the Gumbo HTML5 parser and + (package + (name "ruby-nokogumbo") + (version "2.0.2") + (source (origin + ;; We use the git reference, because there's no Rakefile in the + ;; published gem and the tarball on Github is outdated. + (method git-fetch) + (uri (git-reference + (url "https://github.com/rubys/nokogumbo.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1qg0iyw450lw6d0j1ghzg79a6l60nm1m4qmrzwzybi585861jxcx")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-rake-compiler" ,ruby-rake-compiler))) + (inputs + `(("gumbo-parser" ,gumbo-parser))) + (propagated-inputs + `(("ruby-nokogiri" ,ruby-nokogiri))) + (synopsis "Ruby bindings to the Gumbo HTML5 parser") + (description + "Nokogumbo allows a Ruby program to invoke the Gumbo HTML5 parser and access the result as a Nokogiri parsed document.") - (home-page "https://github.com/rubys/nokogumbo/") - (license license:asl2.0)))) + (home-page "https://github.com/rubys/nokogumbo/") + (license license:asl2.0))) (define-public ruby-sanitize (package -- cgit 1.4.1 From f362b53c40b166b6e1fae1c38b00023d88e0cedd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 14:31:29 +0200 Subject: gnu: ruby-sanitize: Update to 5.1.0. * gnu/packages/patches/ruby-sanitize-system-libxml.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ruby.scm (ruby-sanitize): Update to 5.1.0. [source]: Change to GIT-FETCH. Add patch. [native-inputs]: Remove BUNDLER, RUBY-REDCARPET, and RUBY-YARD. --- gnu/local.mk | 3 +- .../patches/ruby-sanitize-system-libxml.patch | 38 ++++++++++++++++++++++ gnu/packages/ruby.scm | 23 +++++++------ 3 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/ruby-sanitize-system-libxml.patch diff --git a/gnu/local.mk b/gnu/local.mk index de51c21014..663e687bd6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1464,7 +1464,8 @@ dist_patch_DATA = \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/retroarch-disable-online-updater.patch \ - %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ + %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ + %D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/runc-CVE-2019-5736.patch \ %D%/packages/patches/rust-1.19-mrustc.patch \ diff --git a/gnu/packages/patches/ruby-sanitize-system-libxml.patch b/gnu/packages/patches/ruby-sanitize-system-libxml.patch new file mode 100644 index 0000000000..d19eb07294 --- /dev/null +++ b/gnu/packages/patches/ruby-sanitize-system-libxml.patch @@ -0,0 +1,38 @@ +Fix test failures that occur when nokogiri is using system libxml: + + https://github.com/rgrove/sanitize/issues/198 + +Taken from upstream: +https://github.com/rgrove/sanitize/commit/21da9b62baf9ea659811d92e6b574130aee57eba + +diff --git a/test/test_malicious_html.rb b/test/test_malicious_html.rb +index 2c23074..0756de0 100644 +--- a/test/test_malicious_html.rb ++++ b/test/test_malicious_html.rb +@@ -135,6 +135,8 @@ + # The relevant libxml2 code is here: + # + describe 'unsafe libxml2 server-side includes in attributes' do ++ using_unpatched_libxml2 = Nokogiri::VersionInfo.instance.libxml2_using_system? ++ + tag_configs = [ + { + tag_name: 'a', +@@ -166,6 +168,8 @@ + input = %[<#{tag_name} #{attr_name}='example.com'>foo] + + it 'should escape unsafe characters in attributes' do ++ skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 ++ + # This uses Nokogumbo's HTML-compliant serializer rather than + # libxml2's. + @s.fragment(input). +@@ -191,6 +195,8 @@ + input = %[<#{tag_name} #{attr_name}='example.com'>foo] + + it 'should not escape characters unnecessarily' do ++ skip "behavior should only exist in nokogiri's patched libxml" if using_unpatched_libxml2 ++ + # This uses Nokogumbo's HTML-compliant serializer rather than + # libxml2's. + @s.fragment(input). diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 396d4a021f..08c55e4e3c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5319,33 +5319,32 @@ access the result as a Nokogiri parsed document.") (define-public ruby-sanitize (package (name "ruby-sanitize") - (version "4.6.3") + (version "5.1.0") + (home-page "https://github.com/rgrove/sanitize") (source (origin - (method url-fetch) + (method git-fetch) ;; The gem does not include the Rakefile, so we download the - ;; release tarball from Github. - (uri (string-append "https://github.com/rgrove/" - "sanitize/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + ;; source from Github. + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "ruby-sanitize-system-libxml.patch")) (sha256 (base32 - "1fmqppwif3cm8h79006jfzkdnlxxzlry9kzk03psk0d5xpg55ycc")))) + "0lj0q9yhjp0q0in5majkshnki07mw8m2vxgndx4m5na6232aszl0")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-crass" ,ruby-crass) ("ruby-nokogiri" ,ruby-nokogiri) ("ruby-nokogumbo" ,ruby-nokogumbo))) (native-inputs - `(("bundler" ,bundler) - ("ruby-minitest" ,ruby-minitest) - ("ruby-redcarpet" ,ruby-redcarpet) - ("ruby-yard" ,ruby-yard))) + `(("ruby-minitest" ,ruby-minitest))) (synopsis "Whitelist-based HTML and CSS sanitizer") (description "Sanitize is a whitelist-based HTML and CSS sanitizer. Given a list of acceptable elements, attributes, and CSS properties, Sanitize will remove all unacceptable HTML and/or CSS from a string.") - (home-page "https://github.com/rgrove/sanitize/") (license license:expat))) (define-public ruby-oj -- cgit 1.4.1 From fb9a57a8e6a28093f5138a6c484442f8b3a8cd7e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 18:53:13 +0200 Subject: utils: Add 'cc-for-target'. * guix/utils.scm (cc-for-target): New procedure. --- guix/utils.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/utils.scm b/guix/utils.scm index d7b197fa44..69e3f0a934 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,6 +78,8 @@ target-aarch64? target-arm? target-64bit? + cc-for-target + version-compare version>? version>=? @@ -506,6 +508,11 @@ a character other than '@'." (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64"))) +(define* (cc-for-target #:optional (target (%current-target-system))) + (if target + (string-append target "-gcc") + "gcc")) + (define version-compare (let ((strverscmp (let ((sym (or (dynamic-func "strverscmp" (dynamic-link)) -- cgit 1.4.1 From 1ca44ae34cb4324427f232035b00c11dfa712139 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 28 May 2020 18:57:46 +0200 Subject: gnu: Use 'cc-for-target' instead of custom implementations. * gnu/packages/compression.scm (ecm)[arguments]: In #:make-flags, remove TARGET binding and use CC-FOR-TARGET instead. * gnu/packages/linux.scm (powerstat, crda, cachefilesd)[arguments]: Likewise. * gnu/packages/mail.scm (alpine)[arguments]: Likewise. * gnu/packages/music.scm (lsp-plugins)[arguments]: Likewise. * gnu/packages/radio.scm (dump1090)[arguments]: Likewise. * gnu/packages/suckless.scm (blind, dmenu, spoon, slock, st, surf, sent, wificurse, sbm, prout, noice, human, fortify-headers, colors, libutf, scron)[arguments]: Likewise. --- gnu/packages/compression.scm | 7 +-- gnu/packages/linux.scm | 22 ++----- gnu/packages/mail.scm | 5 +- gnu/packages/music.scm | 6 +- gnu/packages/radio.scm | 7 +-- gnu/packages/suckless.scm | 134 +++++++++++++------------------------------ 6 files changed, 52 insertions(+), 129 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 38adf35e33..cdab7408ed 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2207,11 +2207,8 @@ computations.") (arguments `(#:tests? #f ; no check target #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "DESTDIR=" (assoc-ref %outputs "out")))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "DESTDIR=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (replace 'configure diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b159ff7b22..0a154fd6cc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1222,11 +1222,8 @@ at login. Local and dynamic reconfiguration are its key features.") (build-system gnu-build-system) (arguments `(#:make-flags - (let* ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "prefix=" (assoc-ref %outputs "out")))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "prefix=" (assoc-ref %outputs "out"))) #:tests? #f ; no test suite #:phases (modify-phases %standard-phases @@ -3377,12 +3374,9 @@ interface.") #t)))) #:test-target "verify" #:make-flags (let ((out (assoc-ref %outputs "out")) - (regdb (assoc-ref %build-inputs "wireless-regdb")) - (target ,(%current-target-system))) + (regdb (assoc-ref %build-inputs "wireless-regdb"))) (list - (string-append - "CC=" (if target - (string-append target "-gcc") "gcc")) + (string-append "CC=" ,(cc-for-target)) "V=1" ;; Disable signature-checking on 'regulatory.bin'. @@ -7040,12 +7034,8 @@ system boot process.") `(#:tests? #f ; there are no tests #:make-flags (let ((prefix-dir (lambda (var dir) - (string-append var "=" %output "/" dir))) - (target ,(%current-target-system))) - (list (string-append "CC=" - (if target - (string-append target "-gcc") - "gcc")) + (string-append var "=" %output "/" dir)))) + (list (string-append "CC=" ,(cc-for-target)) (prefix-dir "SBINDIR" "sbin/") (prefix-dir "ETCDIR" "etc/") (prefix-dir "MANDIR" "share/man/"))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b44afd360e..8fb2a3c39e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2697,10 +2697,7 @@ operators and scripters.") (build-system gnu-build-system) (arguments `(#:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")))) + (list (string-append "CC=" ,(cc-for-target))) #:configure-flags (list (string-append "--with-ssl-include-dir=" (assoc-ref %build-inputs "openssl") "/include/openssl") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e4414dafd6..09827c7c93 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4886,11 +4886,7 @@ and reverb.") (arguments `(#:make-flags (list - (string-append "CC=" - (if ,(%current-target-system) - (string-append (assoc-ref %build-inputs "cross-gcc") - "/bin/" ,(%current-target-system) "-gcc") - "gcc")) + (string-append "CC=" ,(cc-for-target)) "BUILD_MODULES=\"lv2 ladspa jack\"" "VST_UI=0" (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "ETC_PATH=" (assoc-ref %outputs "out") "/etc")) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 5d58602ab0..b3a7cc0e97 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1018,11 +1018,8 @@ gain and standing wave ratio.") (arguments `(#:test-target "test" #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - "BLADERF=no")) + (list (string-append "CC=" ,(cc-for-target)) + "BLADERF=no") #:phases (modify-phases %standard-phases (delete 'configure) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 5cabb40eb0..c10226bb32 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -46,6 +46,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages)) (define-public blind @@ -62,12 +63,8 @@ (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target - #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + #:make-flags (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -152,14 +149,11 @@ optimising the environment for the application in use and the task performed.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output) - (string-append "FREETYPEINC=" - (assoc-ref %build-inputs "freetype") - "/include/freetype2"))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output) + (string-append "FREETYPEINC=" + (assoc-ref %build-inputs "freetype") + "/include/freetype2")) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs @@ -190,11 +184,8 @@ numbers of user-defined menu items efficiently.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)))) (inputs `(("libx11" ,libx11) ("libxkbfile" ,libxkbfile) @@ -221,11 +212,8 @@ numbers of user-defined menu items efficiently.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("libx11" ,libx11) @@ -253,11 +241,8 @@ numbers of user-defined menu items efficiently.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) @@ -298,11 +283,8 @@ drawing.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) @@ -347,14 +329,11 @@ point surf to another URI by setting its XProperties.") (delete 'configure)) ; no configuration #:tests? #f ; no test suite #:make-flags - (let ((target ,(%current-target-system)) - (pkg-config (lambda (flag) + (let ((pkg-config (lambda (flag) (string-append "$(shell pkg-config " flag " " "xft fontconfig x11 libpng)")))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) + (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" %output) (string-append "INCS=-I. " (pkg-config "--cflags")) (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) @@ -390,11 +369,8 @@ few minutes.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)))) (inputs `(("libx11" ,libx11))) (home-page "https://git.2f30.org/xbattmon/") @@ -452,11 +428,8 @@ drivers capable of injecting packets in wireless networks.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -484,11 +457,8 @@ left.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -514,11 +484,8 @@ left.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -550,11 +517,8 @@ cups server to be installed.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -588,11 +552,8 @@ cups server to be installed.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -621,11 +582,8 @@ environment variable.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -666,11 +624,8 @@ initially intended to be used on musl-based Linux distributions. (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -707,11 +662,8 @@ colormap to stdout.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script @@ -756,11 +708,8 @@ as -1, to be used instead of U+FFFD. (arguments `(#:test-target "test" #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -805,11 +754,8 @@ chat output in the background.") (arguments `(#:tests? #f ; no tests #:make-flags - (let ((target ,(%current-target-system))) - (list (string-append "CC=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "PREFIX=" %output))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) ; no configure script -- cgit 1.4.1 From 29e1553344864db55de6af225b16ac74d84a078a Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:04:11 -0700 Subject: gnu: Add ghc-inspection-testing. * gnu/packages/haskell-check.scm (ghc-inspection-testing): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-check.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index d571d46945..bb7f57b49d 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Tonton ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2020 John Soo ;;; ;;; This file is part of GNU Guix. ;;; @@ -996,3 +997,43 @@ values (similar to @code{toEnum} but for any algebraic data type). This can be used for SmallCheck-style systematic testing, QuickCheck-style random testing, and hybrids of the two.") (license license:bsd-3))) + +(define-public ghc-inspection-testing + (package + (name "ghc-inspection-testing") + (version "0.4.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/inspection-testing/" + "inspection-testing-" version ".tar.gz")) + (sha256 + (base32 + "1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp")))) + (build-system haskell-build-system) + (home-page + "https://github.com/nomeata/inspection-testing") + (synopsis "GHC plugin to do inspection testing") + (description + "Some carefully crafted libraries make promises to their users beyond +functionality and performance. + +Examples are: Fusion libraries promise intermediate data structures to be +eliminated. Generic programming libraries promise that the generic +implementation is identical to the hand-written one. Some libraries may +promise allocation-free or branch-free code. + +Conventionally, the modus operandi in all these cases is that the library +author manually inspects the (intermediate or final) code produced by the +compiler. This is not only tedious, but makes it very likely that some change, +either in the library itself or the surrounding eco-system, breaks the +library's promised without anyone noticing. + +This package provides a disciplined way of specifying such properties, and +have them checked by the compiler. This way, this checking can be part of the +ususal development cycle and regressions caught early. + +See the documentation in \"Test.Inspection\" or the project webpage for more +examples and more information.") + (license license:expat))) -- cgit 1.4.1 From 82c36002ded75b136a5bdd23d7e32cfeaa341e3c Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:05:16 -0700 Subject: gnu: Add ghc-data-fix. * gnu/packages/haskell-xyz.scm (ghc-data-fix): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 29d3077755..52b2faaa39 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2018, 2019 Gabriel Hondet ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2019 Jacob MacDonald -;;; Copyright © 2019 John Soo +;;; Copyright © 2019,2020 John Soo ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Brett Gilio @@ -2724,6 +2724,28 @@ package.") package.") (license license:bsd-3))) +(define-public ghc-data-fix + (package + (name "ghc-data-fix") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/data-fix/" + "data-fix-" version ".tar.gz")) + (sha256 + (base32 "14hk6hq5hdb3l5bhmzhw086jpzlvp9qbw9dzw30wlz5jbh2ihmvy")))) + (build-system haskell-build-system) + (home-page "https://github.com/spell-music/data-fix") + (synopsis "Fixpoint data types") + (description + "Fixpoint types and recursion schemes. If you define your AST as +fixpoint type, you get fold and unfold operations for free. + +Thanks for contribution to: Matej Kollar, Herbert Valerio Riedel") + (license license:bsd-3))) + (define-public ghc-data-hash (package (name "ghc-data-hash") -- cgit 1.4.1 From 6ba536a1cd128d755b37a5f408d5fa9a58ffc142 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:06:15 -0700 Subject: gnu: Add ghc-cborg. * gnu/packages/haskell-xyz.scm (ghc-cborg): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 52b2faaa39..b3d37abeee 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1535,6 +1535,54 @@ constructor which can be parameterised by a string-like type like: the resulting type will be insensitive to cases.") (license license:bsd-3))) +(define-public ghc-cborg + (package + (name "ghc-cborg") + (version "0.2.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/cborg/cborg-" + version + ".tar.gz")) + (sha256 + (base32 + "1rdnvy0w17s70ikmbyrnwax5rvqh19l95sh8i7ipgxi23z1r0bp1")))) + (build-system haskell-build-system) + (inputs + `(("ghc-half" ,ghc-half) + ("ghc-primitive" ,ghc-primitive))) + (native-inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-base64-bytestring" ,ghc-base64-bytestring) + ("ghc-base16-bytestring" ,ghc-base16-bytestring) + ("ghc-fail" ,ghc-fail) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-scientific" ,ghc-scientific) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-vector" ,ghc-vector))) + (home-page "http://hackage.haskell.org/package/cborg") + (synopsis "Concise Binary Object Representation") + (description + "This package (formerly binary-serialise-cbor) provides an +efficient implementation of the Concise Binary Object +Representation (CBOR), as specified by RFC 7049 at +https://tools.ietf.org/html/rfc7049. + +If you are looking for a library for serialisation of Haskell values, have a +look at the @url{https://hackage.haskell.org/package/serialise} package, which +is built upon this library. + +An implementation of the standard bijection between CBOR and JSON is provided +by the @url{https://hackage.haskell.org/package/cborg-json} package. + +Also see @code{https://hackage.haskell.org/package/cbor-tool} for a convenient +command-line utility for working with CBOR data.") + (license license:bsd-3))) + (define-public ghc-cereal (package (name "ghc-cereal") -- cgit 1.4.1 From 5434fec95da8f73f0422140f6b61cc918184a77e Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:07:44 -0700 Subject: gnu: Add ghc-cborg-json. * gnu/packages/haskell-xyz.scm (ghc-cborg-json): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b3d37abeee..7ca80d6bae 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -1583,6 +1583,34 @@ Also see @code{https://hackage.haskell.org/package/cbor-tool} for a convenient command-line utility for working with CBOR data.") (license license:bsd-3))) +(define-public ghc-cborg-json + (package + (name "ghc-cborg-json") + (version "0.2.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/cborg-json/cborg-json-" + version + ".tar.gz")) + (sha256 + (base32 "0ysilz7rrjk94sqr3a61s98hr9qfi1xg13bskmlpc6mpgi2s4s5b")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-aeson-pretty" ,ghc-aeson-pretty) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-scientific" ,ghc-scientific) + ("ghc-vector" ,ghc-vector) + ("ghc-cborg" ,ghc-cborg))) + (home-page "https://github.com/well-typed/cborg") + (synopsis "A library for encoding JSON as CBOR") + (description + "This package implements the bijection between JSON and CBOR +defined in the CBOR specification, RFC 7049.") + (license license:bsd-3))) + (define-public ghc-cereal (package (name "ghc-cereal") -- cgit 1.4.1 From 2b2c8911c6357312ca577c20dbe6fc58ffa98aa5 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:08:27 -0700 Subject: gnu: Add ghc-dotgen. * gnu/packages/haskell-xyz.scm (ghc-dotgen): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7ca80d6bae..fb26de2669 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3342,6 +3342,30 @@ It is modeled after doctest for Python, see @uref{https://docs.python.org/library/doctest.html, the Doctest website}.") (license license:expat))) +(define-public ghc-dotgen + (package + (name "ghc-dotgen") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/dotgen/dotgen-" + version + ".tar.gz")) + (sha256 + (base32 + "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg")))) + (build-system haskell-build-system) + (home-page "https://github.com/ku-fpg/dotgen") + (synopsis + "Simple interface for building .dot graph files") + (description + "This package provides a simple interface for building .dot graph +files, for input into the dot and graphviz tools. It includes a +monadic interface for building graphs.") + (license license:bsd-3))) + (define-public ghc-double-conversion (package (name "ghc-double-conversion") -- cgit 1.4.1 From 89e9082e4e90c9e593ed8584ff6978ecf91dfe24 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:09:02 -0700 Subject: gnu: Add ghc-generic-random. * gnu/packages/haskell-xyz.scm (ghc-generic-random): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fb26de2669..d828501593 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4481,6 +4481,46 @@ specific Windows, Mac, and Linux file system event notification.") deriving mechanism in Haskell to arbitrary classes.") (license license:bsd-3))) +(define-public ghc-generic-random + (package + (name "ghc-generic-random") + (version "1.2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/generic-random/" + "generic-random-" version ".tar.gz")) + (sha256 + (base32 "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv")))) + (build-system haskell-build-system) + (inputs `(("ghc-quickcheck" ,ghc-quickcheck))) + (native-inputs + `(("ghc-inspection-testing" ,ghc-inspection-testing))) + (arguments + `(#:cabal-revision + ("1" "1d0hx41r7yq2a86ydnfh2fv540ah8cz05l071s2z4wxcjw0ymyn4"))) + (home-page + "https://github.com/lysxia/generic-random") + (synopsis + "Generic random generators for QuickCheck") + (description + "Derive instances of @code{Arbitrary} for QuickCheck, with various options +to customize implementations. + +Automating the arbitrary boilerplate also ensures that when a type changes to +have more or fewer constructors, then the generator either fixes itself to +generate that new case (when using the uniform distribution) or causes a +compilation error so you remember to fix it (when using an explicit +distribution). + +This package also offers a simple (optional) strategy to ensure termination +for recursive types: make @code{Test.QuickCheck.Gen}'s size parameter decrease +at every recursive call; when it reaches zero, sample directly from a +trivially terminating generator given explicitly (@code{genericArbitraryRec} +and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") + (license license:expat))) + (define-public ghc-generics-sop (package (name "ghc-generics-sop") -- cgit 1.4.1 From 714e5605b6e8a9a3c7560c8c42b508c485f641b0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:09:59 -0700 Subject: gnu: Add ghc-text-manipulate. * gnu/packages/haskell-xyz.scm (ghc-text-manipulate): New variable. fix text-manipulate. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d828501593..41f7e14233 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -12029,6 +12029,44 @@ instances for strict and lazy text types for versions older than 1.2.1 of the text package.") (license license:bsd-2))) +(define-public ghc-text-manipulate + (package + (name "ghc-text-manipulate") + (version "0.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/text-manipulate" + "/text-manipulate-" + version + ".tar.gz")) + (sha256 + (base32 + "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) + (home-page + "https://github.com/brendanhay/text-manipulate") + (synopsis + "Case conversion, word boundary manipulation, and textual subjugation") + (description + "Manipulate identifiers and structurally non-complex pieces of text by +delimiting word boundaries via a combination of whitespace, +control-characters, and case-sensitivity. + +Has support for common idioms like casing of programmatic variable names, +taking, dropping, and splitting by word, and modifying the first character of +a piece of text. + +Caution: this library makes heavy use of the text library's internal loop +optimisation framework. Since internal modules are not guaranteed to have a +stable API there is potential for build breakage when the text dependency is +upgraded. Consider yourself warned!") + (license license:mpl2.0))) + (define-public ghc-text-metrics (package (name "ghc-text-metrics") -- cgit 1.4.1 From a152258be2cda989d64dd9c9bb7db8d52a325077 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:10:29 -0700 Subject: gnu: Add ghc-spoon. * gnu/packages/haskell-xyz.scm (ghc-spoon): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 41f7e14233..b483b71d21 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11218,6 +11218,37 @@ internal state).") (native-inputs '()) (properties '((hidden? #t))))) +(define-public ghc-spoon + (package + (name "ghc-spoon") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/spoon/spoon-" + version + ".tar.gz")) + (sha256 + (base32 + "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr")))) + (build-system haskell-build-system) + (arguments + `(#:cabal-revision + ("1" + "09s5jjcsg4g4qxchq9g2l4i9d5zh3rixpkbiysqcgl69kj8mwv74"))) + (home-page + "http://hackage.haskell.org/package/spoon") + (synopsis + "Catch errors thrown from pure computations") + (description + "Takes an error-throwing expression and puts it back in the Maybe it +belongs in. + +Note that this suffers from the +@url{https://ghc.haskell.org/trac/ghc/ticket/5902}. Buyer beware.") + (license license:bsd-3))) + (define-public ghc-statevar (package (name "ghc-statevar") -- cgit 1.4.1 From 4c77a1a00bc39e977e48301849941ae4bf5ee560 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:11:00 -0700 Subject: gnu: Add ghc-special-values. * gnu/packages/haskell-xyz.scm (ghc-special-values): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b483b71d21..7f152e7e92 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11145,6 +11145,32 @@ core of @url{https://hackage.haskell.org/package/generics-sop, generics-sop}.") (license license:bsd-3))) +(define-public ghc-special-values + (package + (name "ghc-special-values") + (version "0.1.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/special-values/" + "special-values-" version ".tar.gz")) + (sha256 + (base32 + "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w")))) + (build-system haskell-build-system) + (inputs + `(("ghc-scientific" ,ghc-scientific) + ("ghc-ieee754" ,ghc-ieee754) + ("ghc-nats" ,ghc-nats))) + (home-page + "https://github.com/minad/special-values#readme") + (synopsis "Typeclass providing special values") + (description + "Special values are provided by a SpecialValues typeclass. Those can be +used for example by QuickCheck, see quickcheck-special." ) + (license license:expat))) + (define-public ghc-split (package (name "ghc-split") -- cgit 1.4.1 From 47c526df631f4354a93881934c3d8e1c674528b6 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:11:37 -0700 Subject: gnu: Add ghc-serialise. * gnu/packages/haskell-xyz.scm (ghc-serialise): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 7f152e7e92..20f738eeff 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10804,6 +10804,56 @@ semigroup.") ("ghc-hashable" ,ghc-hashable-bootstrap))) (properties '((hidden? #t))))) +(define-public ghc-serialise + (package + (name "ghc-serialise") + (version "0.2.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/serialise/serialise-" + version + ".tar.gz")) + (sha256 + (base32 + "19ary6ivzk8z7wcxhm860qmh7pwqj0qjqzav1h42y85l608zqgh4")))) + (build-system haskell-build-system) + (inputs + `(("ghc-cborg" ,ghc-cborg) + ("ghc-half" ,ghc-half) + ("ghc-hashable" ,ghc-hashable) + ("ghc-primitive" ,ghc-primitive) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances))) + (arguments + `(#:cabal-revision + ("1" "1rknhad1i8bpknsnphmcmb6dnb48c2p2c13ia2qqch3hkhsvfpr6"))) + (home-page "https://github.com/well-typed/cborg") + (synopsis "Binary serialisation library for Haskell values") + (description + "This package (formerly binary-serialise-cbor) provides pure, +efficient serialization of Haskell values directly into ByteStrings for +storage or transmission purposes. By providing a set of type class instances, +you can also serialise any custom data type you have as well. + +The underlying binary format used is the 'Concise Binary Object +Representation', or CBOR, specified in RFC 7049. As a result, serialised +Haskell values have implicit structure outside of the Haskell program itself, +meaning they can be inspected or analyzed without custom tools. + +An implementation of the standard bijection between CBOR and JSON is +provided by the https://hackage.haskell.org/package/cborg-json +package. Also see https://hackage.haskell.org/package/cbor-tool for a +convenient command-line utility for working with CBOR data.") + (license license:bsd-3))) + (define-public ghc-setenv (package (name "ghc-setenv") -- cgit 1.4.1 From f011e3d6698b45cb13f5d03b72b235a55455bb47 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:12:25 -0700 Subject: gnu: Add ghc-pretty-simple. * gnu/packages/haskell-xyz.scm (ghc-pretty-simple): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 20f738eeff..53d7ab47ce 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9370,6 +9370,33 @@ complex generic values into an interactive Html page, for easier examination.") (license license:expat))) +(define-public ghc-pretty-simple + (package + (name "ghc-pretty-simple") + (version "2.2.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/pretty-simple/" + "pretty-simple-" version ".tar.gz")) + (sha256 + (base32 "0wsi9235ihm15s145lxi7325vv2k4bhighc5m88kn1lk0pl81aqq")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-glob" ,ghc-glob) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-aeson" ,ghc-aeson))) + (native-inputs + `(("ghc-doctest" ,ghc-doctest))) + (home-page "https://github.com/cdepillabout/pretty-simple") + (synopsis "Pretty printer for data types with a 'Show' instance") + (description + "Pretty-simple is a pretty printer for Haskell data types that have a +Show instance.") + (license license:bsd-3))) + (define-public ghc-primitive (package (name "ghc-primitive") -- cgit 1.4.1 From 0fb342352878b57acc3391e1ff3e6a7da440f996 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:13:20 -0700 Subject: gnu: Add ghc-pgp-wordlist. * gnu/packages/haskell-xyz.scm (ghc-pgp-wordlist): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 53d7ab47ce..cbbfbf4951 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9161,6 +9161,45 @@ the persistent interface, not for users of the persistent suite of database libraries.") (license license:expat))) +(define-public ghc-pgp-wordlist + (package + (name "ghc-pgp-wordlist") + (version "0.1.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/pgp-wordlist/pgp-wordlist-" + version + ".tar.gz")) + (sha256 + (base32 + "15g6qh0fb7kjj3l0w8cama7cxgnhnhybw760md9yy7cqfq15cfzg")))) + (build-system haskell-build-system) + (inputs + `(("ghc-vector" ,ghc-vector))) + (native-inputs + `(("ghc-hunit" ,ghc-hunit) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-doctest" ,ghc-doctest))) + (home-page + "https://github.com/quchen/pgp-wordlist") + (synopsis + "Translate between binary data and a human-readable collection of words") + (description + "The PGP Word List consists of two phonetic alphabets, each with one word +per possible byte value. A string of bytes is translated with these +alphabets, alternating between them at each byte. + +The PGP words corresponding to the bytes 5B 1D CA 6E are \"erase breakaway +spellbind headwaters\", for example. + +For further information, see +@url{http://en.wikipedia.org/wiki/PGP_word_list}.") + (license license:bsd-3))) + (define-public ghc-pipes (package (name "ghc-pipes") -- cgit 1.4.1 From 6f1477d2184094ec2c29664ab9645efb4fb4a691 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:13:54 -0700 Subject: gnu: Add ghc-optional-args. * gnu/packages/haskell-xyz.scm (ghc-optional-args): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cbbfbf4951..844287330e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8373,6 +8373,29 @@ replay capababilities, implementing fast parser monads, designing monadic DSLs, etc.") (license license:bsd-3))) +(define-public ghc-optional-args + (package + (name "ghc-optional-args") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/optional-args/optional-args-" + version + ".tar.gz")) + (sha256 + (base32 + "1r5hhn6xvc01grggxdyy48daibwzi0aikgidq0ahpa6bfynm8d1f")))) + (build-system haskell-build-system) + (home-page + "http://hackage.haskell.org/package/optional-args") + (synopsis "Optional function arguments") + (description + "This library provides a type for specifying @code{Optional} function +arguments.") + (license license:bsd-3))) + (define-public ghc-options (package (name "ghc-options") -- cgit 1.4.1 From 9f776fe2531bcca37287c897b4425bc32b8d2cba Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:14:59 -0700 Subject: gnu: Add ghc-turtle. * gnu/packages/haskell-xyz.scm (ghc-turtle): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 844287330e..686b898b2f 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -12933,6 +12933,69 @@ generating functions similar to those in @code{Data.List} for tuples of statically known size.") (license license:bsd-3))) +(define-public ghc-turtle + (package + (name "ghc-turtle") + (version "1.5.15") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/turtle/turtle-" + version + ".tar.gz")) + (sha256 + (base32 + "0yckgsc2a4g5x867gni80ldp226bsnhncfbil4ql6v2zwm4r8p7f")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint) + ("ghc-async" ,ghc-async) + ("ghc-clock" ,ghc-clock) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-foldl" ,ghc-foldl) + ("ghc-hostname" ,ghc-hostname) + ("ghc-managed" ,ghc-managed) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-system-filepath" ,ghc-system-filepath) + ("ghc-system-fileio" ,ghc-system-fileio) + ("ghc-streaming-commons" ,ghc-streaming-commons) + ("ghc-temporary" ,ghc-temporary) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-optional-args" ,ghc-optional-args) + ("ghc-unix-compat" ,ghc-unix-compat))) + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-fail" ,ghc-fail))) + (arguments + `(#:cabal-revision + ("1" "02q1rv7zx31xz9wnmcqwd4w3iw7623p07iyi21zr0cqlignic5pg"))) + (home-page + "http://hackage.haskell.org/package/turtle") + (synopsis "Shell programming, Haskell-style") + (description + "Turtle is a reimplementation of the Unix command line environment in +Haskell so that you can use Haskell as both a shell and a scripting +language. Features include: + +@itemize +@item Batteries included: Command an extended suite of predefined utilities. +@item Interoperability: You can still run external shell commands. +@item Portability: Works on Windows, OS X, and Linux. +@item Exception safety: Safely acquire and release resources. +@item Streaming: Transform or fold command output in constant space. +@item Patterns: Use typed regular expressions that can parse structured values. +@item Formatting: Type-safe printf-style text formatting. +@item Modern: Supports text and system-filepath. +@end itemize + +Read \"Turtle.Tutorial\" for a detailed tutorial or \"Turtle.Prelude\" for a +quick-start guide. Turtle is designed to be beginner-friendly, but as a +result lacks certain features, like tracing commands. If you feel comfortable +using turtle then you should also check out the Shelly library which provides +similar functionality.") + (license license:bsd-3))) + (define-public ghc-typed-process (package (name "ghc-typed-process") -- cgit 1.4.1 From bcfe9dba4dfc95b294cf7b72fd77a39fbbc22f39 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:15:54 -0700 Subject: gnu: Add ghc-managed. * gnu/packages/haskell-xyz.scm (ghc-managed): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 686b898b2f..cef3261f45 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -7137,6 +7137,42 @@ With it, you can determine the type of a file by examining its contents rather than its name.") (license license:bsd-3))) +(define-public ghc-managed + (package + (name "ghc-managed") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/managed/managed-" + version + ".tar.gz")) + (sha256 + (base32 + "1kbrw99yh5x5blykmx2n88mplbbi4ss1ij5j17b7asw6q0ihm9zi")))) + (build-system haskell-build-system) + (home-page "http://hackage.haskell.org/package/managed") + (synopsis "Monad for managed values") + (description + "In Haskell you very often acquire values using the with... idiom using +functions of type (a -> IO r) -> IO r. This idiom forms a Monad, which is a +special case of the ContT monad (from transformers) or the Codensity +monad (from kan-extensions). The main purpose behind this package is to +provide a restricted form of these monads specialized to this unusually common +case. + +The reason this package defines a specialized version of these types +is to: + +@itemize +@item be more beginner-friendly, +@item simplify inferred types and error messages, and: +@item provide some additional type class instances that would otherwise be +orphan instances +@end itemize") + (license license:bsd-3))) + (define-public ghc-markdown-unlit (package (name "ghc-markdown-unlit") -- cgit 1.4.1 From bcd35444ca64131784799731e92042902615ad65 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:17:48 -0700 Subject: gnu: Add ghc-lens-family-core. * gnu/packages/haskell-xyz.scm (ghc-lens-family-core): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index cef3261f45..510a77d9fb 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -6660,6 +6660,42 @@ of getters, folds, isomorphisms, traversals, setters and lenses and their indexed variants.") (license license:bsd-3))) +(define-public ghc-lens-family-core + (package + (name "ghc-lens-family-core") + (version "1.2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/lens-family-core/lens-family-core-" + version + ".tar.gz")) + (sha256 + (base32 + "009rf10pj1cb50v44cc1pq7qvfrmkkk9dikahs9qmvbvgl3mykwi")))) + (build-system haskell-build-system) + (home-page + "http://hackage.haskell.org/package/lens-family-core") + (synopsis "Haskell 98 Lens Families") + (description + "This package provides first class functional references. In addition to +the usual operations of getting, setting and composition, plus integration +with the state monad, lens families provide some unique features: + +@itemize +@item Polymorphic updating +@item Traversals +@item Cast projection functions to read-only lenses +@item Cast @code{toList} functions to read-only traversals +@item Cast semantic editor combinators to modify-only traversals +@end itemize + +For optimal first-class support use the lens-family package with rank 2/rank N +polymorphism. @code{Lens.Family.Clone} allows for first-class support of +lenses and traversals for those who require Haskell 98.") + (license license:bsd-3))) + (define-public ghc-libffi (package (name "ghc-libffi") -- cgit 1.4.1 From 2fad2bf7d7becc64a32082392e3499e6a27cda72 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:18:37 -0700 Subject: gnu: Add ghc-prettyprinter. * gnu/packages/haskell-xyz.scm (ghc-prettyprinter): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 510a77d9fb..fa4e9a707c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9456,6 +9456,35 @@ provides the pretty printing class and instances for the Prelude types.") (license license:bsd-3))) +(define-public ghc-prettyprinter + (package + (name "ghc-prettyprinter") + (version "1.2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/prettyprinter/prettyprinter-" + version + ".tar.gz")) + (sha256 + (base32 "1p9c3q55hba4c0zyxc624g5df7wgsclpsmd8wqpdnmib882q9d1v")))) + (build-system haskell-build-system) + (native-inputs + `(("ghc-doctest" ,ghc-doctest) + ("ghc-pgp-wordlist" ,ghc-pgp-wordlist) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) + (home-page "https://github.com/quchen/prettyprinter") + (synopsis + "Modern, easy to use, well-documented, extensible pretty-printer") + (description + "A prettyprinter/text rendering engine. Easy to use, well-documented, +ANSI terminal backend exists, HTML backend is trivial to implement, no name +clashes, @code{Text}-based, extensible.") + (license license:bsd-2))) + (define-public ghc-pretty-hex (package (name "ghc-pretty-hex") -- cgit 1.4.1 From 798a2df47f7f84e2cda2c110b6afb6610ee04583 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:19:29 -0700 Subject: gnu: Add ghc-repline. * gnu/packages/haskell-xyz.scm (ghc-repline): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fa4e9a707c..97df51cd5a 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10242,6 +10242,28 @@ inspired by libtre.") "This provides an extra text interface for regex-tdfa.") (license license:bsd-3))) +(define-public ghc-repline + (package + (name "ghc-repline") + (version "0.2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/repline/repline-" + version + ".tar.gz")) + (sha256 + (base32 + "1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc")))) + (build-system haskell-build-system) + (home-page "https://github.com/sdiehl/repline") + (synopsis "Haskeline wrapper for GHCi-like REPL interfaces") + (description + "Haskeline wrapper for GHCi-like REPL interfaces. Composable with +normal mtl transformers.") + (license license:expat))) + (define-public ghc-rerebase (package (name "ghc-rerebase") -- cgit 1.4.1 From dd26713e16e0ed6798820eabf1af7aef34ece12f Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:19:59 -0700 Subject: gnu: Add ghc-haskeline-0.8. * gnu/packages/haskell-xyz.scm (ghc-haskeline-0.8): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 97df51cd5a..13a89e94b1 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5274,6 +5274,37 @@ monad, as well as a typeclass abstracting their common operations, and a set of wrappers to use the hash tables in the IO monad.") (license license:bsd-3))) +(define-public ghc-haskeline-0.8 + (package + (name "ghc-haskeline") + (version "0.8.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/haskeline/haskeline-" + version + ".tar.gz")) + (sha256 + (base32 + "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb")))) + (build-system haskell-build-system) + (inputs `(("ghc-exceptions" ,ghc-exceptions))) + (native-inputs `(("ghc-hunit" ,ghc-hunit))) + ;; FIXME: Tests failing + (arguments `(#:tests? #f)) + (home-page "https://github.com/judah/haskeline") + (synopsis + "Command-line interface for user input, written in Haskell") + (description + "Haskeline provides a user interface for line input in command-line +programs. This library is similar in purpose to readline, but since it is +written in Haskell it is (hopefully) more easily used in other Haskell +programs. + +Haskeline runs both on POSIX-compatible systems and on Windows.") + (license license:bsd-3))) + (define-public ghc-haskell-lexer (package (name "ghc-haskell-lexer") -- cgit 1.4.1 From 6c0858dda26dc1d3af8e546d9b1fda59175da9a0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:20:34 -0700 Subject: gnu: Add ghc-repline-0.3. * gnu/packages/haskell-xyz.scm (ghc-repline-0.3): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 13a89e94b1..30a09bde8b 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10295,6 +10295,24 @@ inspired by libtre.") normal mtl transformers.") (license license:expat))) +(define-public ghc-repline-0.3 + (package + (inherit ghc-repline) + (version "0.3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/repline/repline-" + version + ".tar.gz")) + (sha256 + (base32 + "0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8")))) + (inputs + `(("ghc-exceptions" ,ghc-exceptions) + ("ghc-haskeline" ,ghc-haskeline-0.8))))) + (define-public ghc-rerebase (package (name "ghc-rerebase") -- cgit 1.4.1 From 2496e49f85b59d1b95e720344d4cd5dcc08f4aa3 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:21:06 -0700 Subject: gnu: Add ghc-prettyprinter-1.6. * gnu/packages/haskell-xyz.scm (ghc-prettyprinter-1.6): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 30a09bde8b..6ec349e575 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9516,6 +9516,23 @@ ANSI terminal backend exists, HTML backend is trivial to implement, no name clashes, @code{Text}-based, extensible.") (license license:bsd-2))) +(define-public ghc-prettyprinter-1.6 + (package + (inherit ghc-prettyprinter) + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/prettyprinter/prettyprinter-" + version + ".tar.gz")) + (sha256 + (base32 "10fphxh8lvdaw7i8jyllwmj87w02db92mf99zfw5vddp9mv6b5rz")))) + (inputs + `(("ghc-quickckeck-instances" , ghc-quickcheck-instances) + ,@(package-inputs ghc-prettyprinter))))) + (define-public ghc-pretty-hex (package (name "ghc-pretty-hex") -- cgit 1.4.1 From b4f24d668b8cb408ff794bddf135146e4147e5bd Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:21:32 -0700 Subject: gnu: Add ghc-prettyprinter-ansi-terminal. * gnu/packages/haskell-xyz.scm (ghc-prettyprinter-ansi-terminal): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 6ec349e575..2b9ad860e8 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9533,6 +9533,30 @@ clashes, @code{Text}-based, extensible.") `(("ghc-quickckeck-instances" , ghc-quickcheck-instances) ,@(package-inputs ghc-prettyprinter))))) +(define-public ghc-prettyprinter-ansi-terminal + (package + (name "ghc-prettyprinter-ansi-terminal") + (version "1.1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/prettyprinter-ansi-terminal/" + "prettyprinter-ansi-terminal-" version ".tar.gz")) + (sha256 + (base32 "0ha6vz707qzb5ky7kdsnw2zgphg2dnxrpbrxy8gaw119vwhb9q6k")))) + (build-system haskell-build-system) + (inputs + `(("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-prettyprinter" ,ghc-prettyprinter-1.6))) + (native-inputs `(("ghc-doctest" ,ghc-doctest))) + (home-page + "https://github.com/quchen/prettyprinter") + (synopsis + "ANSI terminal backend for the prettyprinter package") + (description "ANSI terminal backend for the prettyprinter package.") + (license license:bsd-2))) + (define-public ghc-pretty-hex (package (name "ghc-pretty-hex") -- cgit 1.4.1 From 23e4b264d7ce196f660c5a92cc0a83c73b5e8b8e Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:22:09 -0700 Subject: gnu: Add ghc-generic-random-1.3.0.1. * gnu/packages/haskell-xyz.scm (ghc-generic-random-1.3.0.1): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2b9ad860e8..8e18644f51 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4521,6 +4521,20 @@ trivially terminating generator given explicitly (@code{genericArbitraryRec} and @code{withBaseCase}) or implicitly (@code{genericArbitrary'}).") (license license:expat))) +(define-public ghc-generic-random-1.3.0.1 + (package + (inherit ghc-generic-random) + (version "1.3.0.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/generic-random/" + "generic-random-" version ".tar.gz")) + (sha256 + (base32 "0d9w7xcmsb31b95fr9d5jwbsajcl1yi4347dlbw4bybil2vjwd7k")))) + (arguments '()))) + (define-public ghc-generics-sop (package (name "ghc-generics-sop") -- cgit 1.4.1 From b7250901f6e0143a6838d924742397986c1764b0 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:22:42 -0700 Subject: gnu: Add ghc-atomic-write-0.2.0.7. * gnu/packages/haskell-xyz.scm (ghc-atomic-write-0.2.0.7): New variable. Signed-off-by: Leo Famulari --- gnu/packages/haskell-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 8e18644f51..64c09c9274 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -567,6 +567,21 @@ will destroy the permissions on the original file. This library preserves permissions while atomically writing to a file.") (license license:expat))) +(define-public ghc-atomic-write-0.2.0.7 + (package + (inherit ghc-atomic-write) + (version "0.2.0.7") + (source + (origin + (inherit (package-source ghc-atomic-write)) + (uri (string-append + "https://hackage.haskell.org/package/atomic-write/atomic-write-" + version + ".tar.gz")) + (sha256 + (base32 + "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm")))))) + (define-public ghc-attoparsec (package (name "ghc-attoparsec") -- cgit 1.4.1 From 9ff667ea05d0807b4e6512c92914ae517b9ec755 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 10 Apr 2020 21:01:46 -0700 Subject: gnu: Add dhall. * gnu/packages/dhall.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. (dist_patch_DATA): Add new patch. * gnu/packages/patches/dhall-remove-network-tests.patch: Add patch to remove dhall network tests. Signed-off-by: Leo Famulari --- gnu/local.mk | 2 + gnu/packages/dhall.scm | 133 +++++++++++++++++++++ .../patches/dhall-remove-network-tests.patch | 97 +++++++++++++++ 3 files changed, 232 insertions(+) create mode 100644 gnu/packages/dhall.scm create mode 100644 gnu/packages/patches/dhall-remove-network-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 663e687bd6..768943a67a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -157,6 +157,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/debian.scm \ %D%/packages/debug.scm \ %D%/packages/dejagnu.scm \ + %D%/packages/dhall.scm \ %D%/packages/dico.scm \ %D%/packages/dictionaries.scm \ %D%/packages/diffoscope.scm \ @@ -862,6 +863,7 @@ dist_patch_DATA = \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ + %D%/packages/patches/dhall-remove-network-tests.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \ diff --git a/gnu/packages/dhall.scm b/gnu/packages/dhall.scm new file mode 100644 index 0000000000..bbe2d271d7 --- /dev/null +++ b/gnu/packages/dhall.scm @@ -0,0 +1,133 @@ +;;; Copyright © 2020 John Soo +;;; +;;; 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 . + +(define-module (gnu packages dhall) + #:use-module (gnu packages) + #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages haskell-check) + #:use-module (gnu packages haskell-crypto) + #:use-module (gnu packages haskell-web) + #:use-module (guix download) + #:use-module (guix build-system haskell) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public dhall + (package + (name "dhall") + (version "1.31.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/dhall/dhall-" + version + ".tar.gz")) + (sha256 + (base32 + "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc")) + (patches (search-patches "dhall-remove-network-tests.patch")))) + (build-system haskell-build-system) + (inputs + `(("ghc-aeson" ,ghc-aeson) + ("ghc-aeson-pretty" ,ghc-aeson-pretty) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) + ("ghc-atomic-write" ,ghc-atomic-write-0.2.0.7) + ("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-cborg" ,ghc-cborg) + ("ghc-cborg-json" ,ghc-cborg-json) + ("ghc-contravariant" ,ghc-contravariant) + ("ghc-data-fix" ,ghc-data-fix) + ("ghc-diff" ,ghc-diff) + ("ghc-dotgen" ,ghc-dotgen) + ("ghc-either" ,ghc-either) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable) + ("ghc-lens-family-core" ,ghc-lens-family-core) + ("ghc-megaparsec" ,ghc-megaparsec) + ("ghc-memory" ,ghc-memory) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-parsers" ,ghc-parsers) + ("ghc-parser-combinators" ,ghc-parser-combinators) + ("ghc-prettyprinter" ,ghc-prettyprinter-1.6) + ("ghc-prettyprinter-ansi-terminal" ,ghc-prettyprinter-ansi-terminal) + ("ghc-pretty-simple" ,ghc-pretty-simple) + ("ghc-profunctors" ,ghc-profunctors) + ("ghc-repline" ,ghc-repline-0.3) + ("ghc-serialise" ,ghc-serialise) + ("ghc-scientific" ,ghc-scientific) + ("ghc-text-manipulate" ,ghc-text-manipulate) + ("ghc-th-lift-instances" ,ghc-th-lift-instances) + ("ghc-transformers-compat" ,ghc-transformers-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-uri-encode" ,ghc-uri-encode) + ("ghc-vector" ,ghc-vector) + ("ghc-cryptonite" ,ghc-cryptonite) + ("ghc-http-types" ,ghc-http-types) + ("ghc-http-client" ,ghc-http-client) + ("ghc-http-client-tls" ,ghc-http-client-tls))) + (native-inputs + `(("ghc-foldl" ,ghc-foldl) + ("ghc-generic-random" ,ghc-generic-random-1.3.0.1) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-quickcheck-instances" ,ghc-quickcheck-instances) + ("ghc-semigroups" ,ghc-semigroups) + ("ghc-special-values" ,ghc-special-values) + ("ghc-spoon" ,ghc-spoon) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-expected-failure" ,ghc-tasty-expected-failure) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-turtle" ,ghc-turtle) + ("ghc-mockery" ,ghc-mockery) + ("ghc-doctest" ,ghc-doctest))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Remove tests that require network + (add-after 'unpack 'remove-more-tests + (lambda _ + (substitute* "src/Dhall/Tutorial.hs" + (((string-append + "-- >>> input auto " + "\"https://raw.githubusercontent.com/dhall-lang" + "/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/" + "examples/True\" :: IO Bool")) + "") + (((string-append + "-- >>> input auto " + "\"False == " + "https://raw.githubusercontent.com/dhall-lang" + "/dhall-haskell/18e4e9a18dc53271146df3ccf5b4177c3552236b/" + "examples/True\" :: IO Bool")) + "")) + #t))))) + (home-page + "https://dhall-lang.org/") + (synopsis + "Configuration language guaranteed to terminate") + (description + "Dhall is an explicitly typed configuration language that is not Turing +complete. Despite being Turing incomplete, Dhall is a real programming +language with a type-checker and evaluator. + +Use this library to parse, type-check, evaluate, and pretty-print the Dhall +configuration language. This package also includes an executable which +type-checks a Dhall file and reduces the file to a fully evaluated normal +form.") + (license license:bsd-3))) diff --git a/gnu/packages/patches/dhall-remove-network-tests.patch b/gnu/packages/patches/dhall-remove-network-tests.patch new file mode 100644 index 0000000000..c260e7844d --- /dev/null +++ b/gnu/packages/patches/dhall-remove-network-tests.patch @@ -0,0 +1,97 @@ +diff a/dhall-lang/tests/import/failure/referentiallyInsane.dhall b/dhall-lang/tests/import/failure/referentiallyInsane.dhall +--- a/dhall-lang/tests/import/failure/referentiallyInsane.dhall ++++ /dev/null +@@ -1,13 +0,0 @@ +-{- The following remote import attempts to import an environment variable, which +- must be disallowed by the referential sanity check +- +- One reason for doing this is to protect against remote imports exfiltrating +- environment variables (such as via custom headers). Only referentially +- opaque imports (i.e. local imports) have permission to refer to other +- referentially opaque imports in order to protect against this attack. +- +- The referential sanity check also ensures that remote imports are +- referentially transparent. Or in other words, any import that is globally +- addressable must have a meaning that is not context-sensitive. +--} +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/data/referentiallyOpaque.dhall +diff a/dhall-lang/tests/import/success/customHeadersA.dhall b/dhall-lang/tests/import/success/customHeadersA.dhall +--- a/dhall-lang/tests/import/success/customHeadersA.dhall ++++ /dev/null +@@ -1,3 +0,0 @@ +-https://httpbin.org/user-agent +- using [ { mapKey = "User-Agent", mapValue = "Dhall" } ] +- as Text +diff a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall b/dhall-lang/tests/import/success/noHeaderForwardingA.dhall +--- a/dhall-lang/tests/import/success/noHeaderForwardingA.dhall ++++ /dev/null +@@ -1,6 +0,0 @@ +-{- The purpose of this test is to verify that the custom headers supplied to +- this import are not forwarded to the transitive import of +- https://httpbin.org/user-agent +--} +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/master/tests/import/success/customHeadersA.dhall +- using [ { mapKey = "User-Agent", mapValue = "Secret" } ] +diff a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall b/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall +--- a/dhall-lang/tests/import/success/unit/RemoteAsTextA.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/example.txt as Text +diff a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall b/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall +--- a/dhall-lang/tests/import/success/unit/SimpleRemoteA.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain1A.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simpleLocation.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain2A.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChain3A.dhall ++++ /dev/null +@@ -1 +0,0 @@ +-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainEnvA.dhall ++++ /dev/null +@@ -1,5 +0,0 @@ +-{- +- This test verifies that `env:VAR as Location` isn't rejected as referentially opaque, +- as `env:VAR` on its own would. +--} +-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/EnvA.dhall +diff a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall b/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall +--- a/dhall-lang/tests/import/success/unit/asLocation/RemoteChainMissingA.dhall ++++ /dev/null +@@ -1,6 +0,0 @@ +-{- This test verifies that `missing as Location` succeeds when chained since: +- * The `missing` is never actually resolved (due to the `as Location`) +- * The `missing` should be treated as referentially transparent (and therefore +- be a valid transitive dependency of a remote import) +--} +-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/MissingA.dhall +diff a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsA.dhall +--- a/dhall-lang/tests/type-inference/success/CacheImportsA.dhall ++++ /dev/null +@@ -1,6 +0,0 @@ +-{- +- This URL returns (probably) a different result for each request. This test +- ensures that import results for a given URL are correctly cached within an +- execution of dhall. +--} +-let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text in 0 +diff a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall b/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall +--- a/dhall-lang/tests/type-inference/success/CacheImportsCanonicalizeA.dhall ++++ /dev/null +@@ -1,5 +0,0 @@ +-{- +- This URL returns (probably) a different result for each request. This test +- ensures that import locations are canonicalized before being cached. +--} +-let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/../csrng/csrng.php?min=0&max=1000 as Text in 0 -- cgit 1.4.1 From 60b81ec2f324c18d026e9ae05199493bc644960b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 May 2020 18:28:23 +0200 Subject: gnu: emacs-2048-game: Update home page. * gnu/packages/emacs-xyz.scm (emacs-2048-game)[home-page]: Update URL. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e845ca9097..7f34c691df 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5641,7 +5641,7 @@ orange and red as accent colors.") (base32 "0gy2pvz79whpavp4jmz8h9krzn7brmvv3diixi1d4w51pcdvaldd")))) (build-system emacs-build-system) - (home-page "https://bitbucket.org/zck/2048.el") + (home-page "https://hg.sr.ht/~zck/game-2048") (synopsis "Implementation of the game 2048 in Emacs Lisp") (description "This program is an implementation of 2048 for Emacs. -- cgit 1.4.1 From 36640207c9543e48cd6daa92930f023f80065a5d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 May 2020 16:33:09 +0200 Subject: quirks: Build 'compute-guix-derivation' modules with 2.2 when needed. Fixes . Reported by Jan Nieuwenhuizen . * guix/quirks.scm (requires-guile-2.2?): New procedure. (%quirks): Add it. (%bug-41214-patch): Comment. --- guix/quirks.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/guix/quirks.scm b/guix/quirks.scm index d180bd2c09..d292f4e932 100644 --- a/guix/quirks.scm +++ b/guix/quirks.scm @@ -57,6 +57,18 @@ #f (apply throw args))))) +(define (requires-guile-2.2? source) + "Return true if SOURCE uses Guile 2.2 for the shebang of +'compute-guix-derivation'." + (define content + (call-with-input-file (string-append source "/" %self-build-file) + read-string)) + + ;; The 'find-best-packages-by-name' call is inserted by %BUG-41214-PATCH. + (string-contains content + (object->string + '(find-best-packages-by-name "guile" "2.2")))) + (define (guile-2.2.4) (module-ref (resolve-interface '(gnu packages guile)) 'guile-2.2.4)) @@ -66,7 +78,8 @@ ;; about specific Guile versions that old Guix revisions might need to use ;; just to be able to build and run the trampoline in %SELF-BUILD-FILE. See ;; - `((,syscalls-reexports-local-variables? . ,guile-2.2.4))) + `((,syscalls-reexports-local-variables? . ,guile-2.2.4) + (,requires-guile-2.2? . ,guile-2.2.4))) ;;; @@ -143,6 +156,7 @@ corresponds to the given Guix COMMIT, a SHA1 hexadecimal string." (define (build-with-guile-2.2 source) (substitute* (string-append source "/" %self-build-file) (("\\(default-guile\\)") + ;; Note: This goes hand in hand with the 'requires-guile-2.2?' quirk. (object->string '(car (find-best-packages-by-name "guile" "2.2")))) (("\\(find-best-packages-by-name \"guile-gcrypt\" #f\\)") (object->string '(find-best-packages-by-name "guile2.2-gcrypt" #f)))) -- cgit 1.4.1 From b56cbe8974c328a6c7bc28906478ef1b191ada4c Mon Sep 17 00:00:00 2001 From: Jesse Dowell Date: Fri, 29 May 2020 16:39:39 +0200 Subject: syscalls: Properly match %HOST-TYPE. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Regression introduced in 0d371c633f7308cfde2432d6119d386a5c63198c. * guix/build/syscalls.scm (write-socket-address!) (read-socket-address): Use 'string-contains' instead of 'string-suffix?'. Signed-off-by: Ludovic Courtès --- guix/build/syscalls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 8070c5546f..6be322d68f 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1404,7 +1404,7 @@ bytevector BV at INDEX." (error "unsupported socket address" sockaddr))))) (define write-socket-address! - (if (string-suffix? "linux-gnu" %host-type) + (if (string-contains %host-type "linux-gnu") write-socket-address!/linux write-socket-address!/hurd)) @@ -1436,7 +1436,7 @@ bytevector BV at INDEX." (vector family))))) (define read-socket-address - (if (string-suffix? "linux-gnu" %host-type) + (if (string-contains %host-type "linux-gnu") read-socket-address/linux read-socket-address/hurd)) -- cgit 1.4.1 From 17a102332a253f0e3b1f511fa7bda2094264a77c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 May 2020 16:44:27 +0200 Subject: syscalls: 'terminal-dimension' ignores EPERM. Fixes . Reported by Tobias Geerinckx-Rice . * guix/build/syscalls.scm (terminal-dimension): Add EPERM to the list of errno code for FALL-BACK. --- guix/build/syscalls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 6be322d68f..d69b178a0a 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -2052,8 +2052,8 @@ correspond to a terminal, return the value returned by FALL-BACK." ;; would return EINVAL instead in some cases: ;; . ;; Furthermore, some FUSE file systems like unionfs return ENOSYS for - ;; that ioctl. - (if (memv errno (list ENOTTY EINVAL ENOSYS)) + ;; that ioctl, and bcachefs returns EPERM. + (if (memv errno (list ENOTTY EINVAL ENOSYS EPERM)) (fall-back) (apply throw args)))))) -- cgit 1.4.1 From e65a44649e8d7698c4a888f1de625a67052520e9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 May 2020 18:19:07 +0200 Subject: maint: Git pre-push hook runs "make authenticate check-channel-news". * etc/git/pre-push: Change to run "make authenticate check-channel-news". --- etc/git/pre-push | 49 +++++-------------------------------------------- 1 file changed, 5 insertions(+), 44 deletions(-) diff --git a/etc/git/pre-push b/etc/git/pre-push index 9206a2dfe5..59294f0ffb 100755 --- a/etc/git/pre-push +++ b/etc/git/pre-push @@ -1,7 +1,6 @@ #!/bin/sh -# This hook script prevents the user from pushing to Savannah if any of the new -# commits' OpenPGP signatures cannot be verified. +# A hook script that prevents the user from pushing unsigned commits. # Called by "git push" after it has checked the remote status, but before # anything has been pushed. If this script exits with a non-zero status nothing @@ -19,51 +18,13 @@ # # -z40=0000000000000000000000000000000000000000 - # Only use the hook when pushing to Savannah. case "$2" in -*git.sv.gnu.org*) - break + *.gnu.org*) + exec make authenticate check-channel-news + exit 127 ;; -*) + *) exit 0 ;; esac - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # We are pushing a new branch. To prevent wasting too - # much time for this relatively rare case, we examine - # all commits since the first signed commit, rather than - # the full history. This check *will* fail, and the user - # will need to temporarily disable the hook to push the - # new branch. - range="e3d0fcbf7e55e8cbe8d0a1c5a24d73f341d7243b..$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Verify the signatures of all commits being pushed. - ret=0 - for commit in $(git rev-list $range) - do - if ! git verify-commit $commit >/dev/null 2>&1 - then - printf "%s failed signature check\n" $commit - ret=1 - fi - done - exit $ret - fi -done - -exit 0 -- cgit 1.4.1 From e70e097882699865f63eabc5fb29b4fe4468a97b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 26 May 2020 15:30:25 +0200 Subject: size: Document that positional arguments can be store items. * guix/scripts/size.scm (show-help): Mention STORE-ITEM positional argument alternative. --- guix/scripts/size.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index 2446b84587..c42f4f7782 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -230,8 +230,8 @@ the name of a PNG file." ;;; (define (show-help) - (display (G_ "Usage: guix size [OPTION]... PACKAGE -Report the size of PACKAGE and its dependencies.\n")) + (display (G_ "Usage: guix size [OPTION]... PACKAGE|STORE-ITEM +Report the size of the PACKAGE or STORE-ITEM, with its dependencies.\n")) (display (G_ " --substitute-urls=URLS fetch substitute from URLS if they are authorized")) -- cgit 1.4.1 From 776409c5069de949da328b769132fa009477668c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 26 May 2020 15:36:58 +0200 Subject: doc: Add example to calculate the size a system. * doc/guix.texi (Invoking `guix size'): Add guix size example for store item. --- doc/guix.texi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 5b9942d420..ba5729bd41 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10112,6 +10112,13 @@ libraries. (That libc and GCC's libraries represent a large fraction of the closure is not a problem @i{per se} because they are always available on the system anyway.) +Since the command also accepts store file names, assessing the size of +a build result is straightforward: + +@example +guix size $(guix system build config.scm) +@end example + When the package(s) passed to @command{guix size} are available in the store@footnote{More precisely, @command{guix size} looks for the @emph{ungrafted} variant of the given package(s), as returned by -- cgit 1.4.1 From ac2fc1340647298874f35b4be5861d1e437d0a24 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 29 May 2020 23:42:48 +0530 Subject: gnu: aptdec: Update source and home page URIs. * gnu/packages/radio.scm (aptdec)[source, home-page]: Update URI. --- gnu/packages/radio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index b3a7cc0e97..53eb3da147 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2019, 2020 Christopher Howard ;;; Copyright © 2019, 2020 Evan Straw ;;; Copyright © 2020 Guillaume Le Vaillant @@ -192,7 +192,7 @@ memory contents between them.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/csete/aptdec") + (url "https://github.com/Xerbo/aptdec") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -213,7 +213,7 @@ memory contents between them.") (let ((out (assoc-ref outputs "out"))) (install-file "atpdec" (string-append out "/bin"))) #t))))) - (home-page "https://github.com/csete/aptdec") + (home-page "https://github.com/Xerbo/aptdec") (synopsis "NOAA Automatic Picture Transmission (APT) decoder") (description "Aptdec decodes Automatic Picture Transmission (APT) images. These are medium resolution images of the Earth transmitted by, among other -- cgit 1.4.1 From 319a73e7b63ab939bd357666245c14ff241d0c1f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:01:57 +0530 Subject: gnu: aptdec: Do not hard-code CC=gcc. * gnu/packages/radio.scm (aptdec)[arguments]: Do not hard-code CC=gcc in the make-flags. Use the compiler appropriate for the target. --- gnu/packages/radio.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 53eb3da147..d18af8f75c 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -203,7 +203,15 @@ memory contents between them.") `(("libpng" ,libpng) ("libsndfile" ,libsndfile))) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (list + (string-append "CC=" + (if ,(%current-target-system) + (string-append (assoc-ref %build-inputs "cross-gcc") + "/bin/" ,(%current-target-system) "-gcc") + "gcc")) + (string-append "PREFIX=" %output) + (string-append "RPM_BUILD_ROOT=" %output)) #:tests? #f ; no tests #:phases (modify-phases %standard-phases -- cgit 1.4.1 From 41a2d6a8b9294a6eb8e97aaefd569e755f5f461e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:35:06 +0530 Subject: gnu: emacs-evil: Update to 1.14.0. * gnu/packages/emacs-xyz.scm (emacs-evil): Update to 1.14.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7f34c691df..4f7b4cf6cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8350,7 +8350,7 @@ news items, openrc and runscripts.") (define-public emacs-evil (package (name "emacs-evil") - (version "1.2.14") + (version "1.14.0") (source (origin (method git-fetch) @@ -8360,7 +8360,7 @@ news items, openrc and runscripts.") (file-name (git-file-name name version)) (sha256 (base32 - "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q")))) + "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p")))) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 57fa9cd8206ffb2afefd5fb66326cfdc7c156714 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:45:55 +0530 Subject: gnu: fortune-mod: Update to 2.22.0. * gnu/packages/games.scm (fortune-mod): Update to 2.22.0. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ee7f001f20..1c27561834 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Steve Webber ;;; Copyright © 2017 Adonay "adfeno" Felipe Nogueira -;;; Copyright © 2017, 2018 Arun Isaac +;;; Copyright © 2017, 2018, 2020 Arun Isaac ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2019 nee ;;; Copyright © 2017 Clément Lassieur @@ -6376,7 +6376,7 @@ original.") (define-public fortune-mod (package (name "fortune-mod") - (version "2.12.0") + (version "2.22.0") (source (origin (method git-fetch) @@ -6386,7 +6386,7 @@ original.") (file-name (git-file-name name version)) (sha256 (base32 - "0laxgqsdg7kvpvvm1f54b94ga9r0cr9g3ffii8avg8fy65x6pzc9")))) + "17h2g35j8nzljsqaqhrsx75jakbmlqnsa150g2xw414fcbnjbyps")))) (build-system cmake-build-system) (arguments `(#:test-target "check" -- cgit 1.4.1 From 0c82f6ad0ef92a5ee4b181ab9033dd3aaf2813e7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 May 2020 22:46:58 +0200 Subject: gnu: cdogs-sdl: Update to 0.8.0. * gnu/packages/games.scm (cdogs-sdl): Update to 0.8.0. [native-inputs]: Add `pkg-config'. [inputs]: Add `gtk+'. --- gnu/packages/games.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1c27561834..210cf8ab58 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4819,24 +4819,27 @@ emerges from a sewer hole and pulls her below ground.") (define-public cdogs-sdl (package (name "cdogs-sdl") - (version "0.6.9") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cxong/cdogs-sdl.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13gyv2hzk43za1n3lsjnd5v64xlzfzq7n10scd1rcbsnk1n007zr")))) + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cxong/cdogs-sdl.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vx37zb2iw7sfw5a2bs97ydlmb301nvy485ybdm8g46c5hn9s13c")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list (string-append "-DCDOGS_DATA_DIR=" (assoc-ref %outputs "out") "/share/cdogs-sdl/")))) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs - `(("mesa" ,mesa) + `(("gtk+" ,gtk+) + ("mesa" ,mesa) ("sdl2" ,sdl2) ("sdl2-image" ,sdl2-image) ("sdl2-mixer" ,sdl2-mixer))) -- cgit 1.4.1 From 91c8b23e571b90e2d263194c9fbb2b05c0475dc1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 29 May 2020 23:02:59 +0200 Subject: gnu: popt: Remove defunct mirror. * gnu/packages/popt.scm (popt)[source](uri): Remove the canonical rpm5.org URI. --- gnu/packages/popt.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 2e77368d20..95a9ea9211 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -62,13 +62,11 @@ line syntax.") (version "1.16") (source (origin (method url-fetch) - (uri (list (string-append "http://rpm5.org/files/popt/popt-" - version ".tar.gz") - ;; The rpm5.org domain does not resolve since 2019-06-13, - ;; so fallback to Debians copy. - (string-append "https://deb.debian.org/debian/pool/main" - "/p/popt/popt_" version ".orig.tar.gz"))) - ;; Ensure the file name stays the same. + ;; The original rpm5.org domain is not accessible since + ;; 2019-06-13, so use Debians copy of the tarball. + (uri (string-append "https://deb.debian.org/debian/pool/main" + "/p/popt/popt_" version ".orig.tar.gz")) + ;; Ensure the file name stays the same to prevent rebuilds. (file-name (string-append "popt-" version ".tar.gz")) (sha256 (base32 -- cgit 1.4.1 From fa3e71d67474775da193f5bf3d6d0b329522dbbb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 29 May 2020 23:23:38 +0200 Subject: gnu: mpg123: Update to 1.26.0. * gnu/packages/mp3.scm (mpg123): Update to 1.26.0. [inputs]: Re-order alphabetically. --- gnu/packages/mp3.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index ae234afa29..60ef5560a1 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -309,22 +309,24 @@ This package contains the binary.") (define-public mpg123 (package (name "mpg123") - (version "1.25.13") - (source (origin - (method url-fetch) - (uri (list (string-append "mirror://sourceforge/mpg123/mpg123/" - version "/mpg123-" version ".tar.bz2") - (string-append - "https://www.mpg123.org/download/mpg123-" - version ".tar.bz2"))) - (sha256 - (base32 - "02l915jq0ymndb082g6w89bpf66z04ifa1lr7ga3yycw6m46hc4h")))) + (version "1.26.0") + (source + (origin + (method url-fetch) + (uri (list (string-append "mirror://sourceforge/mpg123/mpg123/" + version "/mpg123-" version ".tar.bz2") + (string-append + "https://www.mpg123.org/download/mpg123-" + version ".tar.bz2"))) + (sha256 + (base32 "0s62k45mz6264h0ljkrrs9vyagvl78q9pxhi7dnbk56pmgs0br74")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("pulseaudio" ,pulseaudio) - ("alsa-lib" ,alsa-lib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("pulseaudio" ,pulseaudio))) (home-page "https://www.mpg123.org/") (synopsis "Console MP3 player and decoder library") (description -- cgit 1.4.1 From 031315e4f0fbc4e04ffc8adee04128c23173a1f7 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:56:42 +0530 Subject: gnu: glade3: Update to 3.36.0. * gnu/packages/gnome.scm (glade3): Update to 3.36.0. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9f7b3eeecb..1745bf7906 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -2090,7 +2091,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.") (define-public glade3 (package (name "glade") - (version "3.22.1") + (version "3.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2098,7 +2099,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.") name "-" version ".tar.xz")) (sha256 (base32 - "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z")))) + "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; needs X, GL, and software rendering -- cgit 1.4.1