From 876a8d987085b8c64f32c8a320e4219575af285c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 14 Jun 2020 13:10:40 +0200 Subject: [PATCH 001/241] installer: final: Make sure 'bold' font files are loaded. * gnu/installer/newt/final.scm (run-install-shell): Force kmscon to open 'bold' font files, before the cow-store overlay is mounted. --- gnu/installer/newt/final.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/installer/newt/final.scm b/gnu/installer/newt/final.scm index 5cb4f6816d..fa8d6fea71 100644 --- a/gnu/installer/newt/final.scm +++ b/gnu/installer/newt/final.scm @@ -25,6 +25,7 @@ #:use-module (gnu installer newt page) #:use-module (gnu installer newt utils) #:use-module (guix i18n) + #:use-module (guix colors) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (ice-9 match) @@ -101,6 +102,13 @@ a specific step, or restart the installer.")) #:key (users '())) (clear-screen) (newt-suspend) + ;; XXX: Force loading 'bold' font files before mouting the + ;; cow-store. Otherwise, if the file is loaded by kmscon after the cow-store + ;; in mounted, it will be necessary to kill kmscon to umount to cow-store. + (display + (colorize-string + (format #f (G_ "Installing Guix System ...~%")) + (color BOLD))) (let ((install-ok? (install-system locale #:users users))) (newt-resume) install-ok?)) From 80f92866e3a321bb8f8c5fa04744a3a93cfa6034 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 14 Jun 2020 14:16:37 +0200 Subject: [PATCH 002/241] scripts: system: Fix "init" command. This is a follow-up of 7ca533c7237622d70b423033c4506217d9ce4014. The introduced "target" variable is shadowing the target argument. * guix/scripts/system.scm (perform-action): Rename "target" variable to "target*". --- guix/scripts/system.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 6769a602b1..212b49f008 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -802,8 +802,8 @@ static checks." (check-initrd-modules os))) (mlet* %store-monad - ((target (current-target-system)) - (image -> (find-image file-system-type target)) + ((target* (current-target-system)) + (image -> (find-image file-system-type target*)) (sys (system-derivation-for-action os image action #:file-system-type file-system-type #:image-size image-size From 39b63d06e120ee25f72fa74d22173bf092849382 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 14 Jun 2020 17:57:30 +0200 Subject: [PATCH 003/241] system: image: Remove left-over. * gnu/system/image.scm: Remove a left-over since maybe-with-target procedure was removed. --- gnu/system/image.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 1bda25fd7f..fa736b0fca 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -573,8 +573,4 @@ addition of the record." (else efi-disk-image))))) -;;; Local Variables: -;;; eval: (put 'maybe-with-target 'scheme-indent-function 1) -;;; End: - ;;; image.scm ends here From c9f6e2e5bdff186583bdc360832b57f4c56e3427 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 14 Jun 2020 17:59:07 +0200 Subject: [PATCH 004/241] system: image: Make sure target is set. * gnu/system/image.scm (system-image): Move "with-parameters" call so that it encapsulates "operating-system-bootcfg". --- gnu/system/image.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index fa736b0fca..26ffa028fe 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -524,15 +524,15 @@ it can be used for bootloading." "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)) + (define target (image-target image)) - (let* ((os (operating-system-for-image image)) - (image* (image-with-os image os)) - (target (image-target image)) - (register-closures? (has-guix-service-type? os)) - (bootcfg (operating-system-bootcfg os)) - (bootloader (bootloader-configuration-bootloader - (operating-system-bootloader os)))) - (with-parameters ((%current-target-system target)) + (with-parameters ((%current-target-system target)) + (let* ((os (operating-system-for-image image)) + (image* (image-with-os image os)) + (register-closures? (has-guix-service-type? os)) + (bootcfg (operating-system-bootcfg os)) + (bootloader (bootloader-configuration-bootloader + (operating-system-bootloader os)))) (case (image-format image) ((disk-image) (system-disk-image image* From 5e9cf93364d87c70f8bfad915417cd75d21c0fed Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 10 Jun 2020 00:10:28 +0200 Subject: [PATCH 005/241] services: Add 'hurd-vm service-type'. * gnu/services/virtualization.scm (hurd-vm-shepherd-service, hurd-vm-disk-image): New procedures. (%hurd-vm-operating-system, hurd-vm-service-type): New variables. (): New record type. * doc/guix.texi (Virtualization Services): Document it. * gnu/services/shepherd.scm (scm->go): Use let-system, remove FIXME. Fixes fixes cross-building of shepherd modules for the Hurd image. --- doc/guix.texi | 83 +++++++++++++++++++++ gnu/services/shepherd.scm | 3 +- gnu/services/virtualization.scm | 124 ++++++++++++++++++++++++++++++-- 3 files changed, 201 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 333dd703de..510347b222 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24594,6 +24594,89 @@ Return true if @var{obj} is a platform object. Return the name of @var{platform}---a string such as @code{"arm"}. @end deffn + +@subsubheading The Hurd in a Virtual Machine + +@cindex @code{hurd} +@cindex the Hurd + +Service @code{hurd-vm} provides support for running GNU/Hurd in a +virtual machine (VM), a so-called ``Childhurd''. The virtual machine is +a Shepherd service that can be controlled with commands such as: + +@example +herd start hurd-vm +herd stop childhurd +@end example + +The given GNU/Hurd operating system configuration is cross-compiled. + +@defvr {Scheme Variable} hurd-vm-service-type +This is the type of the Hurd in a Virtual Machine service. Its value +must be a @code{hurd-vm-configuration} object, which specifies the +operating system (@pxref{operating-system Reference}) and the disk size +for the Hurd Virtual Machine, the QEMU package to use as well as the +options for running it. + +For example: + +@lisp +(service hurd-vm-service-type + (hurd-vm-configuration + (disk-size (* 5000 (expt 2 20))) ;5G + (memory-size 1024))) ;1024MiB +@end lisp + +would create a disk image big enough to build GNU@tie{}Hello, with some +extra memory. +@end defvr + +@deftp {Data Type} hurd-vm-configuration +The data type representing the configuration for +@code{hurd-vm-service-type}. + +@table @asis +@item @code{os} (default: @var{%hurd-vm-operating-system}) +The operating system to instantiate. This default is bare-bones with a +permissive OpenSSH secure shell daemon listening on port 2222 +(@pxref{Networking Services, @code{openssh-service-type}}). + +@item @code{qemu} (default: @code{qemu-minimal}) +The QEMU package to use. + +@item @code{image} (default: @var{hurd-vm-disk-image}) +The procedure used to build the disk-image built from this +configuration. + +@item @code{disk-size} (default: @code{'guess}) +The size of the disk image. + +@item @code{memory-size} (default: @code{512}) +The memory size of the Virtual Machine in mebibytes. + +@item @code{options} (default: @code{'("--device"} @code{"rtl8139,netdev=net0"} @ + @code{"--netdev"} @ + @code{"user,id=net0,hostfwd=tcp:127.0.0.1:20022-:2222,hostfwd=tcp:127.0.0.1:25900-:5900"} @ + @code{"--snapshot"} @ + @code{"--hda")}) +The extra options for running QEMU. +@end table +@end deftp + +Note that by default the VM image is volatile, i.e., once stopped the +contents are lost. If you want a stateful image instead, override the +configuration's @code{image} and @code{options} without +the @code{--snapshot} flag using something along these lines: + +@lisp +(service hurd-vm-service-type + (hurd-vm-configuration + (image (const "/out/of/store/writable/hurd.img")) + (options '("--device" "rtl8139,netdev=net0" + "--netdev" + "user,id=net0,hostfwd=tcp:127.0.0.1:20022-:2222")))) +@end lisp + @node Version Control Services @subsection Version Control Services diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 77c4d0a8be..e14ceca231 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -266,8 +266,7 @@ stored." (define (scm->go file) "Compile FILE, which contains code to be loaded by shepherd's config file, and return the resulting '.go' file." - ;; FIXME: %current-target-system may not be bound - (let ((target (%current-target-system))) + (let-system (system target) (with-extensions (list shepherd) (computed-file (string-append (basename (scheme-file-name file) ".scm") ".go") diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 989e439d5d..4e96607680 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ryan Moe ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,24 +19,41 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu services virtualization) - #:use-module (gnu services) - #:use-module (gnu services configuration) + #:use-module (gnu bootloader) + #:use-module (gnu bootloader grub) + #:use-module (gnu image) + #:use-module (gnu packages admin) + #:use-module (gnu packages ssh) + #:use-module (gnu packages virtualization) #:use-module (gnu services base) + #:use-module (gnu services configuration) #:use-module (gnu services dbus) #:use-module (gnu services shepherd) - #:use-module (gnu system shadow) + #:use-module (gnu services ssh) + #:use-module (gnu services) #:use-module (gnu system file-systems) - #:use-module (gnu packages admin) - #:use-module (gnu packages virtualization) - #:use-module (guix records) + #:use-module (gnu system hurd) + #:use-module (gnu system image) + #:use-module (gnu system shadow) + #:use-module (gnu system) + #:use-module (guix derivations) #:use-module (guix gexp) + #:use-module (guix monads) #:use-module (guix packages) + #:use-module (guix records) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) - #:export (libvirt-configuration + #:export (%hurd-vm-operating-system + hurd-vm-configuration + hurd-vm-service-type + + libvirt-configuration libvirt-service-type virtlog-configuration virtlog-service-type @@ -773,3 +791,95 @@ given QEMU package." "This service supports transparent emulation of binaries compiled for other architectures using QEMU and the @code{binfmt_misc} functionality of the kernel Linux."))) + + +;;; +;;; The Hurd in VM service: a Childhurd. +;;; + +(define %hurd-vm-operating-system + (operating-system + (inherit %hurd-default-operating-system) + (host-name "childhurd") + (timezone "Europe/Amsterdam") + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (target "/dev/vda") + (timeout 0))) + (services (cons* + (service openssh-service-type + (openssh-configuration + (openssh openssh-sans-x) + (use-pam? #f) + (port-number 2222) + (permit-root-login #t) + (allow-empty-passwords? #t) + (password-authentication? #t))) + %base-services/hurd)))) + +(define-record-type* + hurd-vm-configuration make-hurd-vm-configuration + hurd-vm-configuration? + (os hurd-vm-configuration-os ; + (default %hurd-vm-operating-system)) + (qemu hurd-vm-configuration-qemu ; + (default qemu-minimal)) + (image hurd-vm-configuration-image ;string + (thunked) + (default (hurd-vm-disk-image this-record))) + (disk-size hurd-vm-configuration-disk-size ;number or 'guess + (default 'guess)) + (memory-size hurd-vm-configuration-memory-size ;number + (default 512)) + (options hurd-vm-configuration-options ;list of string + (default + `("--device" "rtl8139,netdev=net0" + "--netdev" ,(string-append + "user,id=net0" + ",hostfwd=tcp:127.0.0.1:20022-:2222" + ",hostfwd=tcp:127.0.0.1:25900-:5900") + "--snapshot" + "--hda")))) + +(define (hurd-vm-disk-image config) + "Return a disk-image for the Hurd according to CONFIG." + (let ((os (hurd-vm-configuration-os config)) + (disk-size (hurd-vm-configuration-disk-size config))) + (system-image + (image + (inherit hurd-disk-image) + (size disk-size) + (operating-system os))))) + +(define (hurd-vm-shepherd-service config) + "Return a for a Hurd in a Virtual Machine with CONFIG." + + (let ((image (hurd-vm-configuration-image config)) + (qemu (hurd-vm-configuration-qemu config)) + (memory-size (hurd-vm-configuration-memory-size config)) + (options (hurd-vm-configuration-options config))) + + (define vm-command + #~(list + (string-append #$qemu "/bin/qemu-system-i386") + #$@(if (file-exists? "/dev/kvm") '("--enable-kvm") '()) + "-m" (number->string #$memory-size) + #$@options + #+image)) + + (list + (shepherd-service + (documentation "Run the Hurd in a Virtual Machine: a Childhurd.") + (provision '(hurd-vm childhurd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor #$vm-command)) + (stop #~(make-kill-destructor)))))) + +(define hurd-vm-service-type + (service-type + (name 'hurd-vm) + (extensions (list (service-extension shepherd-root-service-type + hurd-vm-shepherd-service))) + (default-value (hurd-vm-configuration)) + (description + "Provide a Virtual Machine running the GNU/Hurd."))) From 526a0066ac243f9b740cd2df9e6bb56bcd51e378 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Jun 2020 12:57:35 -0700 Subject: [PATCH 006/241] gnu: diffoscope: Update to 147. * gnu/packages/diffoscope (diffoscope): Update to 147. --- 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 f6f402b315..51a1127783 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "146") + (version "147") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "07kd3vshf4wlm0mv3mp6ljbxjq80mcg52w5ks6si1gnpzfbfz07p")))) + "0vfj9zv9mh9fffnm3h721yfkrkksv6667x6xjihvmfs8j9javgaz")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases From 1b917f99b5fb2968a381ef0acd43db7f711f2db9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 14 Jun 2020 15:53:57 +0200 Subject: [PATCH 007/241] gnu: Add augustus. * gnu/packages/games.scm (augustus): New variable. --- gnu/packages/games.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 32d7d8d478..10ac8cb550 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1011,6 +1011,45 @@ does not include game data.") (license (list license:agpl3 license:zlib)))) ; ext/tinyfiledialogs +(define-public augustus + (package + (inherit julius) + (name "augustus") + (version (package-version julius)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Keriew/augustus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ii0w0iwa9zv5bbqfcps5mxifd796m6fw4gvjf09pkm3yjgqc0ag")) + ;; Remove unused bundled libraries. + (modules '((guix build utils))) + (snippet + '(begin + (with-directory-excursion "ext" + (for-each delete-file-recursively '("dirent" "png" "SDL2" "zlib"))) + #t)))) + (arguments + ;; No tests. See https://github.com/Keriew/augustus/issues/82. + `(#:tests? #f)) + (home-page "https://github.com/Keriew/augustus") + (synopsis "Re-implementation of Caesar III game engine with gameplay changes") + (description + "Fork of Julius, an engine for the a city-building real-time strategy +game Caesar III. Gameplay enhancements include: + +@itemize +@item roadblocks; +@item market special orders; +@item global labour pool; +@item partial warehouse storage; +@item increased game limits; +@item zoom controls. +@end itemize\n"))) + (define-public meandmyshadow (package (name "meandmyshadow") From c924e541390f9595d819edc33c19d979917c15ec Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Sun, 14 Jun 2020 09:00:12 +0200 Subject: [PATCH 008/241] guix repl: Add script execution. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/scripts/repl.scm: Add filename options for script execution. * doc/guix.texi (Invoking guix repl): Document it. * tests/guix-repl.sh: Test it. * Makefile.am: (SH_TESTS): Add it. Signed-off-by: Ludovic Courtès --- Makefile.am | 1 + doc/guix.texi | 51 +++++++++++++++++++++----- guix/scripts/repl.scm | 77 +++++++++++++++++++++++++-------------- tests/guix-repl.sh | 84 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 34 deletions(-) create mode 100644 tests/guix-repl.sh diff --git a/Makefile.am b/Makefile.am index 9cf9318e8a..8988cdfa12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -477,6 +477,7 @@ SH_TESTS = \ tests/guix-environment-container.sh \ tests/guix-graph.sh \ tests/guix-describe.sh \ + tests/guix-repl.sh \ tests/guix-lint.sh TESTS = $(SCM_TESTS) $(SH_TESTS) diff --git a/doc/guix.texi b/doc/guix.texi index 510347b222..d55eaff02c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -239,7 +239,7 @@ Programming Interface * Derivations:: Low-level interface to package derivations. * The Store Monad:: Purely functional interface to the store. * G-Expressions:: Manipulating build expressions. -* Invoking guix repl:: Fiddling with Guix interactively. +* Invoking guix repl:: Programming Guix in Guile Defining Packages @@ -5474,7 +5474,7 @@ package definitions. * Derivations:: Low-level interface to package derivations. * The Store Monad:: Purely functional interface to the store. * G-Expressions:: Manipulating build expressions. -* Invoking guix repl:: Fiddling with Guix interactively. +* Invoking guix repl:: Programming Guix in Guile @end menu @node Package Modules @@ -8248,12 +8248,47 @@ has an associated gexp compiler, such as a @code{}. @node Invoking guix repl @section Invoking @command{guix repl} -@cindex REPL, read-eval-print loop -The @command{guix repl} command spawns a Guile @dfn{read-eval-print loop} -(REPL) for interactive programming (@pxref{Using Guile Interactively,,, guile, -GNU Guile Reference Manual}). Compared to just launching the @command{guile} +@cindex REPL, read-eval-print loop, script +The @command{guix repl} command makes it easier to program Guix in Guile +by launching a Guile @dfn{read-eval-print loop} (REPL) for interactive +programming (@pxref{Using Guile Interactively,,, guile, +GNU Guile Reference Manual}), or by running Guile scripts +(@pxref{Running Guile Scripts,,, guile, +GNU Guile Reference Manual}). +Compared to just launching the @command{guile} command, @command{guix repl} guarantees that all the Guix modules and all its -dependencies are available in the search path. You can use it this way: +dependencies are available in the search path. + +The general syntax is: + +@example +guix repl @var{options} [@var{file} @var{args}] +@end example + +When a @var{file} argument is provided, @var{file} is +executed as a Guile scripts: + +@example +guix repl my-script.scm +@end example + +To pass arguments to the script, use @code{--} to prevent them from +being interpreted as arguments to @command{guix repl} itself: + +@example +guix repl -- my-script.scm --input=foo.txt +@end example + +To make a script executable directly from the shell, using the guix +executable that is on the user's search path, add the following two +lines at the top of the script: + +@example +@code{#!/usr/bin/env -S guix repl --} +@code{!#} +@end example + +Without a file name argument, a Guile REPL is started: @example $ guix repl @@ -8302,7 +8337,7 @@ Add @var{directory} to the front of the package module search path (@pxref{Package Modules}). This allows users to define their own packages and make them visible to -the command-line tool. +the script or REPL. @item -q Inhibit loading of the @file{~/.guile} file. By default, that diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index ff1f208894..e2679f4301 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020 Konrad Hinsen ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module (guix scripts) #:use-module (guix repl) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:use-module (ice-9 match) #:use-module (rnrs bytevectors) @@ -32,7 +34,8 @@ ;;; Commentary: ;;; -;;; This command provides a Guile REPL +;;; This command provides a Guile script runner and REPL in an environment +;;; that contains all the modules comprising Guix. (define %default-options `((type . guile))) @@ -63,8 +66,9 @@ (define (show-help) - (display (G_ "Usage: guix repl [OPTIONS...] -Start a Guile REPL in the Guix execution environment.\n")) + (display (G_ "Usage: guix repl [OPTIONS...] [-- FILE ARGS...] +In the Guix execution environment, run FILE as a Guile script with +command-line arguments ARGS. If no FILE is given, start a Guile REPL.\n")) (display (G_ " -t, --type=TYPE start a REPL of the given TYPE")) (display (G_ " @@ -135,12 +139,13 @@ call THUNK." (define (guix-repl . args) (define opts - ;; Return the list of package names. (args-fold* args %options (lambda (opt name arg result) (leave (G_ "~A: unrecognized option~%") name)) (lambda (arg result) - (leave (G_ "~A: extraneous argument~%") arg)) + (append `((script . ,arg) + (ignore-dot-guile . #t)) + result)) %default-options)) (define user-config @@ -148,28 +153,48 @@ call THUNK." (lambda (home) (string-append home "/.guile")))) - (with-error-handling - (let ((type (assoc-ref opts 'type))) - (call-with-connection (assoc-ref opts 'listen) - (lambda () - (case type - ((guile) - (save-module-excursion - (lambda () - (set-current-module user-module) - (when (and (not (assoc-ref opts 'ignore-dot-guile?)) - user-config - (file-exists? user-config)) - (load user-config)) + (define (set-user-module) + (set-current-module user-module) + (when (and (not (assoc-ref opts 'ignore-dot-guile?)) + user-config + (file-exists? user-config)) + (load user-config))) - ;; Do not exit repl on SIGINT. - ((@@ (ice-9 top-repl) call-with-sigint) - (lambda () - (start-repl)))))) - ((machine) - (machine-repl)) - (else - (leave (G_ "~a: unknown type of REPL~%") type)))))))) + (define script + (reverse + (filter-map (match-lambda + (('script . script) script) + (_ #f)) + opts))) + + (with-error-handling + + (unless (null? script) + ;; Run script + (save-module-excursion + (lambda () + (set-program-arguments script) + (set-user-module) + (load-in-vicinity "." (car script))))) + + (when (null? script) + ;; Start REPL + (let ((type (assoc-ref opts 'type))) + (call-with-connection (assoc-ref opts 'listen) + (lambda () + (case type + ((guile) + (save-module-excursion + (lambda () + (set-user-module) + ;; Do not exit repl on SIGINT. + ((@@ (ice-9 top-repl) call-with-sigint) + (lambda () + (start-repl)))))) + ((machine) + (machine-repl)) + (else + (leave (G_ "~a: unknown type of REPL~%") type))))))))) ;; Local Variables: ;; eval: (put 'call-with-connection 'scheme-indent-function 1) diff --git a/tests/guix-repl.sh b/tests/guix-repl.sh new file mode 100644 index 0000000000..e1c2b8241f --- /dev/null +++ b/tests/guix-repl.sh @@ -0,0 +1,84 @@ +# GNU Guix --- Functional package management for GNU +# Copyright © 2020 Simon Tournier +# Copyright © 2020 Konrad Hinsen +# +# 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 . + +# +# Test the `guix repl' command-line utility. +# + +guix repl --version + +test_directory="`mktemp -d`" +export test_directory +trap 'chmod -Rf +w "$test_directory"; rm -rf "$test_directory"' EXIT + +tmpfile="$test_directory/foo.scm" +rm -f "$tmpfile" +trap 'rm -f "$tmpfile"' EXIT + +module_dir="t-guix-repl-$$" +mkdir "$module_dir" +trap 'rm -rf "$module_dir"' EXIT + + +cat > "$tmpfile"< "$module_dir/foo.scm"< "$tmpfile"< "$tmpfile"< "$tmpfile"< Date: Tue, 2 Jun 2020 08:20:18 +0200 Subject: [PATCH 009/241] gnu: Add emacs-erc-status-sidebar. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index af379902a1..1d465ed66d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3289,6 +3289,31 @@ appropriate console.") IRC bouncer with ERC.") (license license:expat))) +(define-public emacs-erc-status-sidebar + (let ((commit "ea4189a1dbfe60117359c36e681ad7c389e2968c") + (revision "1")) + (package + (name "emacs-erc-status-sidebar") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/drewbarbs/erc-status-sidebar.git") + (commit commit))) + (sha256 + (base32 "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-seq" ,emacs-seq))) + (home-page "https://github.com/drewbarbs/erc-status-sidebar") + (synopsis "A hexchat-like activity overview for ERC channels") + (description + "This package is provides a hexchat-like status bar for joined +channels in ERC. It relies on the `erc-track' module, and displays +all the same information erc-track does in the mode line, but in an +alternative format.") + (license license:expat)))) + (define-public emacs-shut-up (package (name "emacs-shut-up") From 535581a72a3e3ec2fbb9a875be99a7455875bbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 14 Jun 2020 23:01:48 +0200 Subject: [PATCH 010/241] gnu: emacs-erc-status-sidebar: Placate 'guix lint'. * gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar)[source]: Add 'file-name'. [synopsis, description]: Adjust. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1d465ed66d..1973d73461 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3301,17 +3301,18 @@ IRC bouncer with ERC.") (uri (git-reference (url "https://github.com/drewbarbs/erc-status-sidebar.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-seq" ,emacs-seq))) (home-page "https://github.com/drewbarbs/erc-status-sidebar") - (synopsis "A hexchat-like activity overview for ERC channels") + (synopsis "Hexchat-like activity overview for ERC channels") (description - "This package is provides a hexchat-like status bar for joined -channels in ERC. It relies on the `erc-track' module, and displays -all the same information erc-track does in the mode line, but in an -alternative format.") + "This package provides a Hexchat-like status bar for joined channels in +ERC, an Emacs client for IRC (Internet Relay Chat). It relies on the +@code{erc-track} module, and displays all the same information +@code{erc-track} does in the mode line, but in an alternative format.") (license license:expat)))) (define-public emacs-shut-up From 4b52722838fa41bcc8e0344d2766d7130c203c92 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Tue, 1 Oct 2019 17:37:03 -0400 Subject: [PATCH 011/241] gnu: Add go-golang-org-x-oauth2. * gnu/packages/golang.scm (go-golang-org-x-oauth2): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a631ad4285..632769b769 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -811,6 +811,33 @@ time.") (home-page "https://godoc.org/golang.org/x/time/rate") (license license:bsd-3)))) +(define-public go-golang-org-x-oauth2 + (let ((commit "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33") + (revision "1")) + (package + (name "go-golang-org-x-oauth2") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/oauth2") + (commit commit))) + (file-name (string-append "go.googlesource.com-oauth2-" + version "-checkout")) + (sha256 + (base32 + "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/oauth2")) + (propagated-inputs + `(("go-golang-org-x-net" ,go-golang-org-x-net))) + (home-page "https://go.googlesource.com/oauth2") + (synopsis "Client implementation of the OAuth 2.0 spec") + (description "This package contains a client implementation for OAuth 2.0 + spec in Go.") + (license license:bsd-3)))) + (define-public go-github-com-burntsushi-toml (package (name "go-github-com-burntsushi-toml") From 9a3ddeea9826eae00310e1540b422babb68aff6a Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Tue, 1 Oct 2019 17:37:04 -0400 Subject: [PATCH 012/241] gnu: Add go-github-com-mattn-go-pointer. * gnu/packages/golang.scm (go-github-com-mattn-go-pointer): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 632769b769..a3b1c6c643 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1840,6 +1840,31 @@ terminal.") makes it possible to handle ANSI color escapes on Windows.") (license license:expat)))) +(define-public go-github-com-mattn-go-pointer + (let ((commit "a0a44394634f41e4992b173b24f14fecd3318a67") + (revision "1")) + (package + (name "go-github-com-mattn-go-pointer") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattn/go-pointer") + (commit commit))) + (sha256 + (base32 + "09w7hcyc0zz2g23vld6jbcmq4ar27xakp1ldjvh549i5izf2anhz")) + (file-name (git-file-name name version)))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/mattn/go-pointer")) + (home-page "https://github.com/mattn/go-pointer") + (synopsis "Utility for cgo") + (description + "This package allows for a cgo argument to be passed a Go pointer.") + (license license:expat)))) + (define-public go-github-com-mgutz-ansi (let ((commit "9520e82c474b0a04dd04f8a40959027271bab992") (revision "0")) From bb9a99e6571c492d30f95c5b51ead6861d1dc098 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Jun 2020 16:22:25 +0200 Subject: [PATCH 013/241] doc: Adjust branching and rebuilding strategy to match reality. The amount of packages has more than tripled since this section was written. Adjust the rebuild limits and cycle lengths based on current practices. * doc/contributing.texi (Submitting Patches): Increase 'staging' rebuild limit to 1800 packages, and adjust the cycle to six weeks. Increase 'core-updates' cycle to six months. --- doc/contributing.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 88128e5498..c56f4fd2e9 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -991,16 +991,16 @@ rebuilding induced, commits go to different branches, along these lines: @item 300 dependent packages or less @code{master} branch (non-disruptive changes). -@item between 300 and 1,200 dependent packages +@item between 300 and 1,800 dependent packages @code{staging} branch (non-disruptive changes). This branch is intended -to be merged in @code{master} every 3 weeks or so. Topical changes +to be merged in @code{master} every 6 weeks or so. Topical changes (e.g., an update of the GNOME stack) can instead go to a specific branch (say, @code{gnome-updates}). -@item more than 1,200 dependent packages +@item more than 1,800 dependent packages @code{core-updates} branch (may include major and potentially disruptive changes). This branch is intended to be merged in @code{master} every -2.5 months or so. +6 months or so. @end table All these branches are @uref{@value{SUBSTITUTE-SERVER}, From b1342a82576544fda4777c80267ada7945ae7e4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Oct 2016 08:36:23 +0100 Subject: [PATCH 014/241] gnu: Add ghc-curl. * gnu/packages/haskell-web.scm (ghc-curl): New public variable. --- gnu/packages/haskell-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 4689025432..0c79ece194 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2019 John Soo ;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,6 +94,27 @@ for screen-scraping.") (description "HTTP cookie parsing and rendering library for Haskell.") (license license:bsd-3))) +(define-public ghc-curl + (package + (name "ghc-curl") + (version "1.3.8") + (source (origin + (method url-fetch) + (uri (string-append "mirror://hackage/package/curl/curl-" + version ".tar.gz")) + (sha256 + (base32 + "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh")))) + (build-system haskell-build-system) + (inputs + `(("curl" ,curl))) + (home-page "https://hackage.haskell.org/package/curl") + (synopsis "Haskell bindings for libcurl") + (description + "@code{libcurl} is a versatile client-side URL transfer library. +This package provides a Haskell binding to libcurl.") + (license license:bsd-3))) + (define-public ghc-httpd-shed (package (name "ghc-httpd-shed") From ddd798364838e5a0083fd65037164e1a92568133 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Jun 2020 14:04:50 +0200 Subject: [PATCH 015/241] gnu: Add ghc-regex-pcre. * gnu/packages/haskell-xyz.scm (ghc-regex-pcre): New public variable. --- 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 815af82500..6908050afc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10249,6 +10249,29 @@ This is not good for Unicode users. This modified regex-compat uses regex-tdfa this problem.") (license license:bsd-3))) +(define-public ghc-regex-pcre + (package + (name "ghc-regex-pcre") + (version "0.94.4") + (source (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/" + "regex-pcre/regex-pcre-" version ".tar.gz")) + (sha256 + (base32 + "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf")))) + (build-system haskell-build-system) + (inputs + `(("ghc-regex-base" ,ghc-regex-base) + ("pcre" ,pcre))) + (home-page "https://hackage.haskell.org/package/regex-pcre") + (synopsis "Enhancement of the builtin Text.Regex library") + (description + "This package is an enhancement of the @code{Text.Regex} library. +It wraps the @code{PCRE} C library providing Perl-compatible regular +expressions.") + (license license:bsd-3))) + (define-public ghc-regex-pcre-builtin (package (name "ghc-regex-pcre-builtin") From dcfd1d2caf1e467f6494363fbf11d251d0045fb9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jun 2020 01:04:21 +0200 Subject: [PATCH 016/241] gnu: Add shelltestrunner. * gnu/packages/haskell-apps.scm (shelltestrunner): New public variable. --- gnu/packages/haskell-apps.scm | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 3089c17145..a453ba168c 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -762,6 +762,58 @@ advanced user's otherwise working script to fail under future circumstances. @end enumerate") (license license:gpl3+))) +(define-public shelltestrunner + (package + (name "shelltestrunner") + (version "1.9") + (source (origin + (method url-fetch) + (uri (string-append "mirror://hackage/package/shelltestrunner-" + version "/shelltestrunner-" version ".tar.gz")) + (sha256 + (base32 + "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b")))) + (build-system haskell-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs tests? parallel-tests? #:allow-other-keys) + ;; This test is inspired by the Makefile in the upstream + ;; repository, which is missing in the Hackage release tarball + ;; along with some of the tests. The Makefile would not work + ;; anyway as it ties into the 'stack' build tool. + (let* ((out (assoc-ref outputs "out")) + (shelltest (string-append out "/bin/shelltest")) + (numjobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) + (if tests? + (invoke shelltest (string-append "-j" numjobs) + "tests/examples") + (format #t "test suite not run~%")) + #t)))))) + (inputs + `(("ghc-diff" ,ghc-diff) + ("ghc-cmdargs" ,ghc-cmdargs) + ("ghc-filemanip" ,ghc-filemanip) + ("ghc-hunit" ,ghc-hunit) + ("ghc-pretty-show" ,ghc-pretty-show) + ("ghc-regex-tdfa" ,ghc-regex-tdfa) + ("ghc-safe" ,ghc-safe) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-test-framework" ,ghc-test-framework) + ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) + (home-page "https://github.com/simonmichael/shelltestrunner") + (synopsis "Test CLI programs") + (description + "shelltestrunner (executable: @command{shelltest}) is a command-line tool +for testing command-line programs, or general shell commands. It reads simple +test specifications defining a command to run, some input, and the expected +output, stderr, and exit status.") + (license license:gpl3+))) + (define-public stylish-haskell (package (name "stylish-haskell") From cf123e321d4d0843b596a2b106643b2ddc8ca9d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jun 2020 01:04:37 +0200 Subject: [PATCH 017/241] gnu: Add ghc-psqueue. * gnu/packages/haskell-xyz.scm (ghc-psqueue): New public variable. --- 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 6908050afc..0508916ead 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9812,6 +9812,29 @@ the ideal templating system.") replace the standard one provided by GHC.") (license license:expat))) +(define-public ghc-psqueue + (package + (name "ghc-psqueue") + (version "1.1.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://hackage/package/PSQueue-" + version "/PSQueue-" version ".tar.gz")) + (sha256 + (base32 + "1cik7sw10sacsijmfhghzy54gm1qcyxw14shlp86lx8z89kcnkza")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/PSQueue") + (synopsis "Priority search queue") + (description + "A @dfn{priority search queue} efficiently supports the operations of +both a search tree and a priority queue. A @code{Binding} is a product of +a key and a priority. Bindings can be inserted, deleted, modified and queried +in logarithmic time, and the binding with the least priority can be retrieved +in constant time. A queue can be built from a list of bindings, sorted by +keys, in linear time.") + (license license:bsd-3))) + (define-public ghc-psqueues (package (name "ghc-psqueues") From 54bbed96389cb07f5f38f2a26d6c3ce35068710a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jun 2020 20:29:52 +0200 Subject: [PATCH 018/241] gnu: Add ndisc6. * gnu/packages/networking.scm (ndisc6): New public variable. --- gnu/packages/networking.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 75017c060c..88ee3976fa 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -297,6 +297,34 @@ specification, which provides IPv6 Internet connectivity to IPv6 enabled hosts residing in IPv4-only networks, even when they are behind a NAT device.") (license license:gpl2+))) +(define-public ndisc6 + (package + (name "ndisc6") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (string-append "https://www.remlab.net/files/ndisc6/ndisc6-" + version ".tar.bz2")) + (sha256 + (base32 + "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb")))) + (build-system gnu-build-system) + (home-page "https://www.remlab.net/ndisc6/") + (synopsis "IPv6 diagnostic tools") + (description + "NDisc6 is a collection of tools for IPv6 networking diagnostics. +It includes the following programs: + +@itemize +@item @command{ndisc6}: ICMPv6 Neighbor Discovery tool. +@item @command{rdisc6}: ICMPv6 Router Discovery tool. +@item @command{tcptraceroute6}: IPv6 traceroute over TCP. +@item @command{traceroute6}: IPv6 traceroute over UDP. +@item @command{rdnssd}: Recursive DNS Servers discovery daemon. +@end itemize") + ;; The user can choose version 2 or 3 of the GPL, not later versions. + (license (list license:gpl2 license:gpl3)))) + (define-public socat (package (name "socat") From bf7321cc9171a0b4145debd770666efafe0b2f24 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jun 2020 15:19:31 +0200 Subject: [PATCH 019/241] gnu: docbook: Add 5.0.1. * gnu/packages/docbook.scm (docbook-xml-5): New public variable. (docbook-xml): Inherit from it. While at it, remove trailing whitespace. --- gnu/packages/docbook.scm | 58 +++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 7221dd8fd9..ee09b9d0b4 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,8 +35,50 @@ #:use-module (guix build-system trivial) #:use-module (guix build-system python)) +(define-public docbook-xml-5 + (package + (name "docbook-xml") + (version "5.0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://www.docbook.org/xml/" version + "/docbook-" version ".zip")) + (sha256 + (base32 + "1iz3hq1lqgnshvlz4j9gvh4jy1ml74qf90vqf2ikbq0h4i2xzybs")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((unzip + (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip")) + (source (assoc-ref %build-inputs "source")) + (out (assoc-ref %outputs "out")) + (dtd (string-append out "/xml/dtd/docbook"))) + (invoke unzip source) + (mkdir-p dtd) + (copy-recursively (string-append "docbook-" ,version) dtd) + (with-directory-excursion dtd + (substitute* (string-append out "/xml/dtd/docbook/catalog.xml") + (("uri=\"") + (string-append + "uri=\"file://" dtd "/"))) + #t))))) + (native-inputs `(("unzip" ,unzip))) + (home-page "https://docbook.org") + (synopsis "DocBook XML DTDs for document authoring") + (description + "DocBook is general purpose XML and SGML document type particularly well +suited to books and papers about computer hardware and software (though it is +by no means limited to these applications.) This package provides XML DTDs.") + (license (x11-style "" "See file headers.")))) + (define-public docbook-xml (package + (inherit docbook-xml-5) (name "docbook-xml") (version "4.5") (source (origin @@ -45,7 +88,6 @@ (sha256 (base32 "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf")))) - (build-system trivial-build-system) (arguments '(#:builder (begin (use-modules (guix build utils)) @@ -60,19 +102,11 @@ (with-directory-excursion dtd (invoke unzip source)) (substitute* (string-append out "/xml/dtd/docbook/catalog.xml") - (("uri=\"") - (string-append + (("uri=\"") + (string-append "uri=\"file://" dtd "/"))) #t)) - #:modules ((guix build utils)))) - (native-inputs `(("unzip" ,unzip))) - (home-page "https://docbook.org") - (synopsis "DocBook XML DTDs for document authoring") - (description - "DocBook is general purpose XML and SGML document type particularly well -suited to books and papers about computer hardware and software (though it is -by no means limited to these applications.) This package provides XML DTDs.") - (license (x11-style "" "See file headers.")))) + #:modules ((guix build utils)))))) (define-public docbook-xml-4.4 (package (inherit docbook-xml) From 065cb27abb354958d716d21a6a6561f6023c5a1e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 14 Jun 2020 15:21:02 +0200 Subject: [PATCH 020/241] gnu: Add iputils. * gnu/packages/patches/iputils-libcap-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/networking.scm (iputils): New public variable. --- gnu/local.mk | 1 + gnu/packages/networking.scm | 72 +++++++++++++++++++ .../patches/iputils-libcap-compat.patch | 37 ++++++++++ 3 files changed, 110 insertions(+) create mode 100644 gnu/packages/patches/iputils-libcap-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 37bcc88ef5..1c96947d91 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1103,6 +1103,7 @@ dist_patch_DATA = \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ + %D%/packages/patches/iputils-libcap-compat.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 88ee3976fa..e8f398e521 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -63,6 +63,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system trivial) @@ -85,6 +86,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dejagnu) + #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) @@ -681,6 +683,76 @@ interfaces, with a simple and efficient view on the command line. It is intended as a substitute for the PPPStatus and EthStatus projects.") (license license:gpl2+))) +(define-public iputils + (package + (name "iputils") + (version "20190709") + (home-page "https://github.com/iputils/iputils") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "s" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "iputils-libcap-compat.patch")) + (sha256 + (base32 + "04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags '("-DBUILD_RARPD=true") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-docbook-url + (lambda* (#:key inputs #:allow-other-keys) + (let* ((docbook-xsl (assoc-ref inputs "docbook-xsl")) + (uri (string-append docbook-xsl "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)))) + (for-each + (lambda (file) + (substitute* file + (("http://docbook\\.sourceforge\\.net/release/xsl-ns/current") + uri))) + (cons "doc/meson.build" + (find-files "doc" "\\.xsl$"))) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml-5) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("xsltproc" ,libxslt))) + (inputs + `(("libcap" ,libcap) + ("libidn2" ,libidn2) + ("openssl" ,openssl))) + (synopsis "Collection of network utilities") + (description + "This package contains a variety of tools for dealing with network +configuration, troubleshooting, or servers. Utilities included are: + +@itemize @bullet +@item @command{arping}: Ping hosts using the @dfn{Adress Resolution Protocol}. +@item @command{clockdiff}: Compute time difference between network hosts +using ICMP TSTAMP messages. +@item @command{ninfod}: Daemon that responds to IPv6 Node Information Queries. +@item @command{ping}: Use ICMP ECHO messages to measure round-trip delays +and packet loss across network paths. +@item @command{rarpd}: Answer RARP requests from clients. +@item @command{rdisc}: Populate network routing tables with information from +the ICMP router discovery protocol. +@item @command{tftpd}: Trivial file transfer protocol server. +@item @command{tracepath}: Trace network path to an IPv4 or IPv6 address and +discover MTU along the way. +@end itemize") + ;; The various utilities are covered by different licenses, see LICENSE + ;; for details. + (license (list license:gpl2+ ;arping, rarpd, tracepath + license:bsd-3 ;clockdiff, ninfod, ping, tftpd + (license:non-copyleft + "https://spdx.org/licenses/Rdisc.html" + "Sun Microsystems license, see rdisc.c for details"))))) + (define-public nload (package (name "nload") diff --git a/gnu/packages/patches/iputils-libcap-compat.patch b/gnu/packages/patches/iputils-libcap-compat.patch new file mode 100644 index 0000000000..dc6da310ce --- /dev/null +++ b/gnu/packages/patches/iputils-libcap-compat.patch @@ -0,0 +1,37 @@ +Fix name clash with libcap 2.29. + +Taken from upstream: +https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83 + +diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c +--- a/ninfod/ninfod.c ++++ b/ninfod/ninfod.c +@@ -455,7 +455,7 @@ static void do_daemonize(void) + /* --------- */ + #ifdef HAVE_LIBCAP + static const cap_value_t cap_net_raw = CAP_NET_RAW; +-static const cap_value_t cap_setuid = CAP_SETUID; ++static const cap_value_t cap_setuserid = CAP_SETUID; + static cap_flag_value_t cap_ok; + #else + static uid_t euid; +@@ -487,7 +487,7 @@ static void limit_capabilities(void) + + cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok); + if (cap_ok != CAP_CLEAR) +- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); ++ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); + + if (cap_set_proc(cap_p) < 0) { + DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); +@@ -520,8 +520,8 @@ static void drop_capabilities(void) + + /* setuid / setuid */ + if (cap_ok != CAP_CLEAR) { +- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); +- cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET); ++ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); ++ cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET); + + if (cap_set_proc(cap_p) < 0) { + DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); From 2c1d1b7599a3738cdbdcaa281d56fa47b0b4c025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Sun, 7 Jun 2020 20:00:15 +0200 Subject: [PATCH 021/241] gnu: Add tup. * gnu/packages/build-tools.scm (tup): New variable. * gnu/packages/patches/tup-unbundle-dependencies.patch: New file. * gnu/local.mk (dist_patch_DATA): Register new file. --- gnu/local.mk | 1 + gnu/packages/build-tools.scm | 79 +++++++++++++++++++ .../patches/tup-unbundle-dependencies.patch | 66 ++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 gnu/packages/patches/tup-unbundle-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1c96947d91..5438de4aac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1541,6 +1541,7 @@ dist_patch_DATA = \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ %D%/packages/patches/tomb-fix-errors-on-open.patch \ + %D%/packages/patches/tup-unbundle-dependencies.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 9ff32b22f9..38bd906278 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2019 Jonathan Brielmaier ;;; Copyright © 2020 Leo Prikler ;;; Copyright © 2020 Yuval Kogman +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,12 +37,16 @@ #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages package-management) + #:use-module (gnu packages pcre) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sqlite) #:use-module (gnu packages ninja) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -276,6 +281,80 @@ other lower-level build files.") scripted definition of a software project and outputs @file{Makefile}s or other lower-level build files."))) +(define-public tup + (package + (name "tup") + (version "0.7.8") + (source (origin + (method url-fetch) + (uri (string-append "http://gittup.org/tup/releases/tup-v" + version ".tar.gz")) + (sha256 + (base32 + "1z8d5mmddiw3ckdvy88bi48aa5bm0hrid6g9c9hp2ynmpzywmp2h")) + (patches (search-patches "tup-unbundle-dependencies.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; NOTE: Tup uses a slightly modified Lua, so it cannot be + ;; unbundled. See: src/lula/tup-lua.patch + (delete-file-recursively "src/pcre") + (delete-file-recursively "src/sqlite3") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; There is a bootstrap script, but it doesn't do what you think - it + ;; builds tup. + (delete 'bootstrap) + (replace 'configure + (lambda _ + (substitute* "src/tup/link.sh" + (("`git describe`") ,version)) + (with-output-to-file "tup.config" + (lambda _ + (format #t "CONFIG_TUP_USE_SYSTEM_SQLITE=y~%"))) + #t)) + (delete 'check) + (replace 'build + (lambda _ + ;; Based on bootstrap-nofuse.sh, but with a detour to patch-shebang. + (invoke "./build.sh") + (invoke "./build/tup" "init") + (invoke "./build/tup" "generate" "--verbose" "build-nofuse.sh") + (patch-shebang "build-nofuse.sh") + (invoke "./build-nofuse.sh"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((outdir (assoc-ref outputs "out")) + (ftdetect (string-append outdir + "/share/vim/vimfiles/ftdetect"))) + (install-file "tup" (string-append outdir "/bin")) + (install-file "tup.1" (string-append outdir "/share/man/man1")) + (install-file "contrib/syntax/tup.vim" + (string-append outdir "/share/vim/vimfiles/syntax")) + (mkdir-p ftdetect) + (with-output-to-file (string-append ftdetect "/tup.vim") + (lambda _ + (display "au BufNewFile,BufRead Tupfile,*.tup setf tup"))) + #t)))))) + (inputs + `(("fuse" ,fuse) + ("pcre" ,pcre) + ("pcre" ,pcre "bin") ; pcre-config + ("sqlite" ,sqlite))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "http://gittup.org/tup/") + (synopsis "Fast build system that's hard to get wrong") + (description "Tup is a generic build system based on a directed acyclic +graphs of commands to be executed. Tup instruments your build to detect the +exact dependencies of the commands, allowing you to take advantage of ideal +parallelism during incremental builds, and detecting any situations where +a build worked by accident.") + (license license:gpl2))) + (define-public osc (package (name "osc") diff --git a/gnu/packages/patches/tup-unbundle-dependencies.patch b/gnu/packages/patches/tup-unbundle-dependencies.patch new file mode 100644 index 0000000000..6409522bd3 --- /dev/null +++ b/gnu/packages/patches/tup-unbundle-dependencies.patch @@ -0,0 +1,66 @@ +Allow building tup after removing some bundled sources from the source +tree. + +diff --git a/build.sh b/build.sh +index 2937116d..eab650f7 100755 +--- a/build.sh ++++ b/build.sh +@@ -16,7 +16,7 @@ else + echo "Error: invalid TUP_SERVER \"$server\"" 1>&2 + exit 1 + fi +-LDFLAGS="$LDFLAGS -lm" ++LDFLAGS="$LDFLAGS -lm -lsqlite3 `pcre-config --libs`" + : ${CC:=gcc} + case "$os" in + Linux) +@@ -65,17 +65,15 @@ mkdir luabuiltin + + CFLAGS="$CFLAGS -DTUP_SERVER=\"$server\"" + CFLAGS="$CFLAGS -DHAVE_CONFIG_H" ++CFLAGS="$CFLAGS `pcre-config --cflags`" + +-for i in ../src/tup/*.c ../src/tup/tup/main.c ../src/tup/monitor/null.c ../src/tup/flock/fcntl.c ../src/inih/ini.c ../src/pcre/*.c $plat_files; do ++for i in ../src/tup/*.c ../src/tup/tup/main.c ../src/tup/monitor/null.c ../src/tup/flock/fcntl.c ../src/inih/ini.c $plat_files; do + echo " bootstrap CC $CFLAGS $i" + # Put -I. first so we find our new luabuiltin.h file, not one built + # by a previous 'tup upd'. +- $CC $CFLAGS -c $i -I. -I../src -I../src/pcre $plat_cflags ++ $CC $CFLAGS -c $i -I. -I../src $plat_cflags + done + +-echo " bootstrap CC $CFLAGS ../src/sqlite3/sqlite3.c" +-$CC $CFLAGS -c ../src/sqlite3/sqlite3.c -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION $plat_cflags +- + echo " bootstrap LD tup $LDFLAGS" + echo "const char *tup_version(void) {return \"$label\";}" | $CC -x c -c - -o tup_version.o + $CC *.o -o tup -lpthread $plat_ldflags $LDFLAGS +diff --git a/src/tup/db.c b/src/tup/db.c +index 55ee3edd..9bdf7a80 100644 +--- a/src/tup/db.c ++++ b/src/tup/db.c +@@ -46,7 +46,7 @@ + #include + #include + #include +-#include "sqlite3/sqlite3.h" ++#include + + #define DB_VERSION 17 + #define PARSER_VERSION 12 +diff --git a/src/tup/tupid.h b/src/tup/tupid.h +index 7b36ae46..19aed438 100644 +--- a/src/tup/tupid.h ++++ b/src/tup/tupid.h +@@ -21,7 +21,7 @@ + #ifndef tup_tupid_h + #define tup_tupid_h + +-#include "sqlite3/sqlite3.h" ++#include + + typedef sqlite3_int64 tupid_t; + +-- +2.26.2 + From 3d7726b7f2fc14aa5fc125b3705329efb86f81fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 14 Jun 2020 22:18:24 -0400 Subject: [PATCH 022/241] gnu: emacs-org-reveal: Update to 20200607. * gnu/packages/emacs-xyz.scm (emacs-org-reveal): Update to 20200607. --- gnu/packages/emacs-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1973d73461..b3235f7096 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14698,12 +14698,11 @@ scientific publication. Org Ref is also useful for research documents and notes.") (license license:gpl3+)))) -;; This project is unmaintained. Please use emacs-org-re-reveal instead. (define-public emacs-org-reveal - (let ((commit "9210413202a360a559a51e8275faa42be68cf44b")) + (let ((commit "84039bb499290926511b04749882ecb5eda45a0c")) (package (name "emacs-org-reveal") - (version (git-version "0.1" "3" commit)) + (version (git-version "20200607" "1" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -14712,7 +14711,7 @@ notes.") (file-name (git-file-name name version)) (sha256 (base32 - "1wlfk823d3vrn480m38j7ncaqm193lvh6y22b92fx4b3yhdbndza")))) + "1fx3xmnkpfljrdmy0dsyq79k93ky57gcqm1ad9qbzykk7qjvmmi8")))) (build-system emacs-build-system) (home-page "https://github.com/yjwen/org-reveal") (synopsis "Org and Reveal.js powered HTML presentation tool") From 1afa2c5ca0c5904bd9de70a48dd7d0a6275d5d3f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 14 Jun 2020 23:16:33 -0400 Subject: [PATCH 023/241] gnu: inkscape: Add the glib-or-gtk-build-system phases. This fixes an issue where an improperly set XDG_DATA_DIRS environment variable would cause a segfault when opening the 'Save As' menu of Inkscape. See: . * gnu/packages/inkscape.scm (inkscape-1.0)[arguments]: Import the (guix build glib-or-gtk-build-system) module. [phases]: Add the glib-or-gtk-compile-schemas and glib-or-gtk-wrap phases. Reported-by: Thorsten Wilms --- gnu/packages/inkscape.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index b0707d6eff..85b0ba9fcf 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -213,6 +213,11 @@ endif()~%~%" (arguments `(#:tests? #t #:test-target "check" ;otherwise some test binaries are missing + #:imported-modules (,@%cmake-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules ((guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-icon-cache-generator @@ -240,7 +245,11 @@ endif()~%~%" ;; as the "share/inkscape/ui/units.xml" file. (delete 'check) (add-after 'install 'check - (assoc-ref %standard-phases 'check))))) + (assoc-ref %standard-phases 'check)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (inputs `(("aspell" ,aspell) ("autotrace" ,autotrace) From 98366c991f409869773098b2eb73309fa961ed90 Mon Sep 17 00:00:00 2001 From: Andrew Whatson Date: Mon, 15 Jun 2020 12:12:00 +1000 Subject: [PATCH 024/241] gnu: Add emacs-flycheck-guile. * gnu/packages/emacs-xyz.scm (emacs-flycheck-guile): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b3235f7096..e32e1d627f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3938,6 +3938,31 @@ provides an easy way to find synonyms and antonyms for a given word (to avoid repetitions for example).") (license license:gpl3+))) +(define-public emacs-flycheck-guile + (package + (name "emacs-flycheck-guile") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/flatwhatson/flycheck-guile") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "163pnsh6r6bral1jg0vqri54g6hygws21vis0zci4114yb3fhkm1")))) + (propagated-inputs + `(("emacs-flycheck" ,emacs-flycheck) + ("emacs-geiser" ,emacs-geiser))) + (build-system emacs-build-system) + (home-page "https://github.com/flatwhatson/flycheck-guile") + (synopsis "GNU Guile support for Flycheck") + (description + "This package provides a Flycheck checker for GNU Guile using @code{guild +compile}.") + (license license:gpl3+))) + (define-public emacs-flycheck-rust (package (name "emacs-flycheck-rust") From b64ca5dadccf42b84b72e83e16e3581b4cf56094 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Jun 2020 09:13:21 +0200 Subject: [PATCH 025/241] gnu: emacs-debbugs: Update to 0.24. * gnu/packages/emacs-xyz.scm (emacs-debbugs): Update to 0.24. --- gnu/packages/emacs-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e32e1d627f..e3c6c996cc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4124,14 +4124,14 @@ source code using IPython.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.23") - (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/debbugs-" - version ".tar")) - (sha256 - (base32 - "0mcz97b3sddrc68wi8dz95b2rq7ky88pr2i1ghyhy28as16chmz5")))) + (version "0.24") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/debbugs-" + version ".tar")) + (sha256 + (base32 "1b8qwdvf3jvw0chrdgbymb2ci9ms45mf90nrljxx7jql2lsr3x63")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs From 4e05bbb093a17145fcabd48ea1d2c9cd7559084d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 14 Jun 2020 21:53:57 +0200 Subject: [PATCH 026/241] ci: Add build products support. * guix/ci.scm (): New json mapping, ( make-build-product + build-product? + json->build-product + (type build-product-type) + (file-size build-product-file-size) + (path build-product-path)) + (define-json-mapping make-build build? json->build (id build-id "id") ;integer (derivation build-derivation) ;string | #f (system build-system) ;string (status build-status "buildstatus" ) ;integer - (timestamp build-timestamp)) ;integer + (timestamp build-timestamp) ;integer + (products build-products "buildproducts" ;* + (lambda (products) + (map json->build-product + ;; Before Cuirass 3db603c1, #f is always returned. + (if products + (vector->list products) + '()))))) (define-json-mapping make-checkout checkout? json->checkout From ef6f9f16fe1ddcf5659848d160b4a8ac3397a044 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 15 Jun 2020 09:11:17 +0200 Subject: [PATCH 027/241] ci: Add job option to "latest-builds". * guix/ci.scm (latest-builds): Add "job" option. --- guix/ci.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/ci.scm b/guix/ci.scm index e1016ef566..36f85e1f12 100644 --- a/guix/ci.scm +++ b/guix/ci.scm @@ -109,7 +109,10 @@ (map json->build (vector->list queue)))) (define* (latest-builds url #:optional (limit %query-limit) - #:key evaluation system) + #:key + evaluation + system + job) "Return the latest builds performed by the CI server at URL. If EVALUATION is an integer, restrict to builds of EVALUATION. If SYSTEM is true (a system string such as \"x86_64-linux\"), restrict to builds for SYSTEM." @@ -122,7 +125,8 @@ string such as \"x86_64-linux\"), restrict to builds for SYSTEM." (number->string limit) (option "evaluation" evaluation number->string) - (option "system" system))))) + (option "system" system) + (option "job" job))))) ;; Note: Hydra does not provide a "derivation" field for entries in ;; 'latestbuilds', but Cuirass does. (map json->build (vector->list latest)))) From fdc9e9f53d01b9ce030848878803b57ae1a81ad3 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Mon, 15 Jun 2020 09:35:08 +0200 Subject: [PATCH 028/241] news: Add entry for script execution via "guix repl". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add entry. Signed-off-by: Ludovic Courtès --- etc/news.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 6bf88ccb44..d037734013 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -13,6 +13,45 @@ (channel-news (version 0) + (entry (commit "c924e541390f9595d819edc33c19d979917c15ec") + (title (en "@command{guix repl} adds support for running Guile scripts") + (de "@command{guix repl} kann Guile-Skripte ausführen") + (fr "@command{guix repl} permet d'exécuter des scripts en langage Guile")) + (body + (en "The @command{guix repl} command can now be used to run +Guile scripts. Compared to just launching the @command{guile} command, +@command{guix repl} guarantees that all the Guix modules and all its +dependencies are available in the search path. Scripts are run like this: + +@example +guix repl -- my-script,scm --option1 --option2=option-arg arg1 arg2 +@end example + +Run @command{info \"(guix) Invoking guix repl\"} for more information.") + (de "Der Befehl @command{guix repl} kann jetzt zur Ausführung von +Guile-Skripten verwendet werden. Im Vergleich zum Befehl +@command{guile} garantiert @command{guix repl}, dass alle Guix-Module und +alle seine Abhängigkeiten im Suchpfad verfügbar sind. Skripte werden wie +folgt ausgeführt: + +@example +guix repl -- my-script,scm --option1 --option2 --option2=option-arg arg1 arg2 +@end example + +Weitere Informationen erhalten Sie mit +@command{info \"(guix.de) Aufruf von guix repl\"}.") + (fr "La commande @command{guix repl} peut maintenant être utilisée +pour exécuter des scripts en langage Guile. Par rapport au simple lancement +de la commande @command{guile}, @command{guix repl} garantit que tous les +modules Guix et toutes ses dépendances sont disponibles dans le chemin +de recherche. Les scripts sont exécutés comme ceci : + +@example +guix repl -- my-script,scm --option1 --option2=option-arg arg1 arg2 +@end example + +Exécutez @command{info \"(guix.fr) Invoquer guix repl\"} pour plus d'informations."))) + (entry (commit "b460ba7992a0b4af2ddb5927dcf062784539ef7b") (title (en "Add support to boot from a Btrfs subvolume") (de "Unterstützung für Systemstart von einem From bb76f50b9b788cae344958f92f6c850cce484579 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 15 Jun 2020 09:47:41 +0200 Subject: [PATCH 029/241] ci: Fix buildproducts reading. This is a follow-up of 4e05bbb093a17145fcabd48ea1d2c9cd7559084d. * guix/ci.scm ()[products]: Test for vector type, as products can be "null". --- guix/ci.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/ci.scm b/guix/ci.scm index 36f85e1f12..97a9847657 100644 --- a/guix/ci.scm +++ b/guix/ci.scm @@ -70,7 +70,7 @@ (lambda (products) (map json->build-product ;; Before Cuirass 3db603c1, #f is always returned. - (if products + (if (vector? products) (vector->list products) '()))))) From 3a2bb37941685020de183733831f31f9cc69bf5f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Jun 2020 11:25:30 +0300 Subject: [PATCH 030/241] gnu: quassel: Fix build with qt-5.14. * gnu/packages/irc.scm (quassel)[source]: Add patch. * gnu/packages/patches/quassel-qt-514-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/irc.scm | 1 + .../patches/quassel-qt-514-compat.patch | 130 ++++++++++++++++++ 3 files changed, 132 insertions(+) create mode 100644 gnu/packages/patches/quassel-qt-514-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5438de4aac..7333427850 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1450,6 +1450,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ + %D%/packages/patches/quassel-qt-514-compat.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/randomjungle-disable-static-build.patch \ diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 548a3ca049..e0726b606d 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -77,6 +77,7 @@ (sha256 (base32 "0mg8jydc70vlylppzich26q4s40kr78r3ysfyjwisfvlg2byxvs8")) + (patches (search-patches "quassel-qt-514-compat.patch")) (modules '((guix build utils))) ;; We don't want to install the bundled scripts. (snippet diff --git a/gnu/packages/patches/quassel-qt-514-compat.patch b/gnu/packages/patches/quassel-qt-514-compat.patch new file mode 100644 index 0000000000..7a0c42e8aa --- /dev/null +++ b/gnu/packages/patches/quassel-qt-514-compat.patch @@ -0,0 +1,130 @@ +https://github.com/quassel/quassel/commit/579e559a6322209df7cd51c34801fecff5fe734b.patch + +Based on the above patch, with some changes due to how the code has changed +in the time since 0.13.1 was released. + +https://git.archlinux.org/svntogit/community.git/plain/trunk/quassel-0.13.1-qt5.14.patch?h=packages/quassel + +From 579e559a6322209df7cd51c34801fecff5fe734b Mon Sep 17 00:00:00 2001 +From: Manuel Nickschas +Date: Tue, 7 Jan 2020 18:34:54 +0100 +Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14 + +Starting from version 5.14, Qt provides stream operators for enum +types, which collide with the ones we ship in types.h. Disable +Quassel's stream operators when compiling against Qt 5.14 or later. + +Add a unit test that ensures that enum serialization honors the width +of the underlying type. +--- + src/common/types.h | 2 + + tests/common/CMakeLists.txt | 2 + + tests/common/typestest.cpp | 79 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 83 insertions(+) + create mode 100644 tests/common/typestest.cpp + +diff --git a/src/common/types.h b/src/common/types.h +index d3742b788..e2a9aab5e 100644 +--- a/src/common/types.h ++++ b/src/common/types.h +@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) + typedef QList MsgIdList; + typedef QList BufferIdList; + ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + /** + * Catch-all stream serialization operator for enum types. + * +@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { + value = static_cast(v); + return in; + } ++#endif + + // Exceptions + +diff --git a/tests/common/typestest.cpp b/tests/common/typestest.cpp +new file mode 100644 +index 000000000..04031c299 +--- /dev/null ++++ b/tests/common/typestest.cpp +@@ -0,0 +1,79 @@ ++/*************************************************************************** ++ * Copyright (C) 2005-2020 by the Quassel Project * ++ * devel@quassel-irc.org * ++ * * ++ * This program 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 2 of the License, or * ++ * (at your option) version 3. * ++ * * ++ * This program 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 this program; if not, write to the * ++ * Free Software Foundation, Inc., * ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ++ ***************************************************************************/ ++ ++#include ++ ++#include ++#include ++#include ++ ++#include "testglobal.h" ++#include "types.h" ++ ++using namespace ::testing; ++ ++class EnumHolder ++{ ++ Q_GADGET ++ ++public: ++ enum class Enum16 : uint16_t {}; ++ enum class Enum32 : uint32_t {}; ++ ++ enum class EnumQt16 : uint16_t {}; ++ Q_ENUM(EnumQt16) ++ enum class EnumQt32 : uint32_t {}; ++ Q_ENUM(EnumQt32) ++}; ++ ++// Verify that enums are (de)serialized as their underlying type ++TEST(TypesTest, enumSerialization) ++{ ++ QByteArray data; ++ QDataStream out(&data, QIODevice::WriteOnly); ++ ++ // Serialize ++ out << EnumHolder::Enum16(0xabcd); ++ ASSERT_THAT(data.size(), Eq(2)); ++ out << EnumHolder::Enum32(0x123456); ++ ASSERT_THAT(data.size(), Eq(6)); ++ out << EnumHolder::EnumQt16(0x4321); ++ ASSERT_THAT(data.size(), Eq(8)); ++ out << EnumHolder::Enum32(0xfedcba); ++ ASSERT_THAT(data.size(), Eq(12)); ++ ASSERT_THAT(out.status(), Eq(QDataStream::Status::Ok)); ++ ++ // Deserialize ++ QDataStream in(data); ++ EnumHolder::Enum16 enum16; ++ EnumHolder::Enum32 enum32; ++ EnumHolder::EnumQt16 enumQt16; ++ EnumHolder::EnumQt32 enumQt32; ++ in >> enum16 >> enum32 >> enumQt16 >> enumQt32; ++ ASSERT_THAT(in.status(), Eq(QDataStream::Status::Ok)); ++ EXPECT_TRUE(in.atEnd()); ++ ++ EXPECT_THAT((int)enum16, Eq(0xabcd)); ++ EXPECT_THAT((int)enum32, Eq(0x123456)); ++ EXPECT_THAT((int)enumQt16, Eq(0x4321)); ++ EXPECT_THAT((int)enumQt32, Eq(0xfedcba)); ++} ++ ++#include "typestest.moc" From 5a3614cfe3e0d56d36daf7d28cb9b958da912beb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Jun 2020 11:47:54 +0300 Subject: [PATCH 031/241] gnu: quassel: Add context menu for d-bus tray icon. * gnu/packages/irc.scm (quassel)[inputs]: Add libdbusmenu-qt. --- gnu/packages/irc.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index e0726b606d..81e4205acf 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages guile) #:use-module (gnu packages lua) + #:use-module (gnu packages lxqt) #:use-module (gnu packages ncurses) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) @@ -112,6 +113,7 @@ ("qttools" ,qttools))) (inputs `(("inxi" ,inxi-minimal) + ("libdbusmenu-qt" ,libdbusmenu-qt) ("qca" ,qca) ("qtbase" ,qtbase) ("qtmultimedia" ,qtmultimedia) From d6797a566f4395bb708f417414b479734f75b623 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 15 Jun 2020 11:13:19 +0200 Subject: [PATCH 032/241] gnu: openmw: Update to 0.46.0. * gnu/packages/game-development.scm (openmw): Update to 0.46.0. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index b899c2fe6c..ddd171c5d2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1495,7 +1495,7 @@ of use.") (define-public openmw (package (name "openmw") - (version "0.45.0") + (version "0.46.0") (source (origin (method url-fetch) @@ -1504,7 +1504,7 @@ of use.") "openmw-" version ".tar.gz")) (sha256 (base32 - "0r0wgvv1faan8z8lbply8lks4hcnppifjrcz04l5zvq6yiqzjg5n")))) + "0n7x39kwhwmi6ly9hd7yc6dhlrmmdmx30ahc46kmlzzn2n7mm8q7")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target From 8b00728144d0e4bbc740e1595c85f0ecee3f6fb0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Jun 2020 12:00:05 +0200 Subject: [PATCH 033/241] gnu: r-limma: Update to 3.44.3. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.44.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f60a918d75..95f8b16db3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7813,13 +7813,13 @@ coding changes and predict coding outcomes.") (define-public r-limma (package (name "r-limma") - (version "3.44.1") + (version "3.44.3") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "0l6f6lz1rghj8c5s14ljbnmsrwz27fi6a7g42n15n3d3msvflw36")))) + "09fnqxx4rzq5n447aqg2l6y0idfwgz2jxz99sifxsr2q8afzbcj6")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") From 6e1aa1c443071ac8f37dc7d624a94d9c893009dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jun 2020 13:30:27 +0200 Subject: [PATCH 034/241] gnu: volk: Update to 2.3.0. * gnu/packages/engineering.scm (volk): Update to 2.3.0. --- gnu/packages/engineering.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fe3c87edd5..6edc79906c 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1027,15 +1027,14 @@ the 'showing the effect of'-style of operation.") (define-public volk (package (name "volk") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) (uri (string-append "https://www.libvolk.org/releases/volk-" version ".tar.gz")) (sha256 - (base32 - "1wz5nhmw6np8ka30pgy1qnima3rk2ksln4klfhrj7wah3fian0k9")))) + (base32 "1pjxz3piwy49njj5y2zk437prwkv9lfs5g48577jj3kcsg766vi3")))) (build-system cmake-build-system) (arguments `(#:phases From a3370b30f7c784d84d42f6d20ae577e5a4955a33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jun 2020 13:40:20 +0200 Subject: [PATCH 035/241] gnu: volk: Make retained references non-native inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (volk)[native-inputs]: Move python-wrapper and python-mako… [inputs]: …here. --- gnu/packages/engineering.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6edc79906c..6b776a175b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1057,9 +1057,8 @@ the 'showing the effect of'-style of operation.") (,(string-append python "/bin:"))))) #t))))) (inputs - `(("boost" ,boost))) - (native-inputs - `(("python" ,python-wrapper) + `(("boost" ,boost) + ("python" ,python-wrapper) ("python-mako" ,python-mako))) (home-page "https://www.libvolk.org/") (synopsis "Vector-Optimized Library of Kernels") From c9ea4eecf4e8ff7b09862f68454b3980e41b0e7c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jun 2020 14:23:45 +0200 Subject: [PATCH 036/241] download: Remove usa-mirror.go-parts.com mirror. It incorrectly redirects 404s (at least) to the commercial home page. * guix/download.scm (%mirrors): Remove usa-mirror.go-parts.com URLs. --- guix/download.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/guix/download.scm b/guix/download.scm index 7d6edddbdd..e5df678315 100644 --- a/guix/download.scm +++ b/guix/download.scm @@ -250,7 +250,6 @@ ;; mirrors keeping old versions at the top level "https://sunsite.icm.edu.pl/packages/ImageMagick/" ;; mirrors moving old versions to "legacy" - "http://mirrors-usa.go-parts.com/mirrors/ImageMagick/" "http://mirror.checkdomain.de/imagemagick/" "http://ftp.surfnet.nl/pub/ImageMagick/" "http://mirror.searchdaimon.com/ImageMagick" @@ -308,7 +307,6 @@ "http://mirror.its.dal.ca/kde/" "http://mirror.csclub.uwaterloo.ca/kde/" "http://mirror.cc.columbia.edu/pub/software/kde/" - "http://mirrors-usa.go-parts.com/kde" "http://kde.mirrors.hoobly.com/" "http://ftp.ussg.iu.edu/kde/" "http://mirrors.mit.edu/kde/" From 9e989d9e36c5ca62a207d56fd5643f77eb72cb5d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 15 Jun 2020 15:31:03 +0200 Subject: [PATCH 037/241] ci: Add status option to "latest-builds". * guix/ci.scm (latest-builds): Add "status" option. --- guix/ci.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/guix/ci.scm b/guix/ci.scm index 97a9847657..6bc80cacbf 100644 --- a/guix/ci.scm +++ b/guix/ci.scm @@ -109,10 +109,7 @@ (map json->build (vector->list queue)))) (define* (latest-builds url #:optional (limit %query-limit) - #:key - evaluation - system - job) + #:key evaluation system job status) "Return the latest builds performed by the CI server at URL. If EVALUATION is an integer, restrict to builds of EVALUATION. If SYSTEM is true (a system string such as \"x86_64-linux\"), restrict to builds for SYSTEM." @@ -126,7 +123,9 @@ string such as \"x86_64-linux\"), restrict to builds for SYSTEM." (option "evaluation" evaluation number->string) (option "system" system) - (option "job" job))))) + (option "job" job) + (option "status" status + number->string))))) ;; Note: Hydra does not provide a "derivation" field for entries in ;; 'latestbuilds', but Cuirass does. (map json->build (vector->list latest)))) From 53e619560712d4901e55a1e33a4b1bca84f2d306 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 15 Jun 2020 15:31:21 +0200 Subject: [PATCH 038/241] ci: Add build-products id field and export accessors. * guix/ci.scm (build-product?, build-product-id, build-product-type, build-product-file-size, build-product-path): Export them, [id]: new field. --- guix/ci.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/guix/ci.scm b/guix/ci.scm index 6bc80cacbf..02eb90e6c3 100644 --- a/guix/ci.scm +++ b/guix/ci.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,12 +23,19 @@ #:use-module (json) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export (build? + #:export (build-product? + build-product-id + build-product-type + build-product-file-size + build-product-path + + build? build-id build-derivation build-system build-status build-timestamp + build-products checkout? checkout-commit @@ -55,9 +63,10 @@ (define-json-mapping make-build-product build-product? json->build-product - (type build-product-type) - (file-size build-product-file-size) - (path build-product-path)) + (id build-product-id) ;integer + (type build-product-type) ;string + (file-size build-product-file-size) ;integer + (path build-product-path)) ;string (define-json-mapping make-build build? json->build From cf48f0fc4c40a2ec0b38a445e1e13f37722a0ade Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 15 Jun 2020 16:28:18 +0200 Subject: [PATCH 039/241] gnu: cuirass: Update to 0.0.1-32.3db603c. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-32.3db603c. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 317136e38f..262396be84 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,8 +47,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "2280ae18eb25aa7034636c58bf288c9bd5a8fa3b") - (revision "31")) + (let ((commit "3db603c1913fe14d260a44b05575a2ead3866b47") + (revision "32")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -60,7 +60,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1gbmpwgiwy740d936b052gfivzw52pgrny7j7lbl56wi9wnawkc9")))) + "1q69lgngsvpvcy6ww2a75wndjzymay5xaqmbj78znqmn7ck3fv44")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) From e70a88470622b513366076a0c435648daa56c084 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 1 Jun 2020 04:48:01 +0530 Subject: [PATCH 040/241] ui: Cut off search early if any regexp does not match. * guix/ui.scm (relevance): When one of the regexps does not match, cut off early and return 0. Do not try to match the remaining regexps. --- guix/ui.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 7690f48660..c1c9b6e3ea 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Simon Tournier +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -1520,11 +1521,16 @@ score, the more relevant OBJ is to REGEXPS." (+ relevance (* weight (apply + (map score-regexp lst))))))))) 0 metrics))) - (let ((scores (map regexp->score regexps))) - ;; Return zero if one of REGEXPS doesn't match. - (if (any zero? scores) - 0 - (reduce + 0 scores)))) + (let loop ((regexps regexps) + (total-score 0)) + (match regexps + ((head . tail) + (let ((score (regexp->score head))) + ;; Return zero if one of PATTERNS doesn't match. + (if (zero? score) + 0 + (loop tail (+ total-score score))))) + (() total-score)))) (define %package-metrics ;; Metrics used to compute the "relevance score" of a package against a set From a1da0904a6631ee6f6c12286427f2124bb479e4a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 1 Jun 2020 04:53:33 +0530 Subject: [PATCH 041/241] ui: Do not translate package synopsis a second time. * guix/ui.scm (package->recutils): package-synopsis-string already returns a translated string. Do not attempt to translate it again. --- guix/ui.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index c1c9b6e3ea..d4c912a02e 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1465,8 +1465,7 @@ HYPERLINKS? is true, emit hyperlink escape sequences when appropriate." (string-map (match-lambda (#\newline #\space) (chr chr)) - (or (and=> (package-synopsis-string p) P_) - ""))) + (or (package-synopsis-string p) ""))) (format port "~a~%" (string->recutils (string-trim-right From bd03e99f66be1a038e3a8aeb502f5153fd05cc67 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 1 Jun 2020 04:55:16 +0530 Subject: [PATCH 042/241] ui: Use package-description-string. * guix/ui.scm (package->recutils): Use package-description-string instead of package-description and P_. --- guix/ui.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index d4c912a02e..0d3620f96f 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1470,10 +1470,8 @@ HYPERLINKS? is true, emit hyperlink escape sequences when appropriate." (string->recutils (string-trim-right (parameterize ((%text-width width*)) - (texi->plain-text - (string-append "description: " - (or (and=> (package-description p) P_) - "")))) + (string-append "description: " + (or (package-description-string p) ""))) #\newline))) (for-each (match-lambda ((field . value) From ec8e1c91773c756f78034abd94351259632fd1b3 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 02:44:33 +0530 Subject: [PATCH 043/241] gnu: glade3: Enable tests. * gnu/packages/gnome.scm (glade3)[arguments]: Enable tests. Add custom pre-check phase. [native-inputs]: Add hicolor-icon-theme and xorg-server-for-tests. --- gnu/packages/gnome.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 098abc8f49..a6caabfc46 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2174,8 +2174,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.") "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r")))) (build-system glib-or-gtk-build-system) (arguments - `(#:tests? #f ; needs X, GL, and software rendering - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'fix-docbook (lambda* (#:key inputs #:allow-other-keys) @@ -2185,18 +2184,27 @@ API add-ons to make GTK+ widgets OpenGL-capable.") "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl) "/manpages/docbook.xsl"))) + #t)) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" "/tmp") + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") #t))))) (inputs `(("gtk+" ,gtk+) ("libxml2" ,libxml2))) (native-inputs - `(("intltool" ,intltool) + `(("hicolor-icon-theme" ,hicolor-icon-theme) + ("intltool" ,intltool) ("itstool" ,itstool) ("libxslt" ,libxslt) ;for xsltproc ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("python" ,python-2) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server-for-tests))) (home-page "https://glade.gnome.org") (synopsis "GTK+ rapid application development tool") (description "Glade is a rapid application development (RAD) tool to From e07573432cfd501908a1cee3aa309de198c28e7a Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 15 Jun 2020 21:03:30 +0200 Subject: [PATCH 044/241] doc: Clarify 'hurd-vm' and 'childhurd' names. Suggested by Maxim Cournoyer via IRC. * doc/guix.texi (The Hurd in a Virtual Machine): Explicitly mention that hurd-vm and childhurd are two names for this service. --- doc/guix.texi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index d55eaff02c..ab44dd76ac 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24637,7 +24637,8 @@ Return the name of @var{platform}---a string such as @code{"arm"}. Service @code{hurd-vm} provides support for running GNU/Hurd in a virtual machine (VM), a so-called ``Childhurd''. The virtual machine is -a Shepherd service that can be controlled with commands such as: +a Shepherd service that can be referred to by the names @code{hurd-vm} +and @code{childhurd} and be controlled with commands such as: @example herd start hurd-vm From 0f99da2b3962b6c6f78b5f8ecbe57bf0fad590c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Jun 2020 05:15:11 +0200 Subject: [PATCH 045/241] gnu: tup: Update to 0.7.9. * gnu/packages/build-tools.scm (tup): Update to 0.7.9. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 38bd906278..11aee07378 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -284,14 +284,14 @@ other lower-level build files."))) (define-public tup (package (name "tup") - (version "0.7.8") + (version "0.7.9") (source (origin (method url-fetch) (uri (string-append "http://gittup.org/tup/releases/tup-v" version ".tar.gz")) (sha256 (base32 - "1z8d5mmddiw3ckdvy88bi48aa5bm0hrid6g9c9hp2ynmpzywmp2h")) + "0gnd2598xqgwihdkfkx7qn0q6p4n7npam1fy83mp7s04zwj99syc")) (patches (search-patches "tup-unbundle-dependencies.patch")) (modules '((guix build utils))) (snippet From 40f986db301bdf678cc505e4869feedb3ce4f446 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Jun 2020 05:15:29 +0200 Subject: [PATCH 046/241] gnu: inxi-minimal: Update to 3.1.03-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.03-1. --- 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 d34864505a..a1b84f70a4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3472,7 +3472,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.01-1") + (version "3.1.03-1") (source (origin (method git-fetch) @@ -3481,7 +3481,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0r204w0r06ibdr4dck7yw2nmvj7xq68bjr7xwwiy7liqdml0n0yc")))) + (base32 "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) From 5ed89cac6441a81f75f97134a124fb029aaf8170 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jun 2020 14:30:12 +0200 Subject: [PATCH 047/241] gnu: volk: Fix typo in description. * gnu/packages/engineering.scm (volk)[description]: Fix typo. --- 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 6b776a175b..d88ff0a45f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1064,7 +1064,7 @@ the 'showing the effect of'-style of operation.") (synopsis "Vector-Optimized Library of Kernels") (description "@code{volk} contains procedures with machine-specific optimizations -for mathematical functions. It also provides an machine-independent +for mathematical functions. It also provides a machine-independent interface to select the best such procedures to use on a given system.") (license license:gpl3+))) From 4df47410cf84debed98c8d4934be6d7b614c9134 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jun 2020 14:35:22 +0200 Subject: [PATCH 048/241] gnu: volk: Improve description mark-up. * gnu/packages/engineering.scm (volk)[description]: Substitute @acronym for the less appropriate @code. --- gnu/packages/engineering.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d88ff0a45f..961174ee51 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1063,9 +1063,10 @@ the 'showing the effect of'-style of operation.") (home-page "https://www.libvolk.org/") (synopsis "Vector-Optimized Library of Kernels") (description - "@code{volk} contains procedures with machine-specific optimizations -for mathematical functions. It also provides a machine-independent -interface to select the best such procedures to use on a given system.") + "@acronym{VOLK, Vector-Optimized Library of Kernels} contains procedures +with machine-specific optimizations for mathematical functions. It also +provides a machine-independent interface to select the best such procedures to +use on a given system.") (license license:gpl3+))) (define-public minicom From fb8542ed5c6b8d31bf09a8db0b9b14e8766c5dc5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 16 Jun 2020 00:10:47 -0400 Subject: [PATCH 049/241] gnu: emacs-yasnippet: Clean-up package definition. An old snippet was causing the build to fail when using Emacs 27. * gnu/packages/emacs-xyz.scm (emacs-yasnippet)[source]: Use git-file-name, and remove obsolete snippet. [phases]{home}: New phase. This allows the rebindings test to pass. {make-tests-writable, delete-rebinding-test}: Remove phases. [description]: Re-indent. --- gnu/packages/emacs-xyz.scm | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e3c6c996cc..4d38c87570 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9507,48 +9507,26 @@ been adapted to work with mu4e.") (uri (git-reference (url "https://github.com/joaotavora/yasnippet.git") (commit version))) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (git-file-name name version)) (sha256 - (base32 "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv")) - (modules '((guix build utils))) - (snippet - '(begin - ;; YASnippet expects a "snippets" subdirectory in the same - ;; directory as yasnippet.el, but we don't install it because it's - ;; a git submodule pointing to an external repository. Adjust - ;; `yas-snippet-dirs' to prevent warnings about a missing - ;; directory. - (substitute* "yasnippet.el" - (("^ +'yas-installed-snippets-dir\\)\\)\n") - "))\n")) - #t)))) + (base32 "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv")))) (build-system emacs-build-system) (arguments `(#:tests? #t #:test-command '("emacs" "--batch" "-l" "yasnippet-tests.el" "-f" "ert-run-tests-batch-and-exit") - ;; FIXME: one failing test. #:phases (modify-phases %standard-phases - (add-before 'check 'make-tests-writable + ;; Set HOME, otherwise test-rebindings fails. + (add-before 'check 'set-home (lambda _ - (make-file-writable "yasnippet-tests.el") - #t)) - (add-before 'check 'delete-rebinding-test - (lambda _ - (emacs-batch-edit-file "yasnippet-tests.el" - `(progn (goto-char (point-min)) - (re-search-forward "ert-deftest test-rebindings") - (beginning-of-line) - (kill-sexp) - (basic-save-buffer))) + (setenv "HOME" (getcwd)) #t))))) (home-page "https://github.com/joaotavora/yasnippet") (synopsis "Yet another snippet extension for Emacs") - (description - "YASnippet is a template system for Emacs. It allows you to type an -abbreviation and automatically expand it into function templates.") + (description "YASnippet is a template system for Emacs. It allows you to +type an abbreviation and automatically expand it into function templates.") (license license:gpl3+))) (define-public emacs-yasnippet-snippets From 6a933e9a8b33a3b1f776218b39eede636dfd8c82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:16:37 +0200 Subject: [PATCH 050/241] gnu: Add r-profilemodel. * gnu/packages/cran.scm (r-profilemodel): New variable. --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bc391d9afd..7c750956c4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6634,6 +6634,29 @@ be added or removed. When working with Word documents, a cursor can be used to help insert or delete content at a specific location in the document.") (license license:gpl3))) +(define-public r-profilemodel + (package + (name "r-profilemodel") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "profileModel" version)) + (sha256 + (base32 + "0yq8hy43h62hlz8bbf9ila4a3xcwizi1if27b78xc5y857ncwad8")))) + (properties `((upstream-name . "profileModel"))) + (build-system r-build-system) + (home-page "https://github.com/ikosmidis/profileModel") + (synopsis "Profiling inference functions for various model classes") + (description + "This package provides tools that can be used to calculate, evaluate, +plot and use for inference the profiles of *arbitrary* inference functions for +arbitrary @code{glm}-like fitted models with linear predictors. More information +on the methods that are implemented can be found in Kosmidis (2008) +@url{https://www.r-project.org/doc/Rnews/Rnews_2008-2.pdf}.") + (license license:gpl2+))) + (define-public r-abn (package (name "r-abn") From aee8cc0a0d25fa8efccff825f1768d97fedadbbd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:16:51 +0200 Subject: [PATCH 051/241] gnu: Add r-brglm. * gnu/packages/cran.scm (r-brglm): New variable. --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7c750956c4..4afe9d489c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6657,6 +6657,37 @@ on the methods that are implemented can be found in Kosmidis (2008) @url{https://www.r-project.org/doc/Rnews/Rnews_2008-2.pdf}.") (license license:gpl2+))) +(define-public r-brglm + (package + (name "r-brglm") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "brglm" version)) + (sha256 + (base32 + "0c9ngscc6zlfm90fqyggnj04qfkhp5qgf5q3wnfpxwyc8cm47by2")))) + (properties `((upstream-name . "brglm"))) + (build-system r-build-system) + (propagated-inputs + `(("r-profilemodel" ,r-profilemodel))) + (home-page "https://github.com/ikosmidis/brglm") + (synopsis "Bias reduction in binomial-response generalized linear models") + (description + "Fit generalized linear models with binomial responses using either an +adjusted-score approach to bias reduction or maximum penalized likelihood +where penalization is by Jeffreys invariant prior. These procedures return +estimates with improved frequentist properties (bias, mean squared error) that +are always finite even in cases where the maximum likelihood estimates are +infinite (data separation). Fitting takes place by fitting generalized linear +models on iteratively updated pseudo-data. The interface is essentially the +same as @code{glm}. More flexibility is provided by the fact that custom +pseudo-data representations can be specified and used for model fitting. +Functions are provided for the construction of confidence intervals for the +reduced-bias estimates.") + (license license:gpl2+))) + (define-public r-abn (package (name "r-abn") From b1a7a3bb78e3f47af04019ce7a8a1738a4b64366 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:17:02 +0200 Subject: [PATCH 052/241] gnu: Add r-entropy. * gnu/packages/cran.scm (r-entropy): New variable. --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4afe9d489c..3d5027971b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6688,6 +6688,31 @@ Functions are provided for the construction of confidence intervals for the reduced-bias estimates.") (license license:gpl2+))) +(define-public r-entropy + (package + (name "r-entropy") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "entropy" version)) + (sha256 + (base32 + "10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd")))) + (properties `((upstream-name . "entropy"))) + (build-system r-build-system) + (home-page "https://www.strimmerlab.org/software/entropy/") + (synopsis "Estimation of entropy, mutual information and related quantities") + (description + "This package implements various estimators of entropy, such as the +shrinkage estimator by Hausser and Strimmer, the maximum likelihood and the +Millow-Madow estimator, various Bayesian estimators, and the Chao-Shen +estimator. It also offers an R interface to the NSB estimator. Furthermore, +it provides functions for estimating Kullback-Leibler divergence, chi-squared, +mutual information, and chi-squared statistic of independence. In addition +there are functions for discretizing continuous random variables.") + (license license:gpl3+))) + (define-public r-abn (package (name "r-abn") From e89bc53e76f44ef773e5a93906f806ff60fca7d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:25:52 +0200 Subject: [PATCH 053/241] gnu: r-circlize: Update to 0.4.10. * gnu/packages/cran.scm (r-circlize): Update to 0.4.10. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3d5027971b..fd30dfcda2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2131,14 +2131,14 @@ validation and filtering on the values, making options invisible or private.") (define-public r-circlize (package (name "r-circlize") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (cran-uri "circlize" version)) (sha256 (base32 - "14944vn0n5d095mpjyag4fz8vy04m6wxb6mmyygi8q813akikm3h")))) + "1xb1jq3mg4kw1513zv1i09vhn7rj7f8vp0bnms2qml74s47wxsgk")))) (build-system r-build-system) (propagated-inputs `(("r-colorspace" ,r-colorspace) From 389a357a721686c08b1bc1dacd0e761ebaebfcca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:32:46 +0200 Subject: [PATCH 054/241] gnu: r-vioplot: Update to 0.3.5. * gnu/packages/cran.scm (r-vioplot): Update to 0.3.5. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fd30dfcda2..a99381ff19 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3839,18 +3839,20 @@ structure.") (define-public r-vioplot (package (name "r-vioplot") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) (uri (cran-uri "vioplot" version)) (sha256 (base32 - "1fsklymilspzz5fzlj7666x09aglaw0v4x0yfjjzy4vr5qpjc529")))) + "0aiy615kn9lpr2cs757g3pklg81n01yhqh0wrwv111fn3cy86r0v")))) (build-system r-build-system) (propagated-inputs `(("r-sm" ,r-sm) ("r-zoo" ,r-zoo))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "http://wsopuppenkiste.wiso.uni-goettingen.de/~dadler") (synopsis "Violin plot") (description From ead67125a89225f9fe5dea74e7d46d2330723845 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:32:51 +0200 Subject: [PATCH 055/241] gnu: r-abn: Update to 2.2.1. * gnu/packages/cran.scm (r-abn): Update to 2.2.1. [propagated-inputs]: Add r-boot, r-brglm, r-entropy, and r-moments. --- gnu/packages/cran.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a99381ff19..5be15bbe8a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6718,20 +6718,24 @@ there are functions for discretizing continuous random variables.") (define-public r-abn (package (name "r-abn") - (version "2.2") + (version "2.2.1") (source (origin (method url-fetch) (uri (cran-uri "abn" version)) (sha256 (base32 - "19w6bdjyp4zwqs6p0flry4qxqynf9rh8ykdrfrp61wrdf7kysw0d")))) + "11nbg6dwvbj0ac7qvr203vzjnw5zc1a8cibb9l6rzzr7yfg16xzc")))) (build-system r-build-system) (inputs `(("gsl" ,gsl))) (propagated-inputs - `(("r-lme4" ,r-lme4) + `(("r-boot" ,r-boot) + ("r-brglm" ,r-brglm) + ("r-entropy" ,r-entropy) + ("r-lme4" ,r-lme4) ("r-mass" ,r-mass) + ("r-moments" ,r-moments) ("r-nnet" ,r-nnet) ("r-rcpp" ,r-rcpp) ("r-rcpparmadillo" ,r-rcpparmadillo) From e766bd1f1368e579dc81b1219a12211504b73ae0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:32:54 +0200 Subject: [PATCH 056/241] gnu: r-performance: Update to 0.4.7. * gnu/packages/cran.scm (r-performance): Update to 0.4.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5be15bbe8a..e5b3e013ae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9007,14 +9007,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "08i9ngvga06abs2k50gvkh6iwl4r77bkmmchsqjibsy09wdvd8xj")))) + "0gw165wm2a0vjsvyll8z9k6qd156z3jf4priy1r745v63x4mnb5k")))) (build-system r-build-system) (propagated-inputs `(("r-bayestestr" ,r-bayestestr) From 6afe39829d0c236484ba240410557452b69c7281 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:32:58 +0200 Subject: [PATCH 057/241] gnu: r-genenet: Update to 1.2.15. * gnu/packages/cran.scm (r-genenet): Update to 1.2.15. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e5b3e013ae..1740ed1744 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11854,14 +11854,14 @@ dynamical correlation and dynamical covariance.") (define-public r-genenet (package (name "r-genenet") - (version "1.2.14") + (version "1.2.15") (source (origin (method url-fetch) (uri (cran-uri "GeneNet" version)) (sha256 (base32 - "0cdhrj15rz0w0pyw3r8mikrzsdh95y5i1c0pa3cn0c2bjnjx3x3n")))) + "11ba6ahsk3x9alvcw8bai2bpg84ki1m8nadrjjdhjg65svhw8njm")))) (properties `((upstream-name . "GeneNet"))) (build-system r-build-system) (propagated-inputs From 000c7a0f70248ccf9dc774ef23da3e26d142c610 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 09:33:01 +0200 Subject: [PATCH 058/241] gnu: r-xgboost: Update to 1.1.1.1. * gnu/packages/cran.scm (r-xgboost): Update to 1.1.1.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1740ed1744..f3c90b073e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15924,14 +15924,14 @@ the current document.") (define-public r-xgboost (package (name "r-xgboost") - (version "1.0.0.2") + (version "1.1.1.1") (source (origin (method url-fetch) (uri (cran-uri "xgboost" version)) (sha256 (base32 - "1ld2w51c5fy3bl0kvjn1iplffc4lmin9s9zz5xx7xsm44d6j6kzd")))) + "13njhcxljhbcs37ni6r5174fk8kx9b5p7rlw1an1ak3w92jn56cq")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) From 391aff1f68d31b218c9ee2030a260e3c41223926 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Jun 2020 10:52:49 +0200 Subject: [PATCH 059/241] gnu: Add bsnes. * gnu/packages/emulators.scm (bsnes): New variable. --- gnu/packages/emulators.scm | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 59240f17c4..a951b03e32 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1622,3 +1622,46 @@ derived from Gens. Project goals include clean source code, combined features from various forks of Gens, and improved platform portability.") (supported-systems '("i686-linux" "x86_64-linux")) (license license:gpl2+))) + +(define-public bsnes + (package + (name "bsnes") + (version "115") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bsnes-emu/bsnes") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j054x38fwai61vj36sc04r3zkzay5acq2cgd9zqv5hs51s36g5b")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "-C" "bsnes" + (string-append "prefix=" (assoc-ref %outputs "out"))) + #:tests? #f ; No tests. + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("ao" ,ao) + ("cairo" ,cairo) + ("eudev" ,eudev) + ("gtk" ,gtk+-2) + ("gtksourceview-2" ,gtksourceview-2) + ("libx11" ,libx11) + ("libxrandr" ,libxrandr) + ("libxv" ,libxv) + ("openal" ,openal) + ("pulseaudio" ,pulseaudio) + ("sdl2" ,sdl2))) + (home-page "https://bsnes.dev/") + (synopsis "Emulator for the Super Nintendo / Super Famicom systems") + (description + "bsnes is a Super Nintendo / Super Famicom emulator that focuses on +performance, features, and ease of use.") + (license license:gpl3))) From 76a841cc8bd091db741758ae5553c714f2c38543 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 11:31:54 +0200 Subject: [PATCH 060/241] etc: Add committer script. * etc/committer.scm.in: New file. * configure.ac: Configure it. --- configure.ac | 1 + etc/committer.scm.in | 250 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+) create mode 100755 etc/committer.scm.in diff --git a/configure.ac b/configure.ac index cbf92dad30..7675eef7c4 100644 --- a/configure.ac +++ b/configure.ac @@ -301,6 +301,7 @@ AC_CONFIG_FILES([Makefile etc/guix-daemon.cil guix/config.scm]) +AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.scm]) AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env]) AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], [chmod +x pre-inst-env]) diff --git a/etc/committer.scm.in b/etc/committer.scm.in new file mode 100755 index 0000000000..2f247835f3 --- /dev/null +++ b/etc/committer.scm.in @@ -0,0 +1,250 @@ +#!@GUILE@ \ +--no-auto-compile -s +!# + +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ricardo Wurmus +;;; +;;; 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 . + +;;; Commentary: + +;; This script stages and commits changes to package definitions. + +;;; Code: + +(import (sxml xpath) + (srfi srfi-1) + (srfi srfi-9) + (ice-9 format) + (ice-9 popen) + (ice-9 match) + (ice-9 rdelim) + (ice-9 textual-ports)) + +(define (read-excursion port) + "Read an expression from PORT and reset the port position before returning +the expression." + (let ((start (ftell port)) + (result (read port))) + (seek port start SEEK_SET) + result)) + +(define (surrounding-sexp port line-no) + "Return the top-level S-expression surrounding the change at line number +LINE-NO in PORT." + (let loop ((i (1- line-no)) + (last-top-level-sexp #f)) + (if (zero? i) + last-top-level-sexp + (match (peek-char port) + (#\( + (let ((sexp (read-excursion port))) + (read-line port) + (loop (1- i) sexp))) + (_ + (read-line port) + (loop (1- i) last-top-level-sexp)))))) + +(define-record-type + (make-hunk file-name + old-line-number + new-line-number + diff) + hunk? + (file-name hunk-file-name) + ;; Line number before the change + (old-line-number hunk-old-line-number) + ;; Line number after the change + (new-line-number hunk-new-line-number) + ;; The full diff to be used with "git apply --cached" + (diff hunk-diff)) + +(define* (hunk->patch hunk #:optional (port (current-output-port))) + (let ((file-name (hunk-file-name hunk))) + (format port + "diff --git a/~a b/~a~%--- a/~a~%+++ b/~a~%~a" + file-name file-name file-name file-name + (hunk-diff hunk)))) + +(define (diff-info) + "Read the diff and return a list of values." + (let ((port (open-pipe* OPEN_READ + "git" "diff" + "--no-prefix" + ;; Do not include any context lines. This makes it + ;; easier to find the S-expression surrounding the + ;; change. + "--unified=0"))) + (define (extract-line-number line-tag) + (abs (string->number + (car (string-split line-tag #\,))))) + (define (read-hunk) + (reverse + (let loop ((lines '())) + (let ((line (read-line port 'concat))) + (cond + ((eof-object? line) lines) + ((or (string-prefix? "@@ " line) + (string-prefix? "diff --git" line)) + (unget-string port line) + lines) + (else (loop (cons line lines)))))))) + (define info + (let loop ((acc '()) + (file-name #f)) + (let ((line (read-line port))) + (cond + ((eof-object? line) acc) + ((string-prefix? "--- " line) + (match (string-split line #\space) + ((_ file-name) + (loop acc file-name)))) + ((string-prefix? "@@ " line) + (match (string-split line #\space) + ((_ old-start new-start . _) + (loop (cons (make-hunk file-name + (extract-line-number old-start) + (extract-line-number new-start) + (string-join (cons* line "\n" + (read-hunk)) "")) + acc) + file-name)))) + (else (loop acc file-name)))))) + (close-pipe port) + info)) + +(define (old-sexp hunk) + "Using the diff information in HUNK return the unmodified S-expression +corresponding to the top-level definition containing the staged changes." + ;; TODO: We can't seek with a pipe port... + (let* ((port (open-pipe* OPEN_READ + "git" "show" (string-append "HEAD:" + (hunk-file-name hunk)))) + (contents (get-string-all port))) + (close-pipe port) + (call-with-input-string contents + (lambda (port) + (surrounding-sexp port (hunk-old-line-number hunk)))))) + +(define (new-sexp hunk) + "Using the diff information in HUNK return the modified S-expression +corresponding to the top-level definition containing the staged changes." + (call-with-input-file (hunk-file-name hunk) + (lambda (port) + (surrounding-sexp port + (hunk-new-line-number hunk))))) + +(define* (commit-message file-name old new #:optional (port (current-output-port))) + "Print ChangeLog commit message for changes between OLD and NEW." + (define (get-values expr field) + (match ((sxpath `(// ,field quasiquote *)) expr) + (() '()) + ((first . rest) + (map cadadr first)))) + (define (listify items) + (match items + ((one) one) + ((one two) + (string-append one " and " two)) + ((one two . more) + (string-append (string-join (drop-right items 1) ", ") + ", and " (first (take-right items 1)))))) + (define variable-name + (second old)) + (define version + (and=> ((sxpath '(// version *any*)) new) + first)) + (format port + "gnu: ~a: Update to ~a.~%~%* ~a (~a): Update to ~a.~%" + variable-name version file-name variable-name version) + (for-each (lambda (field) + (let ((old-values (get-values old field)) + (new-values (get-values new field))) + (or (equal? old-values new-values) + (let ((removed (lset-difference eq? old-values new-values)) + (added (lset-difference eq? new-values old-values))) + (format port + "[~a]: ~a~%" field + (match (list (map symbol->string removed) + (map symbol->string added)) + ((() added) + (format #f "Add ~a." + (listify added))) + ((removed ()) + (format #f "Remove ~a." + (listify removed))) + ((removed added) + (format #f "Remove ~a; add ~a." + (listify removed) + (listify added))))))))) + '(inputs propagated-inputs native-inputs))) + +(define (group-hunks-by-sexp hunks) + "Return a list of pairs associating all hunks with the S-expression they are +modifying." + (fold (lambda (sexp hunk acc) + (match acc + (((previous-sexp . hunks) . rest) + (if (equal? sexp previous-sexp) + (cons (cons previous-sexp + (cons hunk hunks)) + rest) + (cons (cons sexp (list hunk)) + acc))) + (_ + (cons (cons sexp (list hunk)) + acc)))) + '() + (map new-sexp hunks) + hunks)) + +(define (new+old+hunks hunks) + (map (match-lambda + ((new . hunks) + (cons* new (old-sexp (first hunks)) hunks))) + (group-hunks-by-sexp hunks))) + +(define (main . args) + (match (diff-info) + (() + (display "Nothing to be done." (current-error-port))) + (hunks + (for-each (match-lambda + ((new old . hunks) + (for-each (lambda (hunk) + (let ((port (open-pipe* OPEN_WRITE + "git" "apply" + "--cached" + "--unidiff-zero"))) + (hunk->patch hunk port) + (unless (eqv? 0 (status:exit-val (close-pipe port))) + (error "Cannot apply"))) + (sleep 1)) + hunks) + (commit-message (hunk-file-name (first hunks)) + old new + (current-output-port)) + (let ((port (open-pipe* OPEN_WRITE "git" "commit" "-F" "-"))) + (commit-message (hunk-file-name (first hunks)) + old new + port) + (sleep 1) + (unless (eqv? 0 (status:exit-val (close-pipe port))) + (error "Cannot commit"))))) + (new+old+hunks hunks))))) + +(main) From 6675cd8c2408e8eecf652950da2b1a13df66c6d6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Jun 2020 12:46:58 +0300 Subject: [PATCH 061/241] gnu: Add rust-static-assertions-1. * gnu/packages/crates-io.scm (rust-static-assertions-1): New variable. (rust-static-assertions-0.3): Inherit from rust-static-assertions-1. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 30e00b3f48..c7145c84ee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21861,8 +21861,29 @@ deeply recursive algorithms that may accidentally blow the stack.") "StackVec: vector-like facade for stack-allocated arrays.") (license (list license:asl2.0 license:expat)))) +(define-public rust-static-assertions-1 + (package + (name "rust-static-assertions") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "static-assertions" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "0gsl6xmw10gvn3zs1rv99laj5ig7ylffnh71f9l34js4nr4r7sx2")))) + (build-system cargo-build-system) + (home-page "https://github.com/nvzqz/static-assertions-rs") + (synopsis "Compile-time assertions for rust") + (description + "This package provides compile-time assertions to ensure that invariants +are met.") + (license (list license:expat license:asl2.0)))) + (define-public rust-static-assertions-0.3 (package + (inherit rust-static-assertions-1) (name "rust-static-assertions") (version "0.3.4") (source @@ -21872,14 +21893,7 @@ deeply recursive algorithms that may accidentally blow the stack.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1lw33i89888yb3x29c6dv4mrkg3534n0rlg3r7qzh4p58xmv6gkz")))) - (build-system cargo-build-system) - (home-page "https://github.com/nvzqz/static-assertions-rs") - (synopsis "Compile-time assertions for rust") - (description - "This package provides compile-time assertions to ensure that invariants -are met.") - (license (list license:expat license:asl2.0)))) + "1lw33i89888yb3x29c6dv4mrkg3534n0rlg3r7qzh4p58xmv6gkz")))))) (define-public rust-stb-truetype-0.3 (package From 16dcf12736448d219c5a7246a75c0bfcbb302cbe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Jun 2020 12:47:58 +0300 Subject: [PATCH 062/241] gnu: Add rust-lexical-core-0.7. * gnu/packages/crates-io.scm (rust-lexical-core-0.7): New variable. (rust-lexical-core-0.4): Inherit from rust-lexical-core-0.7. --- gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c7145c84ee..2f81d35d88 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11178,8 +11178,43 @@ requires non-const function calls to be computed.") "This package provides a library providing a lazily filled Cell struct.") (license (list license:expat license:asl2.0)))) +(define-public rust-lexical-core-0.7 + (package + (name "rust-lexical-core") + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "lexical-core" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05i6b69ay8xbxw88vx89vglb7xm5n8ky82hax7d5a7z60bdccrfv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-dtoa" ,rust-dtoa-0.4) + ("rust-ryu" ,rust-ryu-1.0) + ("rust-static-assertions" ,rust-static-assertions-1)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-proptest" ,rust-proptest-0.9) + ("rust-quickcheck" ,rust-quickcheck-0.9)))) + (home-page + "https://github.com/Alexhuszagh/rust-lexical/tree/master/lexical-core") + (synopsis + "Lexical, to- and from-string conversion routines") + (description + "Lexical, to- and from-string conversion routines.") + (license (list license:expat license:asl2.0)))) + (define-public rust-lexical-core-0.4 (package + (inherit rust-lexical-core-0.7) (name "rust-lexical-core") (version "0.4.2") (source @@ -11191,7 +11226,6 @@ requires non-const function calls to be computed.") (sha256 (base32 "1gr5y3ykghd3wjc00l3iizkj1dxylyhwi6fj6yn2qg06nzx771iz")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -11204,14 +11238,7 @@ requires non-const function calls to be computed.") (("rust-approx" ,rust-approx-0.3) ("rust-proptest" ,rust-proptest-0.9) ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rustc-version" ,rust-rustc-version-0.2)))) - (home-page - "https://github.com/Alexhuszagh/rust-lexical/tree/master/lexical-core") - (synopsis - "Lexical, to- and from-string conversion routines") - (description - "Lexical, to- and from-string conversion routines.") - (license (list license:asl2.0 license:expat)))) + ("rust-rustc-version" ,rust-rustc-version-0.2)))))) (define-public rust-libc-0.2 (package From 88ff06415c060a35e65539b71f439a8dd45224ee Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Jun 2020 12:48:34 +0300 Subject: [PATCH 063/241] gnu: Add rust-nom-5. * gnu/packages/crates-io.scm (rust-nom-5): New variable. (rust-nom-4.2): Inherit from rust-nom-5. --- gnu/packages/crates-io.scm | 55 +++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2f81d35d88..4da1087671 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13448,8 +13448,53 @@ implementation (which is unstable / requires nightly).") (license (list license:asl2.0 license:expat)))) +(define-public rust-nom-5 + (package + (name "rust-nom") + (version "5.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "nom" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1br74rwdp3c2ddga03bphnf355spn4mzwf1slg0a30zd4qnjdd7z")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests require example directory, not included in tarball. + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lexical-core" ,rust-lexical-core-0.7) + ("rust-memchr" ,rust-memchr-2.2) + ("rust-regex" ,rust-regex-1.1) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-jemallocator" ,rust-jemallocator-0.1)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'override-jemalloc + (lambda* (#:key inputs #:allow-other-keys) + (let ((jemalloc (assoc-ref inputs "jemalloc"))) + (setenv "JEMALLOC_OVERRIDE" + (string-append jemalloc "/lib/libjemalloc_pic.a"))) + #t))))) + (native-inputs + `(("jemalloc" ,jemalloc))) + (home-page "https://github.com/Geal/nom") + (synopsis + "Byte-oriented, zero-copy, parser combinators library") + (description + "This package provides a byte-oriented, zero-copy, parser +combinators library.") + (license license:expat))) + (define-public rust-nom-4.2 (package + (inherit rust-nom-5) (name "rust-nom") (version "4.2.3") (source @@ -13461,7 +13506,6 @@ implementation (which is unstable / requires nightly).") (sha256 (base32 "1mkvby8b4m61p4g1px0pwr58yfkphyp1jcfbp4qfp7l6iqdaklia")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -13471,14 +13515,7 @@ implementation (which is unstable / requires nightly).") ("rust-version-check" ,rust-version-check-0.1)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2) - ("rust-jemallocator" ,rust-jemallocator-0.1)))) - (home-page "https://github.com/Geal/nom") - (synopsis - "Byte-oriented, zero-copy, parser combinators library") - (description - "This package provides a byte-oriented, zero-copy, parser -combinators library.") - (license license:expat))) + ("rust-jemallocator" ,rust-jemallocator-0.1)))))) (define-public rust-nom-3 (package From 52adfeaed42dd3db1ff00fbeb9b609bd5e4a250a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Jun 2020 12:13:58 +0200 Subject: [PATCH 064/241] gnu: bsnes: Remove unnecessary inputs. * gnu/packages/emulators.scm (bsnes)[inputs]: Remove gt+-2 and libx11. --- gnu/packages/emulators.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a951b03e32..6acd6d63d3 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1651,9 +1651,7 @@ from various forks of Gens, and improved platform portability.") ("ao" ,ao) ("cairo" ,cairo) ("eudev" ,eudev) - ("gtk" ,gtk+-2) ("gtksourceview-2" ,gtksourceview-2) - ("libx11" ,libx11) ("libxrandr" ,libxrandr) ("libxv" ,libxv) ("openal" ,openal) From 5f7b17a6e1205d9f337ffbfd5fa29e0aea15d438 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 12:50:24 +0200 Subject: [PATCH 065/241] gnu: emacs-god-mode: Update to 2.17.0. * gnu/packages/emacs-xyz.scm (emacs-god-mode): Update to 2.17.0. --- gnu/packages/emacs-xyz.scm | 41 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4d38c87570..d5e30acf6d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5160,31 +5160,28 @@ linting of manifests and integration with Puppet Debugger.") (license license:gpl3+)))) (define-public emacs-god-mode - (let ((commit "6cf0807b6555eb6fcf8387a4e3b667071ef38964") - (revision "1")) - (package - (name "emacs-god-mode") - (version (string-append "20151005.925." - revision "-" (string-take commit 9))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/chrisdone/god-mode.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix")))) - (build-system emacs-build-system) - (home-page "https://github.com/chrisdone/god-mode") - (synopsis "Minor mode for entering commands without modifier keys") - (description - "This package provides a global minor mode for entering Emacs commands + (package + (name "emacs-god-mode") + (version "2.17.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chrisdone/god-mode.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1d2nrj35fzhnycchi0b7m5mbk5fyq7bgpbkkvc5xzqafclrsnapi")))) + (build-system emacs-build-system) + (home-page "https://github.com/chrisdone/god-mode") + (synopsis "Minor mode for entering commands without modifier keys") + (description + "This package provides a global minor mode for entering Emacs commands without modifier keys. It's similar to Vim's separation of commands and insertion mode. When enabled all keys are implicitly prefixed with @samp{C-} (among other helpful shortcuts).") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-jinja2-mode (package From 38ee8f7dbaabbb1ba28bc0fa6240a19bba2450c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Jun 2020 22:03:27 +0200 Subject: [PATCH 066/241] pack: Add zstd compressor. * guix/scripts/pack.scm (%compressors): Add zstd. * doc/guix.texi (Invoking guix pack): Document it. --- doc/guix.texi | 3 ++- guix/scripts/pack.scm | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index ab44dd76ac..6b4fa5b441 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5345,7 +5345,8 @@ configuration triplets,, autoconf, Autoconf}). @item --compression=@var{tool} @itemx -C @var{tool} Compress the resulting tarball using @var{tool}---one of @code{gzip}, -@code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no compression. +@code{zstd}, @code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no +compression. @item --symlink=@var{spec} @itemx -S @var{spec} diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 518bf6e7e3..55fb3e8df3 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Konrad Hinsen ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,6 +82,11 @@ #~(#+(file-append xz "/bin/xz") "-e")) (compressor "bzip2" ".bz2" #~(#+(file-append bzip2 "/bin/bzip2") "-9")) + (compressor "zstd" ".zst" + ;; The default level 3 compresses better than gzip in a + ;; fraction of the time, while the highest level 19 + ;; (de)compresses more slowly and worse than xz. + #~(#+(file-append zstd "/bin/zstd") "-3")) (compressor "none" "" #f))) ;; This one is only for use in this module, so don't put it in %compressors. From b6329d026b6b5ac58cfcfeb26e786aacf70bd636 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Jun 2020 13:17:40 +0200 Subject: [PATCH 067/241] gnu: nix: Look for configuration in /etc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/package-management.scm (nix)[arguments]: Add ‘--sysconfdir=/etc’ configure flag and override it during installation. Requested-and-tested-by: Peng Mei Yu --- gnu/packages/package-management.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c1e6657dff..4b1c5a6d55 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -551,6 +551,21 @@ out) and returning a package that uses that as its 'source'." (base32 "1hbqsrp1ii2sfq8x2mahjrl2182qck76n8blrl1jfz3xq99m6i15")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--sysconfdir=/etc") + #:phases + (modify-phases %standard-phases + (replace 'install + ;; Don't try & fail to create subdirectories in /etc, but keep them + ;; in the output as examples. + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (etc (string-append out "/etc"))) + (apply invoke "make" "install" + (string-append "sysconfdir=" etc) + (string-append "profiledir=" etc "/profile.d") + make-flags))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) ("brotli" ,brotli) From 3646a44a14337f284139faab0e8992448517aafb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Jun 2020 16:39:32 +0300 Subject: [PATCH 068/241] build-system: cmake: Add substitutable keyword. * guix/build-system/cmake.scm (cmake-build, cmake-cross-build): Add substitutable keyword. --- guix/build-system/cmake.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 29259c5785..f590b6ea42 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2020 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,6 +114,7 @@ (phases '(@ (guix build cmake-build-system) %standard-phases)) (system (%current-system)) + (substitutable? #t) (imported-modules %cmake-build-system-modules) (modules '((guix build cmake-build-system) (guix build utils)))) @@ -162,6 +164,7 @@ provides a 'CMakeLists.txt' file as its build system." #:inputs inputs #:modules imported-modules #:outputs outputs + #:substitutable? substitutable? #:guile-for-build guile-for-build)) @@ -192,6 +195,7 @@ provides a 'CMakeLists.txt' file as its build system." "bin" "sbin")) (phases '(@ (guix build cmake-build-system) %standard-phases)) + (substitutable? #t) (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %cmake-build-system-modules) @@ -271,6 +275,7 @@ build system." #:inputs (append native-drvs target-drvs) #:outputs outputs #:modules imported-modules + #:substitutable? substitutable? #:guile-for-build guile-for-build)) (define cmake-build-system From 33391ee5c1716b35b9577237e18f5fc347192a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 15 Jun 2020 14:12:46 +0200 Subject: [PATCH 069/241] doc: Recommend "make authenticate" after ./bootstrap. * doc/contributing.texi (Building from Git): Move "make authenticate" instructions below. --- doc/contributing.texi | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index c56f4fd2e9..4d3b930177 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -67,21 +67,6 @@ gpg: using RSA key 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 @code{3CE464558A84FDC69DB40CFB090B11993D9AEBB5} (you may need to fetch this key from a key server, if you have not done it yet). -From there on, you can authenticate all the commits included in your -checkout by running: - -@example -make authenticate -@end example - -The first run takes a couple of minutes, but subsequent runs are faster. - -@quotation Note -You are advised to run @command{make authenticate} after every -@command{git pull} invocation. This ensures you keep receiving valid -changes to the repository -@end quotation - The easiest way to set up a development environment for Guix is, of course, by using Guix! The following command starts a new shell where all the dependencies and appropriate environment variables are set up to @@ -146,6 +131,21 @@ Finally, you have to invoke @code{make check} to run tests fails, take a look at installation instructions (@pxref{Installation}) or send a message to the @email{guix-devel@@gnu.org, mailing list}. +From there on, you can authenticate all the commits included in your +checkout by running: + +@example +make authenticate +@end example + +The first run takes a couple of minutes, but subsequent runs are faster. + +@quotation Note +You are advised to run @command{make authenticate} after every +@command{git pull} invocation. This ensures you keep receiving valid +changes to the repository. +@end quotation + @node Running Guix Before It Is Installed @section Running Guix Before It Is Installed From a450b4343bc1e5284c4db6409976eba7bb92df19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Jun 2020 11:50:57 +0200 Subject: [PATCH 070/241] git-authenticate: Cache takes a key parameter. * guix/git-authenticate.scm (authenticated-commit-cache-file) (cache-authenticated-commit, previously-authenticated-commits): Add 'key' parameter and honor it. * build-aux/git-authenticate.scm (git-authenticate): Pass "channels/guix" as the key. --- build-aux/git-authenticate.scm | 5 +++-- guix/git-authenticate.scm | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 5e1fdaaa24..a3d4b40ccf 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -252,7 +252,7 @@ (filter-map (lambda (id) (false-if-exception (commit-lookup repository (string->oid id)))) - (previously-authenticated-commits))) + (previously-authenticated-commits "channels/guix"))) (define commits ;; Commits to authenticate, excluding the closure of @@ -274,7 +274,8 @@ #:default-authorizations %historical-authorized-signing-keys #:report-progress report))))) - (cache-authenticated-commit (oid->string (commit-id end-commit))) + (cache-authenticated-commit "channels/guix" + (oid->string (commit-id end-commit))) (unless (null? stats) (format #t (G_ "Signing statistics:~%")) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 0d6f696a0b..cdb54a01a7 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -295,33 +295,33 @@ The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY." ;;; Caching. ;;; -(define (authenticated-commit-cache-file) +(define (authenticated-commit-cache-file key) "Return the name of the file that contains the cache of -previously-authenticated commits." - (string-append (cache-directory) "/authentication/channels/guix")) +previously-authenticated commits for KEY." + (string-append (cache-directory) "/authentication/" key)) -(define (previously-authenticated-commits) - "Return the previously-authenticated commits as a list of commit IDs (hex -strings)." +(define (previously-authenticated-commits key) + "Return the previously-authenticated commits under KEY as a list of commit +IDs (hex strings)." (catch 'system-error (lambda () - (call-with-input-file (authenticated-commit-cache-file) + (call-with-input-file (authenticated-commit-cache-file key) read)) (lambda args (if (= ENOENT (system-error-errno args)) '() (apply throw args))))) -(define (cache-authenticated-commit commit-id) - "Record in ~/.cache COMMIT-ID and its closure as authenticated (only -COMMIT-ID is written to cache, though)." +(define (cache-authenticated-commit key commit-id) + "Record in ~/.cache, under KEY, COMMIT-ID and its closure as +authenticated (only COMMIT-ID is written to cache, though)." (define %max-cache-length ;; Maximum number of commits in cache. 200) (let ((lst (delete-duplicates - (cons commit-id (previously-authenticated-commits)))) - (file (authenticated-commit-cache-file))) + (cons commit-id (previously-authenticated-commits key)))) + (file (authenticated-commit-cache-file key))) (mkdir-p (dirname file)) (with-atomic-file-output file (lambda (port) From 41946b79f10d9b18e66c81f4eb35e1fde132c3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Jun 2020 11:52:15 +0200 Subject: [PATCH 071/241] git-authenticate: 'authenticate-commits' takes a #:keyring parameter. * guix/git-authenticate.scm (authenticate-commits): Add #:keyring parameter. --- guix/git-authenticate.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index cdb54a01a7..228d551d11 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -271,13 +271,13 @@ an OpenPGP keyring." #:key (default-authorizations '()) (keyring-reference "keyring") + (keyring (load-keyring-from-reference + repository keyring-reference)) (report-progress (const #t))) "Authenticate COMMITS, a list of commit objects, calling REPORT-PROGRESS for each of them. Return an alist showing the number of occurrences of each key. -The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY." - (define keyring - (load-keyring-from-reference repository keyring-reference)) - +If KEYRING is omitted, the OpenPGP keyring is loaded from KEYRING-REFERENCE in +REPOSITORY." (fold (lambda (commit stats) (report-progress) (let ((signer (authenticate-commit repository commit keyring From 1e2b9bf2d4ed4edc9ed70c51f414bb2890074a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Jun 2020 16:34:53 +0200 Subject: [PATCH 072/241] tests: Move OpenPGP helpers to (guix tests gnupg). * tests/git-authenticate.scm (key-id): Remove. (%ed25519-public-key-file, %ed25519-secret-key-file) (%ed25519bis-public-key-file, %ed25519bis-secret-key-file) (read-openpgp-packet, key-fingerprint): Move to... * guix/tests/gnupg.scm: ... here. --- guix/tests/gnupg.scm | 32 +++++++++++++++++++++++++++++++- tests/git-authenticate.scm | 25 ------------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm index 47c858d232..eb8ff63a43 100644 --- a/guix/tests/gnupg.scm +++ b/guix/tests/gnupg.scm @@ -17,12 +17,23 @@ ;;; along with GNU Guix. If not, see . (define-module (guix tests gnupg) + #:use-module (guix openpgp) #:use-module (guix utils) #:use-module (guix build utils) + #:use-module (rnrs io ports) #:use-module (ice-9 match) #:export (gpg-command gpgconf-command - with-fresh-gnupg-setup)) + with-fresh-gnupg-setup + + %ed25519-public-key-file + %ed25519-secret-key-file + %ed25519bis-public-key-file + %ed25519bis-secret-key-file + + read-openpgp-packet + key-fingerprint + key-id)) (define gpg-command (make-parameter "gpg")) @@ -50,3 +61,22 @@ listed in IMPORTED, and only them, have been imported. This sets 'GNUPGHOME' such that the user's real GnuPG files are left untouched. The 'gpg-agent' process is terminated afterwards." (call-with-fresh-gnupg-setup imported (lambda () exp ...))) + +(define %ed25519-public-key-file + (search-path %load-path "tests/ed25519.key")) +(define %ed25519-secret-key-file + (search-path %load-path "tests/ed25519.sec")) +(define %ed25519bis-public-key-file + (search-path %load-path "tests/ed25519bis.key")) +(define %ed25519bis-secret-key-file + (search-path %load-path "tests/ed25519bis.sec")) + +(define (read-openpgp-packet file) + (get-openpgp-packet + (open-bytevector-input-port + (call-with-input-file file read-radix-64)))) + +(define key-fingerprint + (compose openpgp-format-fingerprint + openpgp-public-key-fingerprint + read-openpgp-packet)) diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm index 97990acaea..a06176c16b 100644 --- a/tests/git-authenticate.scm +++ b/tests/git-authenticate.scm @@ -32,31 +32,6 @@ ;; Test the (guix git-authenticate) tools. -(define %ed25519-public-key-file - (search-path %load-path "tests/ed25519.key")) -(define %ed25519-secret-key-file - (search-path %load-path "tests/ed25519.sec")) -(define %ed25519bis-public-key-file - (search-path %load-path "tests/ed25519bis.key")) -(define %ed25519bis-secret-key-file - (search-path %load-path "tests/ed25519bis.sec")) - -(define (read-openpgp-packet file) - (get-openpgp-packet - (open-bytevector-input-port - (call-with-input-file file read-radix-64)))) - -(define key-fingerprint - (compose openpgp-format-fingerprint - openpgp-public-key-fingerprint - read-openpgp-packet)) - -(define (key-id file) - (define id - (openpgp-public-key-id (read-openpgp-packet))) - - (string-pad (number->string id 16) 16 #\0)) - (define (gpg+git-available?) (and (which (git-command)) (which (gpg-command)) (which (gpgconf-command)))) From 43badf261f4688c8a7a7a9004a4bff8acb205835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Jun 2020 12:01:24 +0200 Subject: [PATCH 073/241] channels: 'latest-channel-instance' authenticates Git checkouts. Fixes . * guix/channels.scm ()[introduction]: New field. (): New record type. (%guix-channel-introduction): New variable. (%default-channels): Use it. ()[keyring-reference]: New field. (%default-keyring-reference): New variable. (read-channel-metadata, read-channel-metadata-from-source): Initialize the 'keyring-reference' field. (commit-short-id, verify-introductory-commit) (authenticate-channel): New procedures. (latest-channel-instance): Call 'authenticate-channel' when CHANNEL has an introduction. * tests/channels.scm (gpg+git-available?, commit-id-string): New procedures. ("authenticate-channel, wrong first commit signer"): ("authenticate-channel, .guix-authorizations"): New tests. * doc/guix.texi (Invoking guix pull): Mention authentication. --- .dir-locals.el | 1 + doc/guix.texi | 6 +- guix/channels.scm | 182 +++++++++++++++++++++++++++++++++++++++++++-- tests/channels.scm | 122 ++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+), 7 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index b88ec7a795..92979fc5ed 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -99,6 +99,7 @@ (eval . (put 'eventually 'scheme-indent-function 1)) (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1)) + (eval . (put 'with-repository 'scheme-indent-function 2)) (eval . (put 'with-temporary-git-repository 'scheme-indent-function 2)) (eval . (put 'with-environment-variables 'scheme-indent-function 1)) (eval . (put 'with-fresh-gnupg-setup 'scheme-indent-function 1)) diff --git a/doc/guix.texi b/doc/guix.texi index 6b4fa5b441..dd626816d0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3721,13 +3721,17 @@ this option is primarily useful when the daemon was running with @cindex updating Guix @cindex @command{guix pull} @cindex pull +@cindex security, @command{guix pull} +@cindex authenticity, of code obtained with @command{guix pull} Packages are installed or upgraded to the latest version available in the distribution currently available on your local machine. To update that distribution, along with the Guix tools, you must run @command{guix pull}: the command downloads the latest Guix source code and package descriptions, and deploys it. Source code is downloaded from a @uref{https://git-scm.com, Git} repository, by default the official -GNU@tie{}Guix repository, though this can be customized. +GNU@tie{}Guix repository, though this can be customized. @command{guix +pull} ensures that the code it downloads is @emph{authentic} by +verifying that commits are signed by Guix developers. Specifically, @command{guix pull} downloads code from the @dfn{channels} (@pxref{Channels}) specified by one of the followings, in this order: diff --git a/guix/channels.scm b/guix/channels.scm index 84c47fc0d0..1ce915002c 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -21,6 +21,11 @@ (define-module (guix channels) #:use-module (git) #:use-module (guix git) + #:use-module (guix git-authenticate) + #:use-module ((guix openpgp) + #:select (openpgp-public-key-fingerprint + openpgp-format-fingerprint)) + #:use-module (guix base16) #:use-module (guix records) #:use-module (guix gexp) #:use-module (guix modules) @@ -28,6 +33,7 @@ #:use-module (guix monads) #:use-module (guix profiles) #:use-module (guix packages) + #:use-module (guix progress) #:use-module (guix derivations) #:use-module (guix combinators) #:use-module (guix diagnostics) @@ -48,17 +54,23 @@ #:autoload (guix self) (whole-package make-config.scm) #:autoload (guix inferior) (gexp->derivation-in-inferior) ;FIXME: circular dep #:autoload (guix quirks) (%quirks %patches applicable-patch? apply-patch) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:use-module ((ice-9 rdelim) #:select (read-string)) + #:use-module ((rnrs bytevectors) #:select (bytevector=?)) #:export (channel channel? channel-name channel-url channel-branch channel-commit + channel-introduction channel-location + channel-introduction? + ;; accessors purposefully omitted for now. + %default-channels guix-channel? @@ -67,6 +79,7 @@ channel-instance-commit channel-instance-checkout + authenticate-channel latest-channel-instances checkout->channel-instance latest-channel-derivation @@ -104,15 +117,44 @@ (url channel-url) (branch channel-branch (default "master")) (commit channel-commit (default #f)) + (introduction channel-introduction (default #f)) (location channel-location (default (current-source-location)) (innate))) +;; Channel introductions. A "channel introduction" provides a commit/signer +;; pair that specifies the first commit of the authentication process as well +;; as its signer's fingerprint. The pair must be signed by the signer of that +;; commit so that only them may emit this introduction. Introductions are +;; used to bootstrap trust in a channel. +(define-record-type + (make-channel-introduction first-signed-commit first-commit-signer + signature) + channel-introduction? + (first-signed-commit channel-introduction-first-signed-commit) ;hex string + (first-commit-signer channel-introduction-first-commit-signer) ;bytevector + (signature channel-introduction-signature)) ;string + +(define %guix-channel-introduction + ;; Introduction of the official 'guix channel. The chosen commit is the + ;; first one that introduces '.guix-authorizations' on the 'staging' + ;; branch that was eventually merged in 'master'. Any branch starting + ;; before that commit cannot be merged or it will be rejected by 'guix pull' + ;; & co. + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" ;2020-05-26 + (base16-string->bytevector + (string-downcase + (string-filter char-set:hex-digit ;mbakke + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))) + #f)) ;TODO: Add an intro signature so it can be exported. + (define %default-channels ;; Default list of channels. (list (channel (name 'guix) (branch "master") - (url "https://git.savannah.gnu.org/git/guix.git")))) + (url "https://git.savannah.gnu.org/git/guix.git") + (introduction %guix-channel-introduction)))) (define (guix-channel? channel) "Return true if CHANNEL is the 'guix' channel." @@ -126,11 +168,16 @@ (checkout channel-instance-checkout)) (define-record-type - (channel-metadata directory dependencies news-file) + (channel-metadata directory dependencies news-file keyring-reference) channel-metadata? (directory channel-metadata-directory) ;string with leading slash (dependencies channel-metadata-dependencies) ;list of - (news-file channel-metadata-news-file)) ;string | #f + (news-file channel-metadata-news-file) ;string | #f + (keyring-reference channel-metadata-keyring-reference)) ;string + +(define %default-keyring-reference + ;; Default value of the 'keyring-reference' field. + "keyring") (define (channel-reference channel) "Return the \"reference\" for CHANNEL, an sexp suitable for @@ -147,7 +194,10 @@ if valid metadata could not be read from PORT." (('channel ('version 0) properties ...) (let ((directory (and=> (assoc-ref properties 'directory) first)) (dependencies (or (assoc-ref properties 'dependencies) '())) - (news-file (and=> (assoc-ref properties 'news-file) first))) + (news-file (and=> (assoc-ref properties 'news-file) first)) + (keyring-reference + (or (and=> (assoc-ref properties 'keyring-reference) first) + %default-keyring-reference))) (channel-metadata (cond ((not directory) "/") ;directory ((string-prefix? "/" directory) directory) @@ -164,7 +214,8 @@ if valid metadata could not be read from PORT." (url url) (commit (get 'commit)))))) dependencies) - news-file))) ;news-file + news-file + keyring-reference))) ((and ('channel ('version version) _ ...) sexp) (raise (condition (&message (message "unsupported '.guix-channel' version")) @@ -188,7 +239,7 @@ doesn't exist." read-channel-metadata)) (lambda args (if (= ENOENT (system-error-errno args)) - (channel-metadata "/" '() #f) + (channel-metadata "/" '() #f %default-keyring-reference) (apply throw args))))) (define (channel-instance-metadata instance) @@ -212,6 +263,116 @@ result is unspecified." (apply-patch patch checkout)) (loop rest))))) +(define commit-short-id + (compose (cut string-take <> 7) oid->string commit-id)) + +(define (verify-introductory-commit repository introduction keyring) + "Raise an exception if the first commit described in INTRODUCTION doesn't +have the expected signer." + (define commit-id + (channel-introduction-first-signed-commit introduction)) + + (define actual-signer + (openpgp-public-key-fingerprint + (commit-signing-key repository (string->oid commit-id) + keyring))) + + (define expected-signer + (channel-introduction-first-commit-signer introduction)) + + (unless (bytevector=? expected-signer actual-signer) + (raise (condition + (&message + (message (format #f (G_ "initial commit ~a is signed by '~a' \ +instead of '~a'") + commit-id + (openpgp-format-fingerprint actual-signer) + (openpgp-format-fingerprint expected-signer)))))))) + +(define* (authenticate-channel channel checkout commit + #:key (keyring-reference-prefix "origin/")) + "Authenticate the given COMMIT of CHANNEL, available at CHECKOUT, a +directory containing a CHANNEL checkout. Raise an error if authentication +fails." + ;; XXX: Too bad we need to re-open CHECKOUT. + (with-repository checkout repository + (define start-commit + (commit-lookup repository + (string->oid + (channel-introduction-first-signed-commit + (channel-introduction channel))))) + + (define end-commit + (commit-lookup repository (string->oid commit))) + + (define cache-key + (string-append "channels/" (symbol->string (channel-name channel)))) + + (define keyring-reference + (channel-metadata-keyring-reference + (read-channel-metadata-from-source checkout))) + + (define keyring + (load-keyring-from-reference repository + (string-append keyring-reference-prefix + keyring-reference))) + + (define authenticated-commits + ;; Previously-authenticated commits that don't need to be checked again. + (filter-map (lambda (id) + (false-if-exception + (commit-lookup repository (string->oid id)))) + (previously-authenticated-commits cache-key))) + + (define commits + ;; Commits to authenticate, excluding the closure of + ;; AUTHENTICATED-COMMITS. + (commit-difference end-commit start-commit + authenticated-commits)) + + (define reporter + (progress-reporter/bar (length commits))) + + ;; When COMMITS is empty, it's either because AUTHENTICATED-COMMITS + ;; contains END-COMMIT or because END-COMMIT is not a descendant of + ;; START-COMMIT. Check that. + (if (null? commits) + (match (commit-relation start-commit end-commit) + ((or 'self 'ancestor 'descendant) #t) ;nothing to do! + ('unrelated + (raise + (condition + (&message + (message + (format #f (G_ "'~a' is not related to introductory \ +commit of channel '~a'~%") + (oid->string (commit-id end-commit)) + (channel-name channel)))))))) + (begin + (format (current-error-port) + (G_ "Authenticating channel '~a', \ +commits ~a to ~a (~h new commits)...~%") + (channel-name channel) + (commit-short-id start-commit) + (commit-short-id end-commit) + (length commits)) + + ;; If it's our first time, verify CHANNEL's introductory commit. + (when (null? authenticated-commits) + (verify-introductory-commit repository + (channel-introduction channel) + keyring)) + + (call-with-progress-reporter reporter + (lambda (report) + (authenticate-commits repository commits + #:keyring keyring + #:report-progress report))) + + (cache-authenticated-commit cache-key + (oid->string + (commit-id end-commit))))))) + (define* (latest-channel-instance store channel #:key (patches %patches) starting-commit) @@ -225,6 +386,15 @@ relation to STARTING-COMMIT when provided." (update-cached-checkout (channel-url channel) #:ref (channel-reference channel) #:starting-commit starting-commit))) + (if (channel-introduction channel) + (authenticate-channel channel checkout commit) + ;; TODO: Warn for all the channels once the authentication interface + ;; is public. + (when (guix-channel? channel) + (warning (G_ "channel '~a' lacks an introduction and \ +cannot be authenticated~%") + (channel-name channel)))) + (when (guix-channel? channel) ;; Apply the relevant subset of PATCHES directly in CHECKOUT. This is ;; safe to do because 'switch-to-ref' eventually does a hard reset. diff --git a/tests/channels.scm b/tests/channels.scm index 3b141428c8..2c857083e9 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -31,15 +31,28 @@ #:use-module ((guix build utils) #:select (which)) #:use-module (git) #:use-module (guix git) + #:use-module (guix git-authenticate) + #:use-module (guix openpgp) #:use-module (guix tests git) + #:use-module (guix tests gnupg) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-64) + #:use-module (rnrs bytevectors) + #:use-module (rnrs io ports) #:use-module (ice-9 control) #:use-module (ice-9 match)) +(define (gpg+git-available?) + (and (which (git-command)) + (which (gpg-command)) (which (gpgconf-command)))) + +(define commit-id-string + (compose oid->string commit-id)) + + (test-begin "channels") (define* (make-instance #:key @@ -389,4 +402,113 @@ (channel-news-for-commit channel commit5 commit1)) '(#f "tag-for-first-news-entry"))))))) +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "authenticate-channel, wrong first commit signer" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file + %ed25519bis-public-key-file + %ed25519bis-secret-key-file) + (with-temporary-git-repository directory + `((add ".guix-channel" + ,(object->string + '(channel (version 0) + (keyring-reference "master")))) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Charlie")))))) + (add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let* ((commit1 (find-commit repository "first")) + (intro ((@@ (guix channels) make-channel-introduction) + (commit-id-string commit1) + (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519bis-public-key-file)) ;different key + #f)) ;no signature + (channel (channel (name 'example) + (url (string-append "file://" directory)) + (introduction intro)))) + (guard (c ((message? c) + (->bool (string-contains (condition-message c) + "initial commit")))) + (authenticate-channel channel directory + (commit-id-string commit1) + #:keyring-reference-prefix "") + 'failed)))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "authenticate-channel, .guix-authorizations" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file + %ed25519bis-public-key-file + %ed25519bis-secret-key-file) + (with-temporary-git-repository directory + `((add ".guix-channel" + ,(object->string + '(channel (version 0) + (keyring-reference "channel-keyring")))) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Charlie")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "c.txt" "C") + (commit "third commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file))) + (branch "channel-keyring") + (checkout "channel-keyring") + (add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add "other.key" ,(call-with-input-file %ed25519bis-public-key-file + get-string-all)) + (commit "keyring commit") + (checkout "master")) + (with-repository directory repository + (let* ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second")) + (commit3 (find-commit repository "third")) + (intro ((@@ (guix channels) make-channel-introduction) + (commit-id-string commit1) + (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519-public-key-file)) + #f)) ;no signature + (channel (channel (name 'example) + (url (string-append "file://" directory)) + (introduction intro)))) + ;; COMMIT1 and COMMIT2 are fine. + (and (authenticate-channel channel directory + (commit-id-string commit2) + #:keyring-reference-prefix "") + + ;; COMMIT3 is signed by an unauthorized key according to its + ;; parent's '.guix-authorizations' file. + (guard (c ((unauthorized-commit-error? c) + (and (oid=? (git-authentication-error-commit c) + (commit-id commit3)) + (bytevector=? + (openpgp-public-key-fingerprint + (unauthorized-commit-error-signing-key c)) + (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519bis-public-key-file)))))) + (authenticate-channel channel directory + (commit-id-string commit3) + #:keyring-reference-prefix "") + 'failed))))))) + (test-end "channels") From 5bafc70d1e1daf6a91e8bf29a464263262505f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Jun 2020 22:46:06 +0200 Subject: [PATCH 074/241] channels: Make 'validate-pull' call right after clone/pull. This should come before patching, authentication, etc. * guix/channels.scm (latest-channel-instance): Add #:validate-pull parameter and honor it. Return a single value: the instance. (ensure-forward-channel-update): Change 'instance' parameter to 'commit' and adjust accordingly. (latest-channel-instances): Adjust to 'latest-channel-instance' changes. * guix/scripts/pull.scm (warn-about-backward-updates): Change 'instance' parameter to 'commit' and adjust accordingly. * tests/channels.scm ("latest-channel-instances #:validate-pull"): Likewise. --- guix/channels.scm | 37 ++++++++++++++++++++----------------- guix/scripts/pull.scm | 10 ++++------ tests/channels.scm | 4 ++-- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 1ce915002c..02e361bd77 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -375,9 +375,12 @@ commits ~a to ~a (~h new commits)...~%") (define* (latest-channel-instance store channel #:key (patches %patches) - starting-commit) - "Return two values: the latest channel instance for CHANNEL, and its -relation to STARTING-COMMIT when provided." + starting-commit + (validate-pull + ensure-forward-channel-update)) + "Return the latest channel instance for CHANNEL. When STARTING-COMMIT is +true, call VALIDATE-PULL with CHANNEL, STARTING-COMMIT, the target commit, and +their relation." (define (dot-git? file stat) (and (string=? (basename file) ".git") (eq? 'directory (stat:type stat)))) @@ -386,6 +389,9 @@ relation to STARTING-COMMIT when provided." (update-cached-checkout (channel-url channel) #:ref (channel-reference channel) #:starting-commit starting-commit))) + (when relation + (validate-pull channel starting-commit commit relation)) + (if (channel-introduction channel) (authenticate-channel channel checkout commit) ;; TODO: Warn for all the channels once the authentication interface @@ -403,12 +409,11 @@ cannot be authenticated~%") (let* ((name (url+commit->name (channel-url channel) commit)) (checkout (add-to-store store name #t "sha256" checkout #:select? (negate dot-git?)))) - (values (channel-instance channel commit checkout) - relation)))) + (channel-instance channel commit checkout)))) -(define (ensure-forward-channel-update channel start instance relation) +(define (ensure-forward-channel-update channel start commit relation) "Raise an error if RELATION is not 'ancestor, meaning that START is not an -ancestor of the commit in INSTANCE, unless CHANNEL specifies a commit. +ancestor of COMMIT, unless CHANNEL specifies a commit. This procedure implements a channel update policy meant to be used as a #:validate-pull argument." @@ -422,8 +427,7 @@ This procedure implements a channel update policy meant to be used as a (format #f (G_ "\ aborting update of channel '~a' to commit ~a, which is not a descendant of ~a") (channel-name channel) - (channel-instance-commit instance) - start)))) + commit start)))) ;; If the user asked for a specific commit, they might want ;; that to happen nevertheless, so tell them about the @@ -482,14 +486,13 @@ depending on the policy it implements." (G_ "Updating channel '~a' from Git repository at '~a'...~%") (channel-name channel) (channel-url channel)) - (let*-values (((current) - (current-commit (channel-name channel))) - ((instance relation) - (latest-channel-instance store channel - #:starting-commit - current))) - (when relation - (validate-pull channel current instance relation)) + (let* ((current (current-commit (channel-name channel))) + (instance + (latest-channel-instance store channel + #:validate-pull + validate-pull + #:starting-commit + current))) (let-values (((new-instances new-channels) (loop (channel-instance-dependencies instance) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index c386d81b8e..d3d0d2bd64 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -195,20 +195,18 @@ Download and deploy the latest version of Guix.\n")) %standard-build-options)) -(define (warn-about-backward-updates channel start instance relation) - "Warn about non-forward updates of CHANNEL from START to INSTANCE, without +(define (warn-about-backward-updates channel start commit relation) + "Warn about non-forward updates of CHANNEL from START to COMMIT, without aborting." (match relation ((or 'ancestor 'self) #t) ('descendant (warning (G_ "rolling back channel '~a' from ~a to ~a~%") - (channel-name channel) start - (channel-instance-commit instance))) + (channel-name channel) start commit)) ('unrelated (warning (G_ "moving channel '~a' from ~a to unrelated commit ~a~%") - (channel-name channel) start - (channel-instance-commit instance))))) + (channel-name channel) start commit)))) (define* (display-profile-news profile #:key concise? current-is-newer?) diff --git a/tests/channels.scm b/tests/channels.scm index 2c857083e9..5f13a48ec1 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -212,12 +212,12 @@ (commit (oid->string (commit-id commit2))))) (old (channel (inherit spec) (commit (oid->string (commit-id commit1)))))) - (define (validate-pull channel current instance relation) + (define (validate-pull channel current commit relation) (return (and (eq? channel old) (string=? (oid->string (commit-id commit2)) current) (string=? (oid->string (commit-id commit1)) - (channel-instance-commit instance)) + commit) relation))) (with-store store From a941e8fe1f2ef47be2b30a54925febbc7dfb5389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Jun 2020 15:40:05 +0200 Subject: [PATCH 075/241] .guix-channel: Add 'keyring-reference'. * .guix-channel: Add 'keyring-reference'. --- .guix-channel | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.guix-channel b/.guix-channel index 3e618d79f8..f4459f1de1 100644 --- a/.guix-channel +++ b/.guix-channel @@ -2,4 +2,5 @@ (channel (version 0) - (news-file "etc/news.scm")) + (news-file "etc/news.scm") + (keyring-reference "keyring")) From c3f6f564e909ebefe752d24b325871a4e3a02d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Jun 2020 22:22:36 +0200 Subject: [PATCH 076/241] channels: Automatically add introduction for the official 'guix' channel. This is useful when people run "guix time-machine -C channels.scm", where 'channels.scm' misses channel introductions. * guix/channels.scm (%default-channel-url): New variable. (%default-channels): Use it. (ensure-default-introduction): New procedure. (latest-channel-instance): Call it. --- guix/channels.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 02e361bd77..a82bd340e2 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -148,18 +148,32 @@ "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))) #f)) ;TODO: Add an intro signature so it can be exported. +(define %default-channel-url + ;; URL of the default 'guix' channel. + "https://git.savannah.gnu.org/git/guix.git") + (define %default-channels ;; Default list of channels. (list (channel (name 'guix) (branch "master") - (url "https://git.savannah.gnu.org/git/guix.git") + (url %default-channel-url) (introduction %guix-channel-introduction)))) (define (guix-channel? channel) "Return true if CHANNEL is the 'guix' channel." (eq? 'guix (channel-name channel))) +(define (ensure-default-introduction chan) + "If CHAN represents the \"official\" 'guix' channel and lacks an +introduction, add it." + (if (and (guix-channel? chan) + (not (channel-introduction chan)) + (string=? (channel-url chan) %default-channel-url)) + (channel (inherit chan) + (introduction %guix-channel-introduction)) + chan)) + (define-record-type (channel-instance channel commit checkout) channel-instance? @@ -385,7 +399,9 @@ their relation." (and (string=? (basename file) ".git") (eq? 'directory (stat:type stat)))) - (let-values (((checkout commit relation) + (let-values (((channel) + (ensure-default-introduction channel)) + ((checkout commit relation) (update-cached-checkout (channel-url channel) #:ref (channel-reference channel) #:starting-commit starting-commit))) From a9eeeaa6aeeafb817df3aad22a4b85205ac3ec13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 8 Jun 2020 23:22:17 +0200 Subject: [PATCH 077/241] pull: Add '--disable-authentication'. * guix/channels.scm (latest-channel-instance): Add #:authenticate? and honor it. (latest-channel-instances): Likewise. * guix/scripts/pull.scm (%default-options): Add 'authenticate-channels?'. (show-help, %options): Add '--disable-authentication'. (guix-pull): Pass #:authenticate? to 'latest-channel-instances'. * doc/guix.texi (Invoking guix pull): Document it. --- doc/guix.texi | 14 ++++++++++++++ guix/channels.scm | 25 +++++++++++++++++-------- guix/scripts/pull.scm | 14 ++++++++++++-- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index dd626816d0..6c59db3393 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3929,6 +3929,20 @@ Make sure you understand its security implications before using @option{--allow-downgrades}. @end quotation +@item --disable-authentication +Allow pulling channel code without authenticating it. + +@cindex authentication, of channel code +By default, @command{guix pull} authenticates code downloaded from +channels by verifying that its commits are signed by authorized +developers, and raises an error if this is not the case. This option +instructs it to not perform any such verification. + +@quotation Note +Make sure you understand its security implications before using +@option{--disable-authentication}. +@end quotation + @item --system=@var{system} @itemx -s @var{system} Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of diff --git a/guix/channels.scm b/guix/channels.scm index a82bd340e2..5a83d83427 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -390,11 +390,12 @@ commits ~a to ~a (~h new commits)...~%") (define* (latest-channel-instance store channel #:key (patches %patches) starting-commit + (authenticate? #f) (validate-pull ensure-forward-channel-update)) "Return the latest channel instance for CHANNEL. When STARTING-COMMIT is true, call VALIDATE-PULL with CHANNEL, STARTING-COMMIT, the target commit, and -their relation." +their relation. When AUTHENTICATE? is false, CHANNEL is not authenticated." (define (dot-git? file stat) (and (string=? (basename file) ".git") (eq? 'directory (stat:type stat)))) @@ -408,14 +409,16 @@ their relation." (when relation (validate-pull channel starting-commit commit relation)) - (if (channel-introduction channel) - (authenticate-channel channel checkout commit) - ;; TODO: Warn for all the channels once the authentication interface - ;; is public. - (when (guix-channel? channel) - (warning (G_ "channel '~a' lacks an introduction and \ + (if authenticate? + (if (channel-introduction channel) + (authenticate-channel channel checkout commit) + ;; TODO: Warn for all the channels once the authentication interface + ;; is public. + (when (guix-channel? channel) + (warning (G_ "channel '~a' lacks an introduction and \ cannot be authenticated~%") - (channel-name channel)))) + (channel-name channel)))) + (warning (G_ "channel authentication disabled~%"))) (when (guix-channel? channel) ;; Apply the relevant subset of PATCHES directly in CHECKOUT. This is @@ -463,11 +466,15 @@ allow non-forward updates.")))))))))) (define* (latest-channel-instances store channels #:key (current-channels '()) + (authenticate? #t) (validate-pull ensure-forward-channel-update)) "Return a list of channel instances corresponding to the latest checkouts of CHANNELS and the channels on which they depend. +When AUTHENTICATE? is true, authenticate the subset of CHANNELS that has a +\"channel introduction\". + CURRENT-CHANNELS is the list of currently used channels. It is compared against the newly-fetched instances of CHANNELS, and VALIDATE-PULL is called for each channel update and can choose to emit warnings or raise an error, @@ -505,6 +512,8 @@ depending on the policy it implements." (let* ((current (current-commit (channel-name channel))) (instance (latest-channel-instance store channel + #:authenticate? + authenticate? #:validate-pull validate-pull #:starting-commit diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index d3d0d2bd64..f953957161 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -82,6 +82,7 @@ (graft? . #t) (debug . 0) (verbosity . 1) + (authenticate-channels? . #t) (validate-pull . ,ensure-forward-channel-update))) (define (show-help) @@ -97,6 +98,9 @@ Download and deploy the latest version of Guix.\n")) --branch=BRANCH download the tip of the specified BRANCH")) (display (G_ " --allow-downgrades allow downgrades to earlier channel revisions")) + (display (G_ " + --disable-authentication + disable channel authentication")) (display (G_ " -N, --news display news compared to the previous generation")) (display (G_ " @@ -165,6 +169,9 @@ Download and deploy the latest version of Guix.\n")) (lambda (opt name arg result) (alist-cons 'validate-pull warn-about-backward-updates result))) + (option '("disable-authentication") #f #f + (lambda (opt name arg result) + (alist-cons 'authenticate-channels? #f result))) (option '(#\p "profile") #t #f (lambda (opt name arg result) (alist-cons 'profile (canonicalize-profile arg) @@ -771,7 +778,8 @@ Use '~/.config/guix/channels.scm' instead.")) (channels (channel-list opts)) (profile (or (assoc-ref opts 'profile) %current-profile)) (current-channels (profile-channels profile)) - (validate-pull (assoc-ref opts 'validate-pull))) + (validate-pull (assoc-ref opts 'validate-pull)) + (authenticate? (assoc-ref opts 'authenticate-channels?))) (cond ((assoc-ref opts 'query) (process-query opts profile)) ((assoc-ref opts 'generation) @@ -793,7 +801,9 @@ Use '~/.config/guix/channels.scm' instead.")) #:current-channels current-channels #:validate-pull - validate-pull))) + validate-pull + #:authenticate? + authenticate?))) (format (current-error-port) (N_ "Building from this channel:~%" "Building from these channels:~%" From 838ac881ec98cb71d4a4e4b20773573f99ecbf25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 16 Jun 2020 15:33:57 +0200 Subject: [PATCH 078/241] time-machine: Add '--disable-authentication'. * guix/inferior.scm (cached-channel-instance): Add #:authenticate? and pass it to 'latest-channel-instances'. * guix/scripts/time-machine.scm (show-help, %options): Add '--disable-authentication'. (%default-options): Add 'authenticate-channels?'. (guix-time-machine): Honor it. --- guix/inferior.scm | 9 +++++++-- guix/scripts/time-machine.scm | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index c9a5ee5129..d347754bbc 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -687,13 +687,16 @@ failing when GUIX is too old and lacks the 'guix repl' command." (define* (cached-channel-instance store channels #:key + (authenticate? #t) (cache-directory (%inferior-cache-directory)) (ttl (* 3600 24 30))) "Return a directory containing a guix filetree defined by CHANNELS, a list of channels. The directory is a subdirectory of CACHE-DIRECTORY, where entries can be reclaimed after TTL seconds. -This procedure opens a new connection to the build daemon." +This procedure opens a new connection to the build daemon. AUTHENTICATE? +determines whether CHANNELS are authenticated." (define instances - (latest-channel-instances store channels)) + (latest-channel-instances store channels + #:authenticate? authenticate?)) (define key (bytevector->base32-string @@ -732,6 +735,8 @@ This procedure opens a new connection to the build daemon." (mbegin %store-monad (show-what-to-build* (list profile)) (built-derivations (list profile)) + ;; Note: Caching is fine even when AUTHENTICATE? is false because + ;; we always call 'latest-channel-instances?'. (symlink* (derivation->output-path profile) cached) (add-indirect-root* cached) (return cached)))))) diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index 1e800e160f..f9bcec651a 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Konrad Hinsen -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +55,9 @@ Execute COMMAND ARGS... in an older version of Guix.\n")) --commit=COMMIT use the specified COMMIT")) (display (G_ " --branch=BRANCH use the tip of the specified BRANCH")) + (display (G_ " + --disable-authentication + disable channel authentication")) (newline) (show-build-options-help) (newline) @@ -80,6 +83,9 @@ Execute COMMAND ARGS... in an older version of Guix.\n")) (option '("branch") #t #f (lambda (opt name arg result) (alist-cons 'ref `(branch . ,arg) result))) + (option '("disable-authentication") #f #f + (lambda (opt name arg result) + (alist-cons 'authenticate-channels? #f result))) (option '(#\h "help") #f #f (lambda args (show-help) @@ -98,6 +104,7 @@ Execute COMMAND ARGS... in an older version of Guix.\n")) (print-build-trace? . #t) (print-extended-build-trace? . #t) (multiplexed-build-output? . #t) + (authenticate-channels? . #t) (graft? . #t) (debug . 0) (verbosity . 1))) @@ -124,12 +131,14 @@ Execute COMMAND ARGS... in an older version of Guix.\n")) (with-git-error-handling (let* ((opts (parse-args args)) (channels (channel-list opts)) - (command-line (assoc-ref opts 'exec))) + (command-line (assoc-ref opts 'exec)) + (authenticate? (assoc-ref opts 'authenticate-channels?))) (when command-line (let* ((directory (with-store store (with-status-verbosity (assoc-ref opts 'verbosity) (set-build-options-from-command-line store opts) - (cached-channel-instance store channels)))) + (cached-channel-instance store channels + #:authenticate? authenticate?)))) (executable (string-append directory "/bin/guix"))) (apply execl (cons* executable executable command-line)))))))) From 619972f7b5dc34457ad9c474bf8f9f98786d70e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 16 Jun 2020 15:52:46 +0200 Subject: [PATCH 079/241] maint: "make authenticate" behaves like 'guix pull' by default. * build-aux/git-authenticate.scm (%use-historical-authorizations?) (%introductory-commit): New variables. * build-aux/git-authenticate.scm (git-authenticate): Use pass the empty list as #:default-authorizations when %USE-HISTORICAL-AUTHORIZATIONS? is false. --- build-aux/git-authenticate.scm | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index a3d4b40ccf..e670264f28 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -218,6 +218,17 @@ (string-downcase (string-filter char-set:graphic fingerprint))))) %historical-committers)) +(define %use-historical-authorizations? + ;; Whether to allow authentication of past commits using + ;; %HISTORICAL-AUTHORIZED-SIGNING-KEYS for when '.guix-authorizations' was + ;; missing. + (getenv "GUIX_USE_HISTORICAL_AUTHORIZATIONS")) + +(define %introductory-commit + ;; This is the commit that appears in the official 'guix' channel + ;; introduction. XXX: Keep in sync with (guix channels)! + "9edb3f66fd807b096b48283debdcddccfea34bad") + (define %commits-with-bad-signature ;; Commits with a known-bad signature. '("6a34f4ccc8a5d4a48e25ad3c9c512f8634928b91")) ;2016-12-29 @@ -242,7 +253,10 @@ (match args ((_ start end) (define start-commit - (commit-lookup repository (string->oid start))) + (commit-lookup repository + (string->oid (if %use-historical-authorizations? + start + %introductory-commit)))) (define end-commit (commit-lookup repository (string->oid end))) @@ -263,6 +277,14 @@ (define reporter (progress-reporter/bar (length commits))) + (define historical-authorizations + ;; List of authorizations in effect before '.guix-authorizations' was + ;; introduced. By default, assume there were no authorizations; this + ;; is what 'guix pull' does. + (if %use-historical-authorizations? + %historical-authorized-signing-keys + '())) + (format #t (G_ "Authenticating ~a to ~a (~a commits)...~%") (commit-short-id start-commit) (commit-short-id end-commit) @@ -272,7 +294,7 @@ (lambda (report) (authenticate-commits repository commits #:default-authorizations - %historical-authorized-signing-keys + historical-authorizations #:report-progress report))))) (cache-authenticated-commit "channels/guix" (oid->string (commit-id end-commit))) From e23ec7144c264902ac13fa75e01a206e4d907e5a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 16 Jun 2020 16:25:37 +0200 Subject: [PATCH 080/241] gnu: libmateweather: Fix tests. Apply the following upstream fix: https://github.com/mate-desktop/libmateweather/commit/ea13e06563fb5fa53f8a9643156a64825e986acb. * gnu/packages/mate.scm (libmateweather)[source]: Fix tests by renaming America/Godthab timezone to America/Nuuk. --- gnu/packages/mate.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 8b548b5d8e..864fa8dc18 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2020 Jonathan Brielmaier +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -264,7 +265,16 @@ desktop and the mate-about program.") name "-" version ".tar.xz")) (sha256 (base32 - "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d")))) + "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d")) + (modules '((guix build utils))) + ;; This is fixed by commit ea13e065 upstream. Remove this once 1.25.0 + ;; is out. + (snippet + '(begin + (substitute* "data/Locations.xml.in" + (("Godthab") + "Nuuk")) + #t)))) (build-system gnu-build-system) (arguments '(#:configure-flags From 4febc38d9f398a44e2f72eb6fa71145421c117a3 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 16 Jun 2020 16:32:32 +0200 Subject: [PATCH 081/241] installer: final: Remove restart-service procedure. * gnu/installer/final.scm (umount-cow-store): Remove "restart-service" that is now provided by (gnu services herd). --- gnu/installer/final.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index a742c2a0cd..685aa81d89 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -137,12 +137,6 @@ USERS." "Remove the store overlay and the bind-mount on /tmp created by the cow-store service. This procedure is very fragile and a better approach would be much appreciated." - - ;; Remove when integrated in (gnu services herd). - (define (restart-service name) - (with-shepherd-action name ('restart) result - result)) - (catch #t (lambda () (let ((tmp-dir "/remove")) From 7146c8c75d5b389d648bfada1e1a59c302036dd5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Jun 2020 18:15:38 +0200 Subject: [PATCH 082/241] gnu: python-ipython: Use python-prompt-toolkit-2. This prevents conflicting variants of python-prompt-toolkit from being installed, which prevented jupyter from being installed. * gnu/packages/python-xyz.scm (python-ipython)[propagated-inputs]: Replace python-prompt-toolkit with python-prompt-toolkit-2. (python-widgetsnbextension)[propagated-inputs]: Do not use prompt-toolkit-2-instead-of-prompt-toolkit on python-ipykernel. (python-ipywidgets)[propagated-inputs]: Do not use prompt-toolkit-2-instead-of-prompt-toolkit on python-ipython. (python-jupyter-console)[propagated-inputs]: Do not use prompt-toolkit-2-instead-of-prompt-toolkit on python-ipykernel. (prompt-toolkit-2-instead-of-prompt-toolkit): Remove variable. * gnu/packages/machine-learning.scm (python-iml)[propagated-inputs]: Do not use prompt-toolkit-2-instead-of-prompt-toolkit on python-ipython. --- gnu/packages/machine-learning.scm | 3 +-- gnu/packages/python-xyz.scm | 15 ++++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 0e11da41ca..cc69aa3ec1 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1817,8 +1817,7 @@ advanced research.") "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) (build-system python-build-system) (propagated-inputs - `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipython)) + `(("ipython" ,python-ipython) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e0a738d51..5896764266 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6450,7 +6450,7 @@ callback signature using a prototype function.") (propagated-inputs `(("python-backcall" ,python-backcall) ("python-pyzmq" ,python-pyzmq) - ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-terminado" ,python-terminado) ("python-matplotlib" ,python-matplotlib) ("python-numpy" ,python-numpy) @@ -9004,8 +9004,7 @@ interactive computing.") "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" - ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) + `(("python-ipykernel" ,python-ipykernel) ("python-notebook" ,python-notebook))) (native-inputs `(("python-certifi" ,python-certifi) @@ -9032,8 +9031,7 @@ notebooks.") "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs - `(("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipython)) + `(("python-ipython" ,python-ipython) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs @@ -9063,8 +9061,7 @@ in the data.") "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit - python-ipykernel)) + `(("python-ipykernel" ,python-ipykernel) ("python-jupyter-client" ,python-jupyter-client) ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-pygments" ,python-pygments))) @@ -12192,10 +12189,6 @@ characters, mouse support, and auto suggestions.") ("python-six" ,python-six) ("python-pygments" ,python-pygments))))) -(define-public prompt-toolkit-2-instead-of-prompt-toolkit - (package-input-rewriting/spec - `(("python-prompt-toolkit" . ,(const python-prompt-toolkit-2))))) - (define-public python2-prompt-toolkit (package-with-python2 python-prompt-toolkit-2)) From 7fc273fe3f555efd9723726f989ce015c0012ef7 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Tue, 16 Jun 2020 09:06:20 -0400 Subject: [PATCH 083/241] gnu: crawl: Update to 0.25.0. * gnu/packages/games.scm (crawl): Update to 0.25.0. --- gnu/packages/games.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 10ac8cb550..e95effa992 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5264,7 +5264,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.24.0") + (version "0.25.0") (source (origin (method url-fetch) @@ -5277,8 +5277,18 @@ fish. The whole game is accompanied by quiet, comforting music.") (string-append "http://crawl.develz.org/release/stone_soup-" version "-nodeps.tar.xz"))) (sha256 - (base32 "0kdq6s12myxfdg75ma9x3ys2nd0xwb3xm2ynlmhg4628va0pnixr")) - (patches (search-patches "crawl-upgrade-saves.patch")))) + (base32 "0rn1wjxdqw33caiwisfypm1j8cid3c9pz01ahicl17144zs29z3d")) + (patches (search-patches "crawl-upgrade-saves.patch")) + ;; The 0.25.0 -nodeps.tar.xz was built from an OSX machine; normally + ;; apparently it's built from a Debian machine before the Debian + ;; packages are made. These ._* files are binary and have the string + ;; "Mac OS X" in them... removing these seems to result in compilation + ;; again. + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file (find-files "." "^\\._")) + #t)))) (build-system gnu-build-system) (inputs `(("lua51" ,lua-5.1) From 503737624c40cb2ada875c83b0c764db3ad4e86e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Jun 2020 21:17:40 +0200 Subject: [PATCH 084/241] gnu: emacs-emms: Update to 5.42. * gnu/packages/emacs-xyz.scm (emacs-emms): Update to 5.42. [source]: Use GNU ELPA repository. [arguments]: Remove unnecessary phases. --- gnu/packages/emacs-xyz.scm | 167 ++++++++++++------------------------- 1 file changed, 53 insertions(+), 114 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d5e30acf6d..2d7a9cafc6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1404,44 +1404,21 @@ incrementally confined in Isearch manner.") (define-public emacs-emms (package (name "emacs-emms") - (version "5.4") + (version "5.42") (source (origin (method url-fetch) - (uri (string-append "mirror://gnu/emms/emms-" version ".tar.gz")) + (uri (string-append "https://elpa.gnu.org/packages/" + "emms-" version ".tar")) (sha256 - (base32 "1nd7sb6pva7qb1ki6w0zhd6zvqzd7742kaqi0f3v4as5jh09l6nr")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "Makefile" - (("/usr/bin/install-info") - ;; No need to use 'install-info' since it would create a - ;; useless 'dir' file. - "true") - (("^INFODIR=.*") - ;; Install Info files to $out/share/info, not $out/info. - "INFODIR := $(PREFIX)/share/info\n") - (("/site-lisp/emms") - ;; Install directly in share/emacs/site-lisp, not in a - ;; sub-directory. - "/site-lisp") - (("^all: (.*)\n" _ rest) - ;; Build 'emms-print-metadata'. - (string-append "all: " rest " emms-print-metadata\n"))) - #t)))) - (build-system gnu-build-system) + (base32 "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj")))) + (build-system emacs-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils) - (ice-9 ftw)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - - #:phases + `(#:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'unpack 'set-external-programs + ;; Specify the absolute file names of the various programs + ;; so that everything works out-of-the-box. (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (flac (assoc-ref inputs "flac")) @@ -1451,94 +1428,56 @@ incrementally confined in Isearch manner.") (mp3info (assoc-ref inputs "mp3info")) (mutagen (assoc-ref inputs "mutagen")) (opus (assoc-ref inputs "opus-tools"))) - ;; Specify the installation directory. - (substitute* "Makefile" - (("PREFIX=.*$") - (string-append "PREFIX := " out "\n"))) - - (setenv "SHELL" (which "sh")) - (setenv "CC" "gcc") - - ;; Specify the absolute file names of the various - ;; programs so that everything works out-of-the-box. - (with-directory-excursion "lisp" - (emacs-substitute-variables - "emms-player-mpg321-remote.el" - ("emms-player-mpg321-remote-command" - (string-append mpg321 "/bin/mpg321"))) - (substitute* "emms-player-simple.el" - (("\"ogg123\"") - (string-append "\"" vorbis "/bin/ogg123\""))) - (substitute* "emms-player-simple.el" - (("\"mpg321\"") - (string-append "\"" mpg321 "/bin/mpg321\""))) - (emacs-substitute-variables "emms-info-ogginfo.el" - ("emms-info-ogginfo-program-name" - (string-append vorbis "/bin/ogginfo"))) - (emacs-substitute-variables "emms-info-opusinfo.el" - ("emms-info-opusinfo-program-name" - (string-append opus "/bin/opusinfo"))) - (emacs-substitute-variables "emms-info-libtag.el" - ("emms-info-libtag-program-name" - (string-append out "/bin/emms-print-metadata"))) - (emacs-substitute-variables "emms-info-mp3info.el" - ("emms-info-mp3info-program-name" - (string-append mp3info "/bin/mp3info"))) - (emacs-substitute-variables "emms-info-metaflac.el" - ("emms-info-metaflac-program-name" - (string-append flac "/bin/metaflac"))) - (emacs-substitute-variables "emms-source-file.el" - ("emms-source-file-gnu-find" (which "find"))) - (substitute* "emms-volume-amixer.el" - (("\"amixer\"") - (string-append "\"" alsa "/bin/amixer\""))) - (substitute* "emms-tag-editor.el" - (("\"mid3v2\"") - (string-append "\"" mutagen "/bin/mid3v2\""))) - #t)))) - (add-before 'install 'pre-install - (lambda* (#:key outputs #:allow-other-keys) - ;; The 'install' rule expects the target directories to exist. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (man1 (string-append out "/share/man/man1"))) - (mkdir-p bin) - (mkdir-p man1) - - ;; Ensure that files are not rejected by gzip - (let ((early-1980 315619200)) ; 1980-01-02 UTC - (ftw "." (lambda (file stat flag) - (unless (<= early-1980 (stat:mtime stat)) - (utime file early-1980 early-1980)) - #t))) - #t))) - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (symlink "emms-auto.el" - (string-append out "/share/emacs/site-lisp/" - "emms-autoloads.el"))) - #t))) - #:tests? #f)) - (native-inputs `(("emacs" ,emacs-minimal) ;for (guix build emacs-utils) - ("texinfo" ,texinfo))) - (inputs `(("alsa-utils" ,alsa-utils) - ("flac" ,flac) ;for metaflac - ("vorbis-tools" ,vorbis-tools) - ("mpg321" ,mpg321) - ("taglib" ,taglib) - ("mp3info" ,mp3info) - ("mutagen" ,python-mutagen) - ("opus-tools" ,opus-tools))) - (properties '((upstream-name . "emms"))) - (synopsis "Emacs Multimedia System") + (emacs-substitute-variables "emms-player-mpg321-remote.el" + ("emms-player-mpg321-remote-command" + (string-append mpg321 "/bin/mpg321"))) + (substitute* "emms-player-simple.el" + (("\"ogg123\"") + (string-append "\"" vorbis "/bin/ogg123\""))) + (substitute* "emms-player-simple.el" + (("\"mpg321\"") + (string-append "\"" mpg321 "/bin/mpg321\""))) + (emacs-substitute-variables "emms-info-ogginfo.el" + ("emms-info-ogginfo-program-name" + (string-append vorbis "/bin/ogginfo"))) + (emacs-substitute-variables "emms-info-opusinfo.el" + ("emms-info-opusinfo-program-name" + (string-append opus "/bin/opusinfo"))) + (emacs-substitute-variables "emms-info-libtag.el" + ("emms-info-libtag-program-name" + (string-append out "/bin/emms-print-metadata"))) + (emacs-substitute-variables "emms-info-mp3info.el" + ("emms-info-mp3info-program-name" + (string-append mp3info "/bin/mp3info"))) + (emacs-substitute-variables "emms-info-metaflac.el" + ("emms-info-metaflac-program-name" + (string-append flac "/bin/metaflac"))) + (emacs-substitute-variables "emms-source-file.el" + ("emms-source-file-gnu-find" (which "find"))) + (substitute* "emms-volume-amixer.el" + (("\"amixer\"") + (string-append "\"" alsa "/bin/amixer\""))) + (substitute* "emms-tag-editor.el" + (("\"mid3v2\"") + (string-append "\"" mutagen "/bin/mid3v2\""))) + #t)))))) + (inputs + `(("alsa-utils" ,alsa-utils) + ("flac" ,flac) ;for metaflac + ("vorbis-tools" ,vorbis-tools) + ("mpg321" ,mpg321) + ("taglib" ,taglib) + ("mp3info" ,mp3info) + ("mutagen" ,python-mutagen) + ("opus-tools" ,opus-tools))) + (home-page "https://www.gnu.org/software/emms/") + (synopsis "The Emacs Multimedia System") (description "EMMS is the Emacs Multimedia System. It is a small front-end which can control one of the supported external players. Thus, it supports whatever formats are supported by your music player. It also supports tagging and playlist management, all behind a clean and light user interface.") - (home-page "https://www.gnu.org/software/emms/") (license license:gpl3+))) (define-public emacs-emms-mode-line-cycle From b3e52889c552a8b2008b9427063cabae795ac2f8 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 16 Jun 2020 20:50:32 +0200 Subject: [PATCH 085/241] gnu: emacs-deadgrep: Update to 0.10. * gnu/packages/emacs-xyz.scm (emacs-deadgrep): Update to 0.10. [inputs]: change into... [propagated-inputs]: ... this. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2d7a9cafc6..93b91ab37f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16900,11 +16900,11 @@ accept and reject GitHub pull requests.") (license license:gpl3+)))) (define-public emacs-deadgrep - (let ((commit "3fc7ca1f58e190f0c80da455a0e40187e673020e") - (revision "2")) + (let ((commit "7e50e71c6ff4e17dded43e0836dae4e5ec020fcf") + (revision "1")) (package (name "emacs-deadgrep") - (version (git-version "0.8" revision commit)) + (version (git-version "0.10" revision commit)) (source (origin (method git-fetch) @@ -16914,9 +16914,9 @@ accept and reject GitHub pull requests.") (file-name (git-file-name name version)) (sha256 (base32 - "016gwqxd9aqzjw3hqv3vdf8cs6la8r65g6azg5rlmjqwfx3vsaha")))) + "1vjhrq02l8gvdn2haygzq7277hnhjchs9xrfpcnh76gqip200gx4")))) (build-system emacs-build-system) - (inputs + (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s) ("emacs-spinner" ,emacs-spinner))) From 75990dcc578397751b2206f90d267c3d5aba01aa Mon Sep 17 00:00:00 2001 From: Danny O'Brien Date: Mon, 15 Jun 2020 22:17:07 -0700 Subject: [PATCH 086/241] gnu: guile-sdl2: Update to 0.5.0. * gnu/packages/sdl.scm (guile-sdl2): Update to 0.5.0. Signed-off-by: Efraim Flashner --- gnu/packages/sdl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 6d91727809..bd53a11fc2 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -620,14 +620,14 @@ sound and device input (keyboards, joysticks, mice, etc.).") (define-public guile-sdl2 (package (name "guile-sdl2") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/guile-sdl2/" "guile-sdl2-" version ".tar.gz")) (sha256 (base32 - "0zcxwgyadwpbhq6h5mv2569c3kalgra26zc186y9fqiyyzmh1v9s")))) + "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m")))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0") From 70fb07b5206b37cd640a20c64832ad0d6108d854 Mon Sep 17 00:00:00 2001 From: Danny O'Brien Date: Mon, 15 Jun 2020 22:17:26 -0700 Subject: [PATCH 087/241] gnu: guile-chickadee: Update to 0.5.0. * gnu/packages/game-development.scm (guile-chickadee): Update to 0.5.0. [inputs]: Add libvorbis, mpg123, openal. (guile3.0-chickadee)[inputs]: Same. Signed-off-by: Efraim Flashner --- gnu/packages/game-development.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ddd171c5d2..2a97a17dac 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1743,20 +1743,23 @@ a 2D editor view.") (define-public guile-chickadee (package (name "guile-chickadee") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/chickadee/" "chickadee-" version ".tar.gz")) (sha256 (base32 - "1fdicsgls5cp0yffcm5vjmav67gv9bxhz1s3jvdvinspxb485x7l")))) + "0y3s0p4zyghys48sayfhcbmxmflh8hwawnx5an2jlb3x84yr0dsx")))) (build-system gnu-build-system) (propagated-inputs `(("guile-opengl" ,guile-opengl) ("guile-sdl2" ,guile-sdl2))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-2.2) + ("libvorbis" ,libvorbis) + ("mpg123" ,mpg123) + ("openal" ,openal))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) @@ -1779,20 +1782,23 @@ that parenthetically inclined game developers need to make 2D (and eventually (package (inherit guile-chickadee) (name "guile3.0-chickadee") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/chickadee/" "chickadee-" version ".tar.gz")) (sha256 (base32 - "1fdicsgls5cp0yffcm5vjmav67gv9bxhz1s3jvdvinspxb485x7l")))) + "0y3s0p4zyghys48sayfhcbmxmflh8hwawnx5an2jlb3x84yr0dsx")))) (build-system gnu-build-system) (propagated-inputs `(("guile-opengl" ,guile3.0-opengl) ("guile-sdl2" ,guile3.0-sdl2))) (inputs - `(("guile" ,guile-3.0))) + `(("guile" ,guile-3.0) + ("libvorbis" ,libvorbis) + ("mpg123" ,mpg123) + ("openal" ,openal))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) From fb42a763e86c68e45b32b3c4d62834a2dceb5e73 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Jun 2020 23:02:48 +0300 Subject: [PATCH 088/241] gnu: guile-sdl2: Remove unused configure-flags. * gnu/packages/sdl.scm (guile-sdl2)[arguments]: Remove configure-flags. --- gnu/packages/sdl.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index bd53a11fc2..e4e452fec5 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -630,16 +630,7 @@ sound and device input (keyboards, joysticks, mice, etc.).") "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m")))) (build-system gnu-build-system) (arguments - '(#:make-flags '("GUILE_AUTO_COMPILE=0") - #:configure-flags - (list (string-append "--with-libsdl2-prefix=" - (assoc-ref %build-inputs "sdl2")) - (string-append "--with-libsdl2-image-prefix=" - (assoc-ref %build-inputs "sdl2-image")) - (string-append "--with-libsdl2-ttf-prefix=" - (assoc-ref %build-inputs "sdl2-ttf")) - (string-append "--with-libsdl2-mixer-prefix=" - (assoc-ref %build-inputs "sdl2-mixer"))))) + '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) (native-inputs `(("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) From daca70770ad074dacc14c83dd7156859d14286d3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Jun 2020 23:05:43 +0300 Subject: [PATCH 089/241] gnu: guile-chickadee: Supress guile warnings. * gnu/packages/game-development.scm (guile-chickadee)[arguments]: Add make-flag to not autocompile guile files. --- gnu/packages/game-development.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 2a97a17dac..9ef92a11f2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2018 Ludovic Courtès ;;; Copyright © 2015, 2018 Alex Kost ;;; Copyright © 2015, 2016, 2017 David Thompson -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Julian Graham @@ -1752,6 +1752,8 @@ a 2D editor view.") (base32 "0y3s0p4zyghys48sayfhcbmxmflh8hwawnx5an2jlb3x84yr0dsx")))) (build-system gnu-build-system) + (arguments + '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) (propagated-inputs `(("guile-opengl" ,guile-opengl) ("guile-sdl2" ,guile-sdl2))) From 8d5c55b2e8c56429f7a6713080c2e7bc4dafe983 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Tue, 16 Jun 2020 13:51:13 +0200 Subject: [PATCH 090/241] gnu: python-memcached: Add patch to fix syntax warnings. * gnu/packages/patches/python-memcached-syntax-warnings.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python-xyz.scm (python-memcached)[source]: Add it. Signed-off-by: Efraim Flashner --- gnu/local.mk | 2 ++ .../python-memcached-syntax-warnings.patch | 24 +++++++++++++++++++ gnu/packages/python-xyz.scm | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-memcached-syntax-warnings.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7333427850..36a417865f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -35,6 +35,7 @@ # Copyright © 2020 Ryan Prior # Copyright © 2020 Jan Wielkiewicz # Copyright © 2020 Brice Waegeneire +# Copyright © 2020 Tanguy Le Carrour # # This file is part of GNU Guix. # @@ -1426,6 +1427,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-jedi-sort-project-test.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ + %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ diff --git a/gnu/packages/patches/python-memcached-syntax-warnings.patch b/gnu/packages/patches/python-memcached-syntax-warnings.patch new file mode 100644 index 0000000000..f8690677c0 --- /dev/null +++ b/gnu/packages/patches/python-memcached-syntax-warnings.patch @@ -0,0 +1,24 @@ +Problem reported upstream: +https://github.com/linsomniac/python-memcached/issues/176 + +--- + memcache.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/memcache.py b/memcache.py +index 05b6657..b935681 100644 +--- a/memcache.py ++++ b/memcache.py +@@ -1300,8 +1300,8 @@ class Client(threading.local): + key = key[1] + if key is None: + raise Client.MemcachedKeyNoneError("Key is None") +- if key is '': +- if key_extra_len is 0: ++ if key == '': ++ if key_extra_len == 0: + raise Client.MemcachedKeyNoneError("Key is empty") + + # key is empty but there is some other component to key +-- +2.26.2 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5896764266..422e014019 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11779,7 +11779,8 @@ running in.") (uri (pypi-uri "python-memcached" version)) (sha256 (base32 - "0kvyapavbirk2x3n1jx4yb9nyigrj1s3x15nm3qhpvhkpqvqdqm2")))) + "0kvyapavbirk2x3n1jx4yb9nyigrj1s3x15nm3qhpvhkpqvqdqm2")) + (patches (search-patches "python-memcached-syntax-warnings.patch")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) (home-page From f1adcfd37a6f8103917e8a34400a33bf763e151c Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Tue, 16 Jun 2020 17:24:58 +0200 Subject: [PATCH 091/241] gnu: poetry: Update to 1.0.9. * gnu/packages/python-xyz.scm (poetry): Update to 1.0.9. [arguments] Adjust required versions of pyrsistent. Remove required version of importlib-metadata. [propagated-inputs] Add python-msgpack-transitional. Remove python-importlib-metadata. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 422e014019..e95dec21c2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11884,7 +11884,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (define-public poetry (package (name "poetry") - (version "1.0.5") + (version "1.0.9") ;; Poetry can only be built from source with Poetry. (source (origin @@ -11892,7 +11892,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (uri (pypi-uri "poetry" version)) (sha256 (base32 - "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf")))) + "1avp0db1a4hf6lz3wrzhpdvj4rpmzr4in3myrd3lp5j66nc5ck0a")))) (build-system python-build-system) (arguments `(#:tests? #f ;; Pypi does not have tests. @@ -11903,8 +11903,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (substitute* "setup.py" ;; poetry won't update version as 21.0.0 relies on python > 3.6 (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") - (("pyrsistent>=0.14.2,<0.15.0") "pyrsistent>=0.14.2,<0.16.0") - (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0")) + (("pyrsistent>=0.14.2,<0.15.0") "pyrsistent>=0.14.2,<0.17.0")) #t))))) (propagated-inputs `(("python-cachecontrol" ,python-cachecontrol) @@ -11912,9 +11911,9 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") ("python-cleo" ,python-cleo) ("python-clikit" ,python-clikit) ("python-html5lib" ,python-html5lib) - ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8 ("python-jsonschema" ,python-jsonschema) ("python-keyring" ,python-keyring) + ("python-msgpack-transitional" ,python-msgpack-transitional) ("python-pexpect" ,python-pexpect) ("python-pkginfo" ,python-pkginfo) ("python-pyparsing" ,python-pyparsing) From 0faed3995b351bd5d7db7d674236379867421bee Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Mon, 11 May 2020 18:16:51 +0200 Subject: [PATCH 092/241] gnu: Add feedbackd. * gnu/packages/gnome.scm (feedbackd): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a6caabfc46..e71af00bf8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -43,7 +43,7 @@ ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan -;;; Copyright © 2019 Jonathan Brielmaier +;;; Copyright © 2019, 2020 Jonathan Brielmaier ;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt @@ -10432,3 +10432,37 @@ communicating using the GVariant serialization format instead of JSON when both peers support it. You might want that when communicating on a single host to avoid parser overhead and memory-allocator fragmentation.") (license license:lgpl2.1+))) + +(define-public feedbackd + (package + (name "feedbackd") + (version "0.0.0+git20200527") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://source.puri.sm/Librem5/feedbackd.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wbkzxnqjydfgjvp7vz4ghczcz740zcb1yn90cb6gb5md4n6qx2y")))) + (build-system meson-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (inputs + `(("dbus" ,dbus) + ("gsound" ,gsound) + ("json-glib" ,json-glib) + ("libgudev" ,libgudev))) + (propagated-inputs + `(("glib" ,glib))) ; in Requires of libfeedback-0.0.pc + (synopsis "Haptic/visual/audio feedback via DBus") + (description "Feedbackd provides a DBus daemon to act on events to provide +haptic, visual and audio feedback. It offers the libfeedbackd library and +GObject introspection bindings.") + (home-page "https://source.puri.sm/Librem5/feedbackd") + (license (list license:lgpl2.1+ ; libfeedbackd + license:lgpl3+)))) ; the rest From 593ef98a28ff8d101772847ba4d88d4bfaca4ce8 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Mon, 11 May 2020 18:16:52 +0200 Subject: [PATCH 093/241] gnu: Add purple-mm-sms. * gnu/packages/messaging.scm (purple-mm-sms): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c20e48cb6d..ba07b38622 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Reza Alizadeh Majd +;;; Copyright © 2020 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages enchant) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -2186,4 +2188,39 @@ support for high performance Telegram Bot creation.") (home-page "https://core.telegram.org/tdlib") (license license:boost1.0)))) +(define-public purple-mm-sms + (package + (name "purple-mm-sms") + (version "0.1.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://source.puri.sm/Librem5/purple-mm-sms.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1daf7zl8bhhm1szkgxflpqql69f2w9i9nlgf1n4p1nynxifz1bim")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (let ((out (assoc-ref %outputs "out"))) + ;; Fix hardcoded paths + (list (string-append "PREFIX=" out) + (string-append "PLUGIN_DIR_PURPLE=" out "/lib/purple-2") + (string-append "DATA_ROOT_DIR_PURPLE=" out "/share"))) + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("modem-manager" ,modem-manager) + ("pidgin" ,pidgin))) + (synopsis "Libpurple plugin for SMS via ModemManager") + (description "Plugin for libpurple to allow sending SMS using ModemManager.") + (home-page "https://source.puri.sm/Librem5/purple-mm-sms") + (license license:gpl2+))) ;;; messaging.scm ends here From d26186232ed4c753db73c6a0d2c623d2816e721d Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Mon, 11 May 2020 18:16:53 +0200 Subject: [PATCH 094/241] gnu: Add chatty. * gnu/packages/messaging.scm (chatty): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ba07b38622..a79d23ff3c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2223,4 +2223,49 @@ support for high performance Telegram Bot creation.") (description "Plugin for libpurple to allow sending SMS using ModemManager.") (home-page "https://source.puri.sm/Librem5/purple-mm-sms") (license license:gpl2+))) + +(define-public chatty + (package + (name "chatty") + (version "0.1.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://source.puri.sm/Librem5/chatty.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0czvqwjzsb0rvmgrmbh97m1b35rnwl41j7q32z4fcqb7bschibql")))) + (build-system meson-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-updating-desktop-database + (lambda _ + (substitute* "meson.build" + (("meson.add_install_script.*") "")) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("feedbackd" ,feedbackd) + ("folks" ,folks) + ("libgcrypt" ,libgcrypt) + ("libgee" ,libgee) + ("libhandy" ,libhandy) + ("pidgin" ,pidgin) + ("purple-mm-sms" ,purple-mm-sms) + ("sqlite" ,sqlite))) + (propagated-inputs + `(("adwaita-icon-theme" ,adwaita-icon-theme) + ("evolution-data-server" ,evolution-data-server))) + (synopsis "Mobile client for XMPP and SMS messaging") + (description "Chatty is a chat program for XMPP and SMS. It works on mobile +as well as on desktop platforms. It's based on libpurple and ModemManager.") + (home-page "https://source.puri.sm/Librem5/chatty") + (license license:gpl3+))) + ;;; messaging.scm ends here From 2eadf0917caa986273eeaaa6e1d17ea26509093c Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 16 Jun 2020 21:42:59 +0200 Subject: [PATCH 095/241] gnu: gnome-shell-extension-dash-to-panel: Update to 37. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-panel): Update to 37. --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 21838ff0cd..9bef45739e 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -419,7 +419,7 @@ currently focused application in the top panel of the GNOME shell.") (define-public gnome-shell-extension-dash-to-panel (package (name "gnome-shell-extension-dash-to-panel") - (version "26") + (version "37") (source (origin (method git-fetch) (uri (git-reference @@ -427,7 +427,7 @@ currently focused application in the top panel of the GNOME shell.") (commit (string-append "v" version)))) (sha256 (base32 - "1phfx2pblygpcvsppsqqqflm7qnz46mqkw29hj0nv2dn69hf4xbc")) + "0c8p8cmwjh6rpj7jwj1lccpdv5l0bazwywg8hpwgnqy9f4rxmrz3")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments From e7a7a483bcda6ec60d9dff3b3aba88dababe035c Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 16 Jun 2020 22:20:05 +0200 Subject: [PATCH 096/241] gnu: papirus-icon-theme: Update to 20200602. * gnu/packages/gnome-xyz.scm (papirus-icon-theme): Update to 20200602. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnome-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 9bef45739e..53be103495 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -555,8 +555,8 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (define-public papirus-icon-theme (let ((version "0.0.0") ;; The package does not use semver - (revision "1") - (tag "20200430")) + (revision "2") + (tag "20200602")) (package (name "papirus-icon-theme") (version (git-version version revision tag)) @@ -568,7 +568,7 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (commit tag))) (sha256 (base32 - "19dfiifc7cjwy0nb1hgzryzaijszsyix303xsgk5xbmhpwrv92hq")) + "0yv19kl8jr2jmh9018b1qmnq68alw84vrmb35jm462qd3qzzdgah")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments From 559491ea5b36b89b2a2f9d48dacf6a2d7e219910 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Jun 2020 01:02:01 -0400 Subject: [PATCH 097/241] gnu: Transmission: Clean up the package definition. * gnu/packages/bittorrent.scm (transmission)[license]: Correct the license field. [inputs]: Remove unused inputs inotify-tools, cyrus-sasl, and file. --- gnu/packages/bittorrent.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 8b041cb3f5..52160b9025 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -42,7 +42,6 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -50,7 +49,6 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) - #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) #:use-module (gnu packages nettle) #:use-module (gnu packages ncurses) @@ -104,12 +102,9 @@ '("applications" "icons" "pixmaps"))) #t))))) (inputs - `(("inotify-tools" ,inotify-tools) - ("libevent" ,libevent) + `(("libevent" ,libevent) ("curl" ,curl) - ("cyrus-sasl" ,cyrus-sasl) ("openssl" ,openssl) - ("file" ,file) ("zlib" ,zlib) ("gtk+" ,gtk+))) (native-inputs @@ -131,7 +126,7 @@ DHT, µTP, PEX and Magnet Links.") ;; or any future license endorsed by Mnemosyne LLC. ;; ;; A few files files carry an MIT/X11 license header. - (license l:gpl3+))) + (license (list l:gpl2 l:gpl3)))) (define-public libtorrent (package From ed8583d162761f0683ea9523298db2e671a1ad09 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 17 Jun 2020 11:17:57 +0200 Subject: [PATCH 098/241] gnu: guix: Update to 1.1.0-11.559491e. * gnu/packages/package-management.scm (guix): Update to 1.1.0-11.559491e. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4b1c5a6d55..cf979dbc3e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "141b5c162048f5cb52e8c90ff7c16a2e98babcfb") - (revision 10)) + (commit "559491ea5b36b89b2a2f9d48dacf6a2d7e219910") + (revision 11)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "1j3vag994kj05b09a7w4lyas991a19hbbslcm9xvn5k2ilf4qskz")) + "0iqpwnffxkvpkqi0x4ddb7h1ww84cwgqif5wpsfwsxiwhanba6rr")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments From 16b1237938e8ec0b859a66a6f90582dd7a2602fe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 11:50:43 +0200 Subject: [PATCH 099/241] gnu: Add perl-alien-sdl. * gnu/packages/perl.scm (perl-alien-sdl): New variable. --- gnu/packages/perl.scm | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 42839f4409..3e3188ae53 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -57,8 +57,10 @@ #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gd) + #:use-module (gnu packages gtk) #:use-module (gnu packages hurd) #:use-module (gnu packages less) #:use-module (gnu packages ncurses) @@ -67,6 +69,7 @@ #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) + #:use-module (gnu packages sdl) #:use-module (gnu packages textutils) #:use-module (gnu packages web)) @@ -321,6 +324,63 @@ explicitly alias the class to another name or, if you prefer, you can do so implicitly.") (license (package-license perl)))) +(define-public perl-alien-sdl + (package + (name "perl-alien-sdl") + (version "1.446") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/F/FR/FROGGS/" + "Alien-SDL-" version ".tar.gz")) + (sha256 + (base32 "0ajipk43syhlmw0zinbj1i6r46vdlkr06wkx7ivqjgf6qffjran9")))) + (build-system perl-build-system) + (arguments + `(#:module-build-flags + ;; XXX: For some reason, `sdl-config' reports stand-alone SDL + ;; directory, not SDL-union provided as an input to the + ;; package. We force the latter with "--prefix=" option. + (list (let ((sdl (assoc-ref %build-inputs "sdl"))) + (string-append "--with-sdl-config=" sdl "/bin/sdl-config" + " --prefix=" sdl))) + #:phases + (modify-phases %standard-phases + ;; Fix "unrecognized option: --with-sdl-config" during build. + ;; Reported upstream as + ;; . See also + ;; . + (add-after 'unpack 'fix-build.pl + (lambda _ + (substitute* "Build.PL" + (("use Getopt::Long;") "") + (("GetOptions\\( \"travis\" => \\\\\\$travis \\);") "")) + #t))))) + (native-inputs + `(("perl-archive-extract" ,perl-archive-extract) + ("perl-archive-zip" ,perl-archive-zip) + ("perl-capture-tiny" ,perl-capture-tiny) + ("perl-file-sharedir" ,perl-file-sharedir) + ("perl-file-which" ,perl-file-which) + ("perl-module-build" ,perl-module-build) + ("perl-text-patch" ,perl-text-patch))) + (inputs + `(("freetype" ,freetype) + ("fontconfig" ,fontconfig) + ("pango" ,pango) + ("sdl" ,(sdl-union + (list sdl sdl-gfx sdl-image sdl-mixer sdl-net sdl-ttf + sdl-pango))) + ("zlib" ,zlib))) + (home-page "https://metacpan.org/release/Alien-SDL") + (synopsis "Get, build and use SDL libraries") + (description + "Alien::SDL can be used to detect and get configuration settings from an +installed SDL and related libraries. Based on your platform it offers the +possibility to download and install prebuilt binaries or to build SDL & co.@: +from source codes.") + (license license:perl-license))) + (define-public perl-any-moose (package (name "perl-any-moose") From eae6dd6f11d32edbe5609e91e3093582e8cb4f5b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 12:44:28 +0200 Subject: [PATCH 100/241] gnu: Add perl-sdl. * gnu/packages/perl.scm (perl-sdl): New variable. --- gnu/packages/perl.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 3e3188ae53..4ca1b5afd4 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -60,8 +60,10 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gd) + #:use-module (gnu packages gl) #:use-module (gnu packages gtk) #:use-module (gnu packages hurd) + #:use-module (gnu packages image) #:use-module (gnu packages less) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl-check) @@ -71,6 +73,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages textutils) + #:use-module (gnu packages video) #:use-module (gnu packages web)) ;;; @@ -11016,6 +11019,46 @@ really be high enough to warrant the use of a keyword, and the size so small such that being individual extensions would be wasteful.") (license (package-license perl)))) +(define-public perl-sdl + (package + (name "perl-sdl") + (version "2.548") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/F/FR/FROGGS/" + "SDL-" version ".tar.gz")) + (sha256 + (base32 "1dagpmcpjnwvd4g6mmnc312rqpd4qcwx21rpi2j7084wz8mijai5")))) + (build-system perl-build-system) + (native-inputs + `(("perl-alien-sdl" ,perl-alien-sdl) + ("perl-capture-tiny" ,perl-capture-tiny) + ("perl-file-sharedir" ,perl-file-sharedir) + ("perl-module-build" ,perl-module-build) + ("perl-test-most" ,perl-test-most) + ("perl-tie-simple" ,perl-tie-simple))) + (inputs + `(("freeglut" ,freeglut) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libsmpeg" ,libsmpeg) + ("libtiff" ,libtiff) + ("mesa" ,mesa) + ("sdl" ,(sdl-union + (list sdl sdl-gfx sdl-image sdl-mixer sdl-pango sdl-ttf))))) + (propagated-inputs + `(("perl-file-sharedir" ,perl-file-sharedir) + ("perl-tie-simple" ,perl-tie-simple))) + (home-page "https://metacpan.org/release/SDL") + (synopsis "SDL bindings to Perl") + (description + "SDL Perl is a package of Perl modules that provide both functional and +object oriented interfaces to the Simple DirectMedia Layer for Perl5. This +package takes some liberties with the SDL API, and attempts to adhere to the +spirit of both the SDL and Perl.") + (license license:lgpl2.1))) + (define-public perl-shell-command (package (name "perl-shell-command") From ce84582b51ba7669d9fa4e67bbc224aa855aa5ea Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Jun 2020 12:50:34 +0200 Subject: [PATCH 101/241] gnu: Add frozen-bubble. * gnu/packages/games.scm (frozen-bubble): New variable. --- gnu/packages/games.scm | 104 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e95effa992..71b8cb43c2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -146,6 +146,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) + #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -176,14 +177,15 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages networking) #:use-module (guix build-system copy) + #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) - #:use-module (guix build-system scons) + #:use-module (guix build-system perl) #:use-module (guix build-system python) - #:use-module (guix build-system cmake) #:use-module (guix build-system qt) + #:use-module (guix build-system scons) #:use-module (guix build-system trivial) #:use-module ((srfi srfi-1) #:hide (zip)) #:use-module (srfi srfi-26)) @@ -6891,6 +6893,104 @@ when packaged in Blorb container files or optionally from individual files.") (home-page "http://frotz.sourceforge.net") (license license:gpl2+)))) +(define-public frozen-bubble + ;; Last official release is very outdated (2010). Use latest commit (2017). + (let ((commit "d6a029110ad6ab9e4960052e175addc98807fb7e") + (revision "1")) + (package + (name "frozen-bubble") + (version (git-version "2.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kthakore/frozen-bubble.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rfrcym5lf4qac2qdklikb1ywijyxypq298azzxahy461dadl6cx")))) + (build-system perl-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Build process needs to create files in the "server" + ;; directory. + (add-after 'unpack 'fix-permissions + (lambda _ + (for-each make-file-writable + (find-files "server" "." #:directories? #t)))) + ;; By default, build stops at warnings. + (add-after 'unpack 'prevent-build-error + (lambda _ + (substitute* "inc/My/Builder.pm" + (("-Werror") "")) + #t)) + (add-after 'install 'install-desktop-file-and-icons + (lambda* (#:key outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/share")) + (hicolor (string-append share "/icons/hicolor"))) + ;; Create desktop entry. + (make-desktop-entry-file + (string-append share "/applications/" ,name ".desktop") + #:name "Frozen Bubble" + #:comment "Frozen Bubble arcade game" + #:exec ,name + #:icon ,name + #:categories '("Game" "ArcadeGame")) + ;; Add icons. + (with-directory-excursion "share/icons" + (for-each + (lambda (size) + (let* ((dim (string-append size "x" size)) + (dir (string-append hicolor "/" dim "/apps"))) + (mkdir-p dir) + (copy-file + (string-append "frozen-bubble-icon-" dim ".png") + (string-append dir "/frozen-bubble.png")))) + '("16" "32" "48" "64")))) + #t)) + (add-after 'install 'wrap-perl-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (perl5lib (getenv "PERL5LIB"))) + (for-each (lambda (prog) + (wrap-program (string-append out "/" prog) + `("PERL5LIB" ":" prefix + (,(string-append perl5lib ":" out + "/lib/perl5/site_perl"))))) + (find-files "bin" "."))) + #t))))) + (native-inputs + `(("perl-alien-sdl" ,perl-alien-sdl) + ("perl-capture-tiny" ,perl-capture-tiny) + ("perl-locale-maketext-lexicon" ,perl-locale-maketext-lexicon) + ("perl-module-build" ,perl-module-build) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("perl-compress-bzip2" ,perl-compress-bzip2) + ("perl-file-sharedir" ,perl-file-sharedir) + ("perl-file-slurp" ,perl-file-slurp) + ("perl-file-which" ,perl-file-which) + ("perl-ipc-system-simple" ,perl-ipc-system-simple) + ("perl-sdl" ,perl-sdl) + ("sdl" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-pango sdl-ttf))))) + (home-page "http://frozen-bubble.org/") + (synopsis "Puzzle with bubbles") + (description + "Frozen-Bubble is a clone of the popular Puzzle Bobble game, in which +you attempt to shoot bubbles into groups of the same color to cause them to +pop. + +Players compete as penguins and must use the arrow keys to aim a colored +bubble at groups of bubbles. The objective is to clear all the bubbles off +the screen before a bubble passes below a line at the bottom. + +It features 100 single-player levels, a two-player mode, music and striking +graphics. A level editor is also included to allow players to create and play +their own levels.") + (license license:gpl2)))) + (define-public libmanette (package (name "libmanette") From c941b3128b759b8823c4e6487163c6e117a23bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 16 Jun 2020 23:57:33 +0200 Subject: [PATCH 102/241] gnu: Add guvcview. * gnu/packages/video.scm (guvcview): New variable. --- gnu/packages/video.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 16136b7662..1d24b9ca50 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -121,11 +121,13 @@ #:use-module (gnu packages iso-codes) #:use-module (gnu packages libidn) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -4097,3 +4099,42 @@ can also directly record to WebM or MP4 if you prefer.") wlroots-based compositors. More specifically, those that support @code{wlr-screencopy-v1} and @code{xdg-output}.") (license license:expat))) + +(define-public guvcview + (package + (name "guvcview") + (version "2.0.6") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/guvcview/source/guvcview-" + "src-" version ".tar.gz")) + (sha256 + (base32 + "11byyfpkcik7wvf2qic77zjamfr2rhji97dpj1gy2fg1bvpiqf4m")))) + (build-system gnu-build-system) + (arguments + ;; There are no tests and "make check" would fail on an intltool error. + '(#:tests? #f)) + (native-inputs + `(("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs + `(("gtk+" ,gtk+) + ("eudev" ,eudev) + ("libusb" ,libusb) + ("v4l-utils" ,v4l-utils) ;libv4l2 + ("ffmpeg" ,ffmpeg) ;libavcodec, libavutil + ("sdl2" ,sdl2) + ("gsl" ,gsl) + ("portaudio" ,portaudio) + ("alsa-lib" ,alsa-lib))) + (home-page "http://guvcview.sourceforge.net/") + (synopsis "Control your webcam and capture videos and images") + (description + "GTK+ UVC Viewer (guvcview) is a graphical application to control a +webcam accessible with Video4Linux (V4L2) and to capture videos and images. +It provides control over precise settings of the webcam such as exposure, +brightness, contrast, and frame rate.") + + ;; 'COPYING' is GPLv3 but source headers say GPLv2+. + (license license:gpl2+))) From 94642ab06b8104c0dba1509bd390a4a6d119358d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 11:18:08 +0200 Subject: [PATCH 103/241] profiles: Add comment at the top of 'manifest' file. * guix/build/profiles.scm (build-profile): Add comment at the top of MANIFEST-FILE. --- guix/build/profiles.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm index 1dc7976879..67ee9b665a 100644 --- a/guix/build/profiles.scm +++ b/guix/build/profiles.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -167,6 +167,10 @@ SEARCH-PATHS." ;; Store meta-data. (call-with-output-file manifest-file (lambda (p) + (display "\ +;; This file was automatically generated and is for internal use only. +;; It cannot be passed to the '--manifest' option.\n\n" + p) (pretty-print manifest p))) ;; Make sure we can write to 'OUTPUT/etc'. 'union-build' above could have From a3a8b88620f06bdacc1114a180101a58551e926e Mon Sep 17 00:00:00 2001 From: nikita Date: Wed, 20 May 2020 00:06:05 +0200 Subject: [PATCH 104/241] gnu: gnurl: Update to 7.70.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnunet.scm (gnurl): Update to 7.70.0. Signed-off-by: Ludovic Courtès --- gnu/packages/gnunet.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 1b7ea9246c..27fb39fb8b 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver -;;; Copyright © 2016, 2017, 2018, 2019 Nikita +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Nikita ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Brett Gilio @@ -180,13 +180,13 @@ authentication and support for SSL3 and TLS.") (define-public gnurl (package (name "gnurl") - (version "7.69.1") + (version "7.70.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/gnurl-" version ".tar.gz")) (sha256 (base32 - "0x8m26y3klndis6a28j8i0b7ab04d38q3rmlvgaqa65bjhlfdrp0")))) + "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.8 MiB of man3 pages From 92d8c4aa38ee57d89de47c01b7766cd7b2001e6f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 17 Jun 2020 12:25:46 +0200 Subject: [PATCH 105/241] Revert "gnu: guix: Update to 1.1.0-11.559491e." This reverts commit ed8583d162761f0683ea9523298db2e671a1ad09 because of some test failures. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index cf979dbc3e..4b1c5a6d55 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "559491ea5b36b89b2a2f9d48dacf6a2d7e219910") - (revision 11)) + (commit "141b5c162048f5cb52e8c90ff7c16a2e98babcfb") + (revision 10)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "0iqpwnffxkvpkqi0x4ddb7h1ww84cwgqif5wpsfwsxiwhanba6rr")) + "1j3vag994kj05b09a7w4lyas991a19hbbslcm9xvn5k2ilf4qskz")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments From a7d74db93da6524d4cbe3ed4379ca4ca36469cc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 03:10:58 +0200 Subject: [PATCH 106/241] gnu: corsix-th: Update to 0.64. * gnu/packages/games.scm (corsix-th): Update to 0.64. --- 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 71b8cb43c2..6601c077f6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -517,7 +517,7 @@ want what you have.") (define-public corsix-th (package (name "corsix-th") - (version "0.63") + (version "0.64") (source (origin (method git-fetch) @@ -526,7 +526,7 @@ want what you have.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rkyk8g55xny276s0hr5k8mq6f4nzz56d3k2mp09dzfymrqb8hgi")))) + (base32 "0chh9cv2kdc39sr0x8hclcyzd8dz2y6grgagqzkvr7j570wa5cqh")))) (build-system cmake-build-system) (arguments `(#:phases From 0f27f41d592304be968fe0892b2a3133bb46e1f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 03:11:08 +0200 Subject: [PATCH 107/241] gnu: hplip: Update to 3.20.6. * gnu/packages/cups.scm (hplip): Update to 3.20.6. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index d83211ede2..6c43632d7a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -415,14 +415,14 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.20.5") + (version "3.20.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0nj79r61fzddwwzf8kcc0qkp4y9qx46v15iarz6h6y3v91wbsjq0")) + "0rmk7i28mb0q66i5l9d0fq2j23dkhz5gx5g2xvi16ga0dnprcilp")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet From 6d164aecc8c7f2927e988f44257fa25377bf8bf4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 13:29:52 +0200 Subject: [PATCH 108/241] gnu: sbsigntools: Update to 0.9.4. * gnu/packages/efi.scm (sbsigntools): Update to 0.9.4. --- gnu/packages/efi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index da00fdf932..bc27a7a504 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -64,7 +64,7 @@ environment presented by Intel's EFI.") (define-public sbsigntools (package (name "sbsigntools") - (version "0.9.3") + (version "0.9.4") (source (origin (method git-fetch) @@ -75,7 +75,7 @@ environment presented by Intel's EFI.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0gc3xmp73xl7z4nkwz4qy960rdflmx7k4ksgyblcnia9smvsir6y")))) + (base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m")))) (build-system gnu-build-system) (arguments `(#:phases From ec40d24fb936898ee83b7370079e194403329465 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 13:30:33 +0200 Subject: [PATCH 109/241] gnu: rocksdb: Update to 6.10.2. * gnu/packages/databases.scm (rocksdb): Update to 6.10.2. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bab4b4d128..e2eb0f396d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1147,7 +1147,7 @@ including field and record folding."))) (define-public rocksdb (package (name "rocksdb") - (version "6.10.1") + (version "6.10.2") (source (origin (method git-fetch) (uri (git-reference @@ -1156,7 +1156,7 @@ including field and record folding."))) (file-name (git-file-name name version)) (sha256 (base32 - "0rp8q73dx5f1nkcf2qp6fljm4dpj281y6cqckqgv976kvwvqdgz1")) + "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1")) (modules '((guix build utils))) (snippet '(begin From 18debc6e4f69d05568eef29c2e52295acc730252 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 13:32:22 +0200 Subject: [PATCH 110/241] gnu: mgba: Update to 0.8.2. * gnu/packages/emulators.scm (mgba): Update to 0.8.2. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 6acd6d63d3..7e797d1dae 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -414,7 +414,7 @@ V2.") (define-public mgba (package (name "mgba") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -423,7 +423,7 @@ V2.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429")) + (base32 "0dlwhn3hrpaqnl5hjs53y8j2i16idxrg3gy688gcwrc9z1a6bkn2")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. From ee3eba3b8bfaacd3ca61c63696d073534c4d6bac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Jun 2020 12:06:11 +0300 Subject: [PATCH 111/241] gnu: kodi: Update to 18.7.1. * gnu/packages/kodi.scm (kodi): Update to 18.7.1. --- gnu/packages/kodi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index c81a4bc487..742172a969 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -269,7 +269,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (define-public kodi (package (name "kodi") - (version "18.7") + (version "18.7.1") (source (origin (method git-fetch) (uri (git-reference @@ -278,7 +278,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") (file-name (git-file-name name version)) (sha256 (base32 - "082cpih84j7v29w55qhj0rdia7hdjpwi81qywiwawd4vlyimpv2h")) + "1ypn29yhy49mz9x4xqh2zfdrsbfwm1b4canvh9zvy9c1irjwf419")) (patches (search-patches "kodi-skip-test-449.patch" "kodi-increase-test-timeout.patch" "kodi-set-libcurl-ssl-parameters.patch")) From 7b3cb5acb811403c0b72abb801bd78f66d72efdd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Jun 2020 14:46:05 +0300 Subject: [PATCH 112/241] gnu: efl: Update to 1.24.3. * gnu/packages/enlightenment.scm (efl): Update to 1.24.3. [arguments]: Remove opengl flags from configure-flags. --- gnu/packages/enlightenment.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 40f1191416..02e1b0e220 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -70,7 +70,7 @@ (define-public efl (package (name "efl") - (version "1.24.2") + (version "1.24.3") (source (origin (method url-fetch) (uri (string-append @@ -78,7 +78,7 @@ version ".tar.xz")) (sha256 (base32 - "0w3srvigg4kfi7xq76c7y4hnq5yr2gxrrsvlyj1g2wc1igz1vyg1")))) + "0ajwc8lmay5ai7nsrp778g393h0p4h98p4c22gic2w61fgkcd5fy")))) (build-system meson-build-system) (native-inputs `(("check" ,check) @@ -152,11 +152,6 @@ ; (assoc-ref %build-inputs "hyphen") ; "/share/hyphen") "-Dnetwork-backend=connman" - ,@(match (%current-system) - ("armhf-linux" - '("-opengl=es-egl")) - (_ - '("-Dopengl=full"))) ;; for wayland "-Dwl=true" "-Ddrm=true") From df3a461184002c75fc1c7f2d1fdceab8b76a7f14 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 17 Jun 2020 13:45:47 +0200 Subject: [PATCH 113/241] gnu: znc: Use HTTPS. * gnu/packages/messaging.scm (znc)[source]: Use HTTPS. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a79d23ff3c..85b0773665 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -571,7 +571,7 @@ compromised.") (version "1.8.1") (source (origin (method url-fetch) - (uri (string-append "http://znc.in/releases/archive/znc-" + (uri (string-append "https://znc.in/releases/archive/znc-" version ".tar.gz")) (sha256 (base32 From 204623bc68a7ba0445953605208ec1a1131d85bc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Jun 2020 14:52:21 +0300 Subject: [PATCH 114/241] gnu: znc: Update home-page. * gnu/packages/messaging.scm (znc)[home-page]: Follow redirect. --- gnu/packages/messaging.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 85b0773665..a03c620574 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -605,7 +605,7 @@ compromised.") ("perl" ,perl) ("python" ,python) ("zlib" ,zlib))) - (home-page "https://znc.in") + (home-page "https://wiki.znc.in/ZNC") (synopsis "IRC network bouncer") (description "ZNC is an @dfn{IRC network bouncer} or @dfn{BNC}. It can detach the client from the actual IRC server, and also from selected channels. From e3c67688224955b7a072ab61da0e3e47cbe67115 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 17 Jun 2020 14:41:46 +0200 Subject: [PATCH 115/241] gnu: guix: Update to 1.1.0-11.204623b. * gnu/packages/package-management.scm (guix): Update to 1.1.0-11.204623b. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4b1c5a6d55..bbb9985126 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "141b5c162048f5cb52e8c90ff7c16a2e98babcfb") - (revision 10)) + (commit "204623bc68a7ba0445953605208ec1a1131d85bc") + (revision 11)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "1j3vag994kj05b09a7w4lyas991a19hbbslcm9xvn5k2ilf4qskz")) + "0fx1ncs77n19r6mby0pxfdg3b54qncyawaghfx6nhl3c81c6fd1q")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments From 916003fa33d7cb7ca0fbdb6e9708252194637972 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 17 Jun 2020 13:54:32 +0200 Subject: [PATCH 116/241] gnu: xsnow: Update to 2.0.22. * gnu/packages/toys.scm (xsnow): Update to 2.0.22. Signed-off-by: Efraim Flashner --- gnu/packages/toys.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 7f22646d8c..f643e06974 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jesse Gibbons -;;; Copyright © 2019 Timotej Lazar +;;; Copyright © 2019, 2020 Timotej Lazar ;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -167,7 +167,7 @@ The GNU project hosts a similar collection of filters, the GNU talkfilters.") (define-public xsnow (package (name "xsnow") - (version "2.0.15") + (version "2.0.22") (source (origin (method url-fetch) @@ -175,7 +175,7 @@ The GNU project hosts a similar collection of filters, the GNU talkfilters.") "https://www.ratrabbit.nl/ratrabbit/system/files/xsnow/xsnow-" version ".tar.gz")) (sha256 - (base32 "086s42frbz9bk550414v908yrax4iwwlvlxv4zwp39cyp7wgws03")))) + (base32 "1880643fal6l7bskqbm4zfbr2s719698mkx4pchrxkjpb240sj0z")))) (build-system gnu-build-system) (arguments '(#:phases From b8744955f538f624901726d79c66108385d66a26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 16 Jun 2020 00:40:04 -0400 Subject: [PATCH 117/241] gnu: emacs-elpy: Update to 1.34.0. * gnu/packages/emacs-xyz.scm (emacs-elpy): Update to 1.34.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 93b91ab37f..0cf769779e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7384,7 +7384,7 @@ indentation guides in Emacs: (define-public emacs-elpy (package (name "emacs-elpy") - (version "1.32.0") + (version "1.34.0") (source (origin (method git-fetch) (uri (git-reference @@ -7393,7 +7393,7 @@ indentation guides in Emacs: (file-name (git-file-name name version)) (sha256 (base32 - "0f00mdnzx6xqwni86rgvaa6sfkwyh62xfbwz8qsar15j0j6vc2dj")))) + "1x1z298axbh4xalssnq9nkf2z1sdgmx839vb01xz18kr9lfavx1x")))) (build-system emacs-build-system) (arguments `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) From cb4b60bceea1110f357af8e1f20cd32629774c84 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 16 Jun 2020 23:32:36 -0400 Subject: [PATCH 118/241] gnu: emacs-elpy: Disable two tests that fail when building with Emacs 27. * gnu/packages/emacs-xyz.scm (emacs-elpy)[phases]{disable-problematic-tests}: New phase. --- gnu/packages/emacs-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0cf769779e..c92b5723a1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7399,6 +7399,17 @@ indentation guides in Emacs: `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) #:phases (modify-phases %standard-phases + ;; The following tests fail when building with Emacs 27 (see: + ;; https://github.com/jorgenschaefer/elpy/issues/1812). + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "test/elpy-company-backend-test.el" + (("elpy-company-backend-should-add-shell-candidates.*" all) + (string-append all " (skip-unless nil)\n"))) + (substitute* "test/elpy-folding-fold-comments-test.el" + (("elpy-fold-at-point-should-fold-and-unfold-comments.*" all) + (string-append all " (skip-unless nil)\n"))) + #t)) ;; The default environment of the RPC uses Virtualenv to install ;; Python dependencies from PyPI. We don't want/need this in Guix. (add-before 'check 'do-not-use-virtualenv From 7fcf4fa082d945963bc2bebdd61f364d537debc4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 16 Jun 2020 23:48:27 -0400 Subject: [PATCH 119/241] gnu: linphoneqt: Remove obsolete phase. Now that we have Qt 5.14, having SOURCE_DATE_EPOCH set prevents reproducibility problems with the Qt Resource Compiler (this was fixed upstream in Qt 5.13). * gnu/packages/linphone.scm (linphoneqt)[phases]: Remove obsolete 'set-qt-rcc-source-date-override phase. --- gnu/packages/linphone.scm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index f96fff2fc4..14da150ced 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -512,14 +512,6 @@ and video calls or instant messaging capabilities to an application.") `(#:tests? #f ; No test target #:phases (modify-phases %standard-phases - (add-after 'set-paths 'set-qt-rcc-source-date-override - (lambda _ - ;; This fixes a reproducibility problem where the Qt Resource - ;; Compiler (RCC) includes timestamp of its source files - ;; (see: https://reproducible-builds.org/docs/ - ;; deterministic-build-systems/#cmake-notes). - (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t)) (add-after 'unpack 'fix-cmake-error (lambda _ ;; This is fixed in commit efed2fd8 of the master branch. From ad9db848b0450d319dcee23bccae33054b608296 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 13:48:51 +0200 Subject: [PATCH 120/241] gnu: nix: Update to 2.3.6. * gnu/packages/package-management.scm (nix): Update to 2.3.6. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index bbb9985126..0e4293629e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -542,14 +542,14 @@ out) and returning a package that uses that as its 'source'." (define-public nix (package (name "nix") - (version "2.3.5") + (version "2.3.6") (source (origin (method url-fetch) (uri (string-append "http://nixos.org/releases/nix/nix-" version "/nix-" version ".tar.xz")) (sha256 (base32 - "1hbqsrp1ii2sfq8x2mahjrl2182qck76n8blrl1jfz3xq99m6i15")))) + "128xf2as0y7hr28x575pbf9lkjpxr9hsxknbavv4p7ywr4lhbs85")))) (build-system gnu-build-system) (arguments `(#:configure-flags From ccc960bb9f72b9c4092e6923d40743d8273ebb36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 17:51:50 +0200 Subject: [PATCH 121/241] gnu: xmobar: Update to 0.34. * gnu/packages/wm.scm (xmobar): Update to 0.34. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 615ac788ed..61cbedef5c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -694,14 +694,14 @@ tiled on several screens.") (define-public xmobar (package (name "xmobar") - (version "0.33") + (version "0.34") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmobar/" "xmobar-" version ".tar.gz")) (sha256 (base32 - "1hr3qqykc5givcpcwrr9f2y920jmiinmxm5mcy6qgpgymgwqb618")))) + "0x09xbz7y9ay0046j1xpr9jjk5jqivqi06vm3q6mhcrgc4y922rx")))) (build-system haskell-build-system) (native-inputs `(("ghc-hspec" ,ghc-hspec) From 32d531eef85f82c6e1e479b3e8c15491431e9f59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 18:01:11 +0200 Subject: [PATCH 122/241] gnu: foo2zjs: Update to 20200610. * gnu/packages/cups.scm (foo2zjs): Update to 20200610. --- gnu/packages/cups.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 6c43632d7a..8bfe96079c 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -681,14 +681,14 @@ printer/driver specific, but spooler-independent PPD file.") (define-public foo2zjs (package (name "foo2zjs") - (version "20200426") + (version "20200610") (source (origin (method url-fetch) ;; XXX: This is an unversioned URL! (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "0wwh29ddd59q18r1jpi3166lgnwr8zn9lry82vahc2g96l97isp7")))) + "11ddx6wf8b5ksl4fqw6fnyz9m3y470lryyrskkya2bsch2bvj9lg")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases From 0bed485a39338cc276dad1beb058f0ec68e2b9a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 18:40:46 +0200 Subject: [PATCH 123/241] gnu: vlc: Update to 3.0.11. * gnu/packages/video.scm (vlc): Update to 3.0.11. --- 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 1d24b9ca50..6e8bc251e8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1199,7 +1199,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.10") + (version "3.0.11") (source (origin (method url-fetch) (uri (string-append @@ -1208,7 +1208,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "0cackl1084hcmg4myf3kvjvd6sjxmzn0c0qkmanz6brvgzyanrm9")))) + "06a9hfl60f6l0fs5c9ma5s8np8kscm4ala6m2pdfji9lyfna351y")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) From 94e72b7502042fdfd3e9e0982db5a2832778847e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 17 Jun 2020 21:36:44 +0800 Subject: [PATCH 124/241] gnu: font-sarasa-gothic: Update to 0.12.7 From 5e41fcb899267b6854990e79edca3526e90ebb11 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 17 Jun 2020 21:33:01 +0800 Subject: [PATCH] gnu: font-sarasa-gothic: Update to 0.12.7 Signed-off-by: Leo Famulari --- 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 4ed0f9a037..1ff7b0327a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1250,7 +1250,7 @@ programming. Iosevka is completely generated from its source code.") (define-public font-sarasa-gothic (package (name "font-sarasa-gothic") - (version "0.12.6") + (version "0.12.7") (source (origin (method url-fetch) @@ -1258,7 +1258,7 @@ programming. Iosevka is completely generated from its source code.") "/releases/download/v" version "/sarasa-gothic-ttc-" version ".7z")) (sha256 - (base32 "1g6k9d5lajchbhsh3g12fk5cgilyy6yw09fals9vc1f9wsqvac86")))) + (base32 "09v65k00g8m953s6riz9xjzb2jgr6v5pdhcllalzzl7c1cn2xl3k")))) (build-system font-build-system) (arguments `(#:phases (modify-phases %standard-phases From 9c8893ce2091765b047d79c5edea3f1063df1796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 12:14:23 +0200 Subject: [PATCH 125/241] gnu: gnurl: Update home page. * gnu/packages/gnunet.scm (gnurl): Update 'home-page'. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 27fb39fb8b..f2ab3a1c27 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Andreas Enge ;;; Copyright © 2014 Sree Harsha Totakura -;;; Copyright © 2015, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2015, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Mark H Weaver @@ -245,7 +245,7 @@ supports HTTP, HTTPS and GnuTLS.") "See COPYING in the distribution.")) (properties '((ftp-server . "ftp.gnu.org") (ftp-directory . "/gnunet"))) - (home-page "https://gnunet.org/gnurl"))) + (home-page "https://gnunet.org/en/gnurl.html"))) (define-public gnunet (package From 8cca3f939aab53c86a7657088b4b215575a5b280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 15:17:00 +0200 Subject: [PATCH 126/241] build-system/gnu: Adjust 'dist-package' to current 'autoconf-wrapper' API. This is a followup to 464f5447396fcec9b43f7eab71d5d42b522a157f. * guix/build-system/gnu.scm (dist-package): Do not call 'autoconf-wrapper'. --- guix/build-system/gnu.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index f59567febb..1085c62d7f 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -253,7 +253,7 @@ exact build phases are defined by PHASES." (let ((ref (lambda (module var) (module-ref (resolve-interface module) var)))) `(,@(package-native-inputs p) - ("autoconf" ,((ref '(gnu packages autotools) 'autoconf-wrapper))) + ("autoconf" ,(ref '(gnu packages autotools) 'autoconf-wrapper)) ("automake" ,(ref '(gnu packages autotools) 'automake)) ("libtool" ,(ref '(gnu packages autotools) 'libtool)) ("gettext" ,(ref '(gnu packages gettext) 'gnu-gettext)) From 2ee1cce324bd200096adfa73cfe6a3fe3a4e87de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 15:18:34 +0200 Subject: [PATCH 127/241] build-system/gnu: Remove 'autoreconf' phase from 'gnu-dist'. This has been superseded by the 'bootstrap' phase added in 189be331acfda1c242a9c85fca8d2a0356742f48. * guix/build/gnu-dist.scm (autoreconf): Remove. (%dist-phases): Remove it. --- guix/build/gnu-dist.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index bf1c63cb85..f82c721da7 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2015 Ludovic Courtès +;;; Copyright © 2013, 2015, 2020 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -33,23 +33,6 @@ (define* (copy-source #:key source #:allow-other-keys) (copy-recursively source ".")) -(define* (autoreconf #:rest args) - (letrec-syntax ((try-files (syntax-rules (else) - ((_ (else fallback ...)) - (begin fallback ...)) - ((_ file files ... (else fallback ...)) - (if (file-exists? file) - (begin - (format #t "bootstrapping with `~a'...~%" - file) - (invoke (string-append "./" file))) - (try-files files ... - (else fallback ...))))))) - (try-files "bootstrap" "bootstrap.sh" "autogen" "autogen.sh" - (else - (format #t "bootstrapping with `autoreconf'...~%") - (invoke "autoreconf" "-vfi"))))) - (define* (build #:key build-before-dist? make-flags (dist-target "distcheck") #:allow-other-keys #:rest args) @@ -85,7 +68,6 @@ (delete 'strip) (replace 'install install-dist) (replace 'build build) - (add-before 'configure 'autoreconf autoreconf) (replace 'unpack copy-source))) ;;; gnu-dist.scm ends here From 03686f26ccefcf3d0e77105f32964008b7f45ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 15:20:34 +0200 Subject: [PATCH 128/241] build-system/gnu: Remove Hydra-specific code from 'gnu-dist'. * guix/build/gnu-dist.scm (install-dist): Remove code for 'hydra-build-products'. --- guix/build/gnu-dist.scm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index f82c721da7..727ddfa312 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -50,16 +50,6 @@ (for-each (lambda (tarball) (copy-file tarball (string-append out "/" tarball))) out) - - (mkdir meta) - (call-with-output-file (string-append out "/hydra-build-products") - (lambda (port) - (for-each (lambda (tarball) - ;; This tells Hydra's what kind of build products we have, - ;; so it can represent them nicely. See `product-list.tt' - ;; in Hydra for details. - (format port "file source-dist ~a/~a~%" out tarball)) - tarballs))) #t)) (define %dist-phases From dabbddbbaae23ab512495c5505d99fa112a4b09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 15:23:32 +0200 Subject: [PATCH 129/241] build-system/gnu: Remove redundant 'unpack' phase from 'gnu-dist'. This has become redundant with the standard 'unpack' phase since 17919a58012c38052133ed029450fdb98d01fb5c. * guix/build/gnu-dist.scm (copy-source): Remove. (%dist-phases): Remove 'unpack' phase. --- guix/build/gnu-dist.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index 727ddfa312..f84430f97c 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -30,9 +30,6 @@ ;;; ;;; Code: -(define* (copy-source #:key source #:allow-other-keys) - (copy-recursively source ".")) - (define* (build #:key build-before-dist? make-flags (dist-target "distcheck") #:allow-other-keys #:rest args) @@ -57,7 +54,6 @@ (modify-phases %standard-phases (delete 'strip) (replace 'install install-dist) - (replace 'build build) - (replace 'unpack copy-source))) + (replace 'build build))) ;;; gnu-dist.scm ends here From 7488d70c555e9ecb9e41fad1b3cfd1234edbaa9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 15:31:04 +0200 Subject: [PATCH 130/241] build-system/gnu: Simplify 'dist-package'. * guix/build-system/gnu.scm (dist-package): Use default keyword arguments in 'substitute-keyword-arguments'. --- guix/build-system/gnu.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 1085c62d7f..60851c5897 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -235,19 +235,15 @@ exact build phases are defined by PHASES." (source s) (arguments ;; Use the right phases and modules. - (let* ((args (default-keyword-arguments (package-arguments p) - `(#:phases #f - #:modules ,%default-modules - #:imported-modules ,%gnu-build-system-modules)))) - (substitute-keyword-arguments args - ((#:modules modules) - `((guix build gnu-dist) - ,@modules)) - ((#:imported-modules modules) - `((guix build gnu-dist) - ,@modules)) - ((#:phases _) - phases)))) + (substitute-keyword-arguments (package-arguments p) + ((#:modules modules %default-modules) + `((guix build gnu-dist) + ,@modules)) + ((#:imported-modules modules %gnu-build-system-modules) + `((guix build gnu-dist) + ,@modules)) + ((#:phases _ #f) + phases))) (native-inputs ;; Add autotools & co. as inputs. (let ((ref (lambda (module var) From ba8c09f289ecaced633a7889572ba8cc2167a654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 19:06:14 +0200 Subject: [PATCH 131/241] build-system/gnu: Rename "make dist" phase to 'build-dist'. * guix/build/gnu-dist.scm (%dist-phases): Add BUILD under the name 'build-dist'. --- guix/build/gnu-dist.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index f84430f97c..ade3b42cab 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -54,6 +54,7 @@ (modify-phases %standard-phases (delete 'strip) (replace 'install install-dist) - (replace 'build build))) + (add-after 'build 'build-dist build) + (delete 'build))) ;;; gnu-dist.scm ends here From cb8c698e8d2ca4bdd1104255df47a92f7b42d475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 19:14:48 +0200 Subject: [PATCH 132/241] news: Add entry for authenticated channels. * etc/news.scm: Add entry. --- etc/news.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index d037734013..292a33f391 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -13,6 +13,19 @@ (channel-news (version 0) + (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") + (title (en "@command{guix pull} authenticates channels")) + (body + (en "The @command{guix pull} and @command{guix time-machine} commands +now authenticate the source code that they pull, unless the new +@option{--disable-authentication} option is passed. What this means is that +Guix ensures that each commit received is cryptographically signed by an +authorized developer. This protects you from attempts to tamper with the Guix +repository and from attempts to ship malicious code to users. + +This feature is currently limited to the @code{guix} channel but will soon be +available to third-party channel authors."))) + (entry (commit "c924e541390f9595d819edc33c19d979917c15ec") (title (en "@command{guix repl} adds support for running Guile scripts") (de "@command{guix repl} kann Guile-Skripte ausführen") From 4ae762af76f9dfb59cf1a23232da22201f9c6e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 15 Jun 2020 16:20:14 +0200 Subject: [PATCH 133/241] channels: Warn when pulling from a mirror. * guix/channels.scm ()[url]: New field. (read-channel-metadata): Initialize it. (read-channel-metadata-from-source): Likewise. (channel-instance-primary-url): New procedure. (latest-channel-instances): Compare CHANNEL's URL against it. * doc/guix.texi (Channels)[Primary URL]: New subsection. --- doc/guix.texi | 22 ++++++++++++++++++++++ guix/channels.scm | 29 +++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6c59db3393..6ce8725ece 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -4153,6 +4153,28 @@ add a meta-data file @file{.guix-channel} that contains: (directory "guix")) @end lisp +@cindex primary URL, channels +@subsection Primary URL + +Channel authors can indicate the primary URL of their channel's Git +repository in the @file{.guix-channel} file, like so: + +@lisp +(channel + (version 0) + (url "https://example.org/guix.git")) +@end lisp + +This allows @command{guix pull} to determine whether it is pulling code +from a mirror of the channel; when that is the case, it warns the user +that the mirror might be stale and displays the primary URL. That way, +users cannot be tricked into fetching code from a stale mirror that does +not receive security updates. + +This feature only makes sense for authenticated repositories, such as +the official @code{guix} channel, for which @command{guix pull} ensures +the code it fetches is authentic. + @cindex news, for channels @subsection Writing Channel News diff --git a/guix/channels.scm b/guix/channels.scm index 5a83d83427..c879cb6ffa 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -182,12 +182,13 @@ introduction, add it." (checkout channel-instance-checkout)) (define-record-type - (channel-metadata directory dependencies news-file keyring-reference) + (channel-metadata directory dependencies news-file keyring-reference url) channel-metadata? (directory channel-metadata-directory) ;string with leading slash (dependencies channel-metadata-dependencies) ;list of (news-file channel-metadata-news-file) ;string | #f - (keyring-reference channel-metadata-keyring-reference)) ;string + (keyring-reference channel-metadata-keyring-reference) ;string + (url channel-metadata-url)) ;string | #f (define %default-keyring-reference ;; Default value of the 'keyring-reference' field. @@ -209,6 +210,7 @@ if valid metadata could not be read from PORT." (let ((directory (and=> (assoc-ref properties 'directory) first)) (dependencies (or (assoc-ref properties 'dependencies) '())) (news-file (and=> (assoc-ref properties 'news-file) first)) + (url (and=> (assoc-ref properties 'url) first)) (keyring-reference (or (and=> (assoc-ref properties 'keyring-reference) first) %default-keyring-reference))) @@ -229,7 +231,8 @@ if valid metadata could not be read from PORT." (commit (get 'commit)))))) dependencies) news-file - keyring-reference))) + keyring-reference + url))) ((and ('channel ('version version) _ ...) sexp) (raise (condition (&message (message "unsupported '.guix-channel' version")) @@ -253,7 +256,7 @@ doesn't exist." read-channel-metadata)) (lambda args (if (= ENOENT (system-error-errno args)) - (channel-metadata "/" '() #f %default-keyring-reference) + (channel-metadata "/" '() #f %default-keyring-reference #f) (apply throw args))))) (define (channel-instance-metadata instance) @@ -463,6 +466,11 @@ been tampered with and is trying to force a roll-back, preventing you from getting the latest updates. If you think this is not the case, explicitly allow non-forward updates.")))))))))) +(define (channel-instance-primary-url instance) + "Return the primary URL advertised for INSTANCE, or #f if there is no such +information." + (channel-metadata-url (channel-instance-metadata instance))) + (define* (latest-channel-instances store channels #:key (current-channels '()) @@ -518,6 +526,19 @@ depending on the policy it implements." validate-pull #:starting-commit current))) + (when authenticate? + ;; CHANNEL is authenticated so we can trust the + ;; primary URL advertised in its metadata and warn + ;; about possibly stale mirrors. + (let ((primary-url (channel-instance-primary-url + instance))) + (unless (or (not primary-url) + (channel-commit channel) + (string=? primary-url (channel-url channel))) + (warning (G_ "pulled channel '~a' from a mirror \ +of ~a, which might be stale~%") + (channel-name channel) + primary-url)))) (let-values (((new-instances new-channels) (loop (channel-instance-dependencies instance) From 8b1f7c03d239ca703b56f2a6e5f228c79bc1857e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 15 Jun 2020 16:25:47 +0200 Subject: [PATCH 134/241] .guix-channel: Add primary URL. * .guix-channel: Add 'url'. --- .guix-channel | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.guix-channel b/.guix-channel index f4459f1de1..b852180cf2 100644 --- a/.guix-channel +++ b/.guix-channel @@ -3,4 +3,5 @@ (channel (version 0) (news-file "etc/news.scm") - (keyring-reference "keyring")) + (keyring-reference "keyring") + (url "https://git.savannah.gnu.org/git/guix.git")) ;the primary URL From a563848347d77e984881e62624fb99d6b77fda7a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Jun 2020 11:42:18 -0400 Subject: [PATCH 135/241] gnu: supercollider: Move the unbundling phase to a snippet. * gnu/packages/audio.scm (supercollider)[phases]{rm-bundled-libs}: Move to... [origin]{snippet}: ...here. --- gnu/packages/audio.scm | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a9f34599bc..4a6798c854 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2344,7 +2344,29 @@ background file post-processing.") (file-name (git-file-name name version)) (sha256 (base32 - "02v911w2kdbg3kfl593lb2ig4sjbfxzv20a0vbcymhfzpvp1x6xp")))) + "02v911w2kdbg3kfl593lb2ig4sjbfxzv20a0vbcymhfzpvp1x6xp")) + (modules '((guix build utils) + (ice-9 ftw))) + (snippet + ;; The build system doesn't allow us to unbundle the following + ;; libraries. hidapi is also heavily patched and upstream not + ;; actively maintained. + '(let ((keep-dirs '("nova-simd" "nova-tt" "hidapi" + "TLSF-2.4.6" "oscpack_1_1_0" "." ".."))) + (with-directory-excursion "./external_libraries" + (for-each + delete-file-recursively + (scandir "." + (lambda (x) + (and (eq? (stat:type (stat x)) 'directory) + (not (member (basename x) keep-dirs))))))) + ;; To find the Guix provided ableton-link library. + (substitute* "lang/CMakeLists.txt" + (("include\\(\\.\\./external_libraries/link/\ +AbletonLinkConfig\\.cmake\\)") + "find_package(AbletonLink NAMES AbletonLink ableton-link \ +link REQUIRED)")) + #t)))) (build-system cmake-build-system) (outputs '("out" ;core language @@ -2355,28 +2377,8 @@ background file post-processing.") "-DFORTIFY=ON" "-DLIBSCSYNTH=ON" "-DSC_EL=off") ;scel is packaged individually as ;emacs-scel - #:modules ((guix build utils) - (guix build cmake-build-system) - (ice-9 ftw)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'rm-bundled-libs - (lambda _ - ;; The build system doesn't allow us to unbundle the following - ;; libraries. hidapi is also heavily patched. - (let ((keep-dirs '("nova-simd" "nova-tt" "hidapi" "TLSF-2.4.6" - "oscpack_1_1_0" "." ".."))) - (with-directory-excursion "./external_libraries" - (for-each - delete-file-recursively - (scandir "." - (lambda (x) - (and (eq? (stat:type (stat x)) 'directory) - (not (member (basename x) keep-dirs)))))))) - (substitute* "lang/CMakeLists.txt" - (("include\\(\\.\\./external_libraries/link/AbletonLinkConfig\\.cmake\\)") - "find_package(AbletonLink NAMES AbletonLink ableton-link link REQUIRED)")) - #t)) ;; Some tests are broken (see: ;; https://github.com/supercollider/supercollider/issues/3555 and ;; https://github.com/supercollider/supercollider/issues/1736 From 2915a7604a8dd1ac81ff4c8557b46c9f6048228c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Jun 2020 13:19:15 -0400 Subject: [PATCH 136/241] gnu: supercollider: Enable all tests. * gnu/packages/audio.scm (supercollider)[phases]{set-home, prepare-x}: New phases. {disable-broken-tests}: Delete phase. {patch-scclass-dir}: Adapt accordingly. [native-inputs]: Add xorg-server-for-tests. --- gnu/packages/audio.scm | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4a6798c854..74ef7111c3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2379,22 +2379,14 @@ link REQUIRED)")) ;emacs-scel #:phases (modify-phases %standard-phases - ;; Some tests are broken (see: - ;; https://github.com/supercollider/supercollider/issues/3555 and - ;; https://github.com/supercollider/supercollider/issues/1736 - (add-after 'rm-bundled-libs 'disable-broken-tests + ;; HOME must be defined otherwise supercollider throws a "ERROR: + ;; Primitive '_FileMkDir' failed." error when generating the doc. + ;; The graphical tests also hang without it. + (add-after 'unpack 'set-home-directory (lambda _ - (substitute* "testsuite/server/supernova/CMakeLists.txt" - (("server_test.cpp") - "") - (("perf_counter_test.cpp") - "")) - (substitute* "testsuite/CMakeLists.txt" - (("add_subdirectory\\(sclang\\)") - "")) - (delete-file "testsuite/sclang/CMakeLists.txt") + (setenv "HOME" (getcwd)) #t)) - (add-after 'disable-broken-tests 'patch-scclass-dir + (add-after 'unpack 'patch-scclass-dir (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (scclass-dir @@ -2406,6 +2398,11 @@ link REQUIRED)")) "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME")) (string-append "Path(\"" scclass-dir "\")"))) #t))) + (add-before 'build 'prepare-x + (lambda _ + (system "Xvfb &") + (setenv "DISPLAY" ":0") + #t)) (add-before 'install 'install-ide (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -2418,7 +2415,8 @@ link REQUIRED)")) (native-inputs `(("ableton-link" ,ableton-link) ("pkg-config" ,pkg-config) - ("qttools" ,qttools))) + ("qttools" ,qttools) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("jack" ,jack-1) ("libsndfile" ,libsndfile) From 3b3e392196c5b43c929410fa0b8f9c23c5b62544 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 17 Jun 2020 14:11:50 -0400 Subject: [PATCH 137/241] gnu: Add emacs-dvc. * gnu/packages/emacs-xyz.scm (emacs-dvc): New variable. --- gnu/packages/emacs-xyz.scm | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c92b5723a1..d8a04214b7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -96,6 +96,7 @@ #:use-module (guix packages) #:use-module (guix cvs-download) #:use-module (guix download) + #:use-module (guix bzr-download) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix build-system gnu) @@ -3979,6 +3980,62 @@ respective @code{*Help*} buffers.") completion of relevant keywords.") (license license:expat))) +(define-public emacs-dvc + (let ((revision "591") ;no tags or official releases + (guix-revision "1")) + (package + (name "emacs-dvc") + (version (string-append "0.0.0-" guix-revision "." revision)) + (source + (origin + (method bzr-fetch) + (uri (bzr-reference + (url "lp:dvc") + (revision revision))) + (sha256 + (base32 + "03pqn493w70wcpgaxvqnfgynxghw114l9pyiv3r414d84vzhan6h")) + (file-name (string-append name "-" version "-checkout")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-lispdir=" (assoc-ref %outputs "out") + "/share/emacs/site-lisp/")) + #:tests? #f ;no test suite + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-home + ;; Something in dvc-bookmarks.el attempts to write config files in + ;; $HOME during the autoload generation. + (lambda _ (setenv "HOME" (getenv "TMPDIR")) #t)) + (add-before 'build 'fix-texinfo + ;; See https://bugs.launchpad.net/dvc/+bug/1264383. + (lambda _ + (substitute* "texinfo/dvc-intro.texinfo" + (("@itemx update ``to''") + "@item update ``to''") + (("@itemx brief") + "@item brief") + (("@itemx full") + "@item full") + (("@itemx drop") + "@item drop") + (("@itemx left file") + "@item left file")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) ;for aclocal + ("emacs" ,emacs-minimal) + ("texinfo" ,texinfo))) + (home-page "http://xsteve.at/prg/emacs_dvc/index.html") + (synopsis "Emacs front-end for various distributed version control systems.") + (description "DVC is a legacy Emacs front-end for a number of +distributed version control systems. It currently supports GNU Arch, GNU +Bazaar, git, Mercurial, and Monotone. It also provides some integration with +Gnus, e.g., for applying patches received by email.") + (license license:gpl2+)))) + (define-public emacs-sudo-edit (let ((commit "cc3d478937b1accd38742bfceba92af02ee9357d") (revision "6")) From 19ca98286191e5990c3973f882144cc568a956ff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 5 Jun 2020 13:46:44 -0400 Subject: [PATCH 138/241] gnu: Add anubis. * gnu/packages/mail.scm (anubis): New variable. --- gnu/packages/mail.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ec1233f83b..e89a6f330f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Justus Winter ;;; Copyright © 2020 Eric Brown +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -146,6 +147,44 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) +(define-public anubis + (package + (name "anubis") + ;; This 4.2.90 alpha release adds support for Guile 3 and has fixes for + ;; other issues. + (version "4.2.90") + (source + (origin + (method url-fetch) + (uri (string-append "https://alpha.gnu.org/gnu/anubis/anubis-" + version ".tar.gz")) + (sha256 + (base32 + "0dvm6acl32dv8bixx9z50gzwfp6kj4kxnn1j3dcwjlp7sasjp41s")))) + (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("gettext" ,gettext-minimal) + ("m4" ,m4))) ;for the test suite + (inputs + `(("gdbm" ,gdbm) + ("gnutls" ,gnutls) + ("gpgme" ,gpgme) + ("gsasl" ,gsasl) + ("guile" ,guile-3.0) + ("libgcrypt" ,libgcrypt) ;gnutls support depends on libgcrypt + ("libgpg-error" ,libgpg-error))) + (outputs '("out" "debug")) + (synopsis "SMTP message submission daemon") + (description "Anubis is a daemon that sits between the Mail User +Agent (MUA) and the Mail Transfer Agent (MTA). When a mail is sent by a user +in the MUA, it is first passed to Anubis, which performs additional processing +to the message before passing it on for delivery by the MTA. Anubis may, for +example, modify the message headers or body, or encrypt or sign the message.") + (home-page "https://www.gnu.org/software/anubis/manual/") + (license gpl3+))) + (define-public mailutils (package (name "mailutils") From 5e5776dfdef32d1450978e40f0d15550b4dd4049 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 21:27:39 +0200 Subject: [PATCH 139/241] gnu: bind: Update to 9.16.4 [fixes CVE-2020-8618 & CVE-2020-8619]. * gnu/packages/dns.scm (isc-bind): Update to 9.16.4. --- 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 7ff0501ab2..e4cc4a111b 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -119,7 +119,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.16.3") + (version "9.16.4") (source (origin (method url-fetch) (uri (string-append @@ -127,7 +127,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.xz")) (sha256 (base32 - "0zjgaspnx0p0rp83h4yj595s25da7fjis94z9frhv3azvq9nbb17")))) + "02ip1xvmnqla3p5k2rmfrksrw4q9iqbrhyg3mamvrj5a7n6hh8km")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs From e68dd68ffe95ae07a30a61ddc2a0e697693ba881 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Jun 2020 13:46:21 -0400 Subject: [PATCH 140/241] gnu: FFmpeg: Update to 4.3. * gnu/packages/video.scm (ffmpeg): Update to 4.3. [source]: Remove obsolete patch. [inputs]: Add rav1e. [arguments]: Pass "--enable-librav1e" to #:configure-flags. (ffmpeg-3.4): Don't build with librav1e. [inputs]: Remove rav1e. [arguments]: Remove "--enable-librav1e" from #:configure-flags. * gnu/packages/patches/ffmpeg-prefer-dav1d.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/ffmpeg-prefer-dav1d.patch | 43 ------------------- gnu/packages/video.scm | 16 +++---- 3 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 gnu/packages/patches/ffmpeg-prefer-dav1d.patch diff --git a/gnu/local.mk b/gnu/local.mk index 36a417865f..8b33c23f6d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -917,7 +917,6 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spSolve.patch \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fbreader-curl-7.62.patch \ - %D%/packages/patches/ffmpeg-prefer-dav1d.patch \ %D%/packages/patches/fifengine-swig-compat.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ diff --git a/gnu/packages/patches/ffmpeg-prefer-dav1d.patch b/gnu/packages/patches/ffmpeg-prefer-dav1d.patch deleted file mode 100644 index 95e3712a7f..0000000000 --- a/gnu/packages/patches/ffmpeg-prefer-dav1d.patch +++ /dev/null @@ -1,43 +0,0 @@ -When decoding AV1 files, prefer dav1d over libaom for performance -reasons. - -Patch copied from upstream source repository: - - - -From dc0806dd25882f41f6085c8356712f95fded56c7 Mon Sep 17 00:00:00 2001 -From: James Almer -Date: Sun, 15 Sep 2019 11:29:56 -0300 -Subject: [PATCH] avcodec/allcodecs: make libdav1d the preferred AV1 decoder - -It's considerably faster than libaom in most systems. - -Reviewed-by: BBB -Signed-off-by: James Almer ---- - libavcodec/allcodecs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c -index 5130fca026..d5dfba1877 100644 ---- a/libavcodec/allcodecs.c -+++ b/libavcodec/allcodecs.c -@@ -680,7 +680,6 @@ extern AVCodec ff_pcm_mulaw_at_encoder; - extern AVCodec ff_pcm_mulaw_at_decoder; - extern AVCodec ff_qdmc_at_decoder; - extern AVCodec ff_qdm2_at_decoder; --extern AVCodec ff_libaom_av1_decoder; - extern AVCodec ff_libaom_av1_encoder; - extern AVCodec ff_libaribb24_decoder; - extern AVCodec ff_libcelt_decoder; -@@ -738,6 +737,7 @@ extern AVCodec ff_idf_decoder; - /* external libraries, that shouldn't be used by default if one of the - * above is available */ - extern AVCodec ff_h263_v4l2m2m_encoder; -+extern AVCodec ff_libaom_av1_decoder; - extern AVCodec ff_libopenh264_encoder; - extern AVCodec ff_libopenh264_decoder; - extern AVCodec ff_h264_amf_encoder; --- -2.20.1 - diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6e8bc251e8..e3d99feccd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -937,16 +937,14 @@ operate properly.") (define-public ffmpeg (package (name "ffmpeg") - (version "4.2.3") + (version "4.3") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) - ;; See - (patches (search-patches "ffmpeg-prefer-dav1d.patch")) (sha256 (base32 - "0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx")))) + "0pbrsv5v96yd8qzb9bk4kw7qk4xqpi03rsd5xfbwnjzlhijd02hx")))) (build-system gnu-build-system) (inputs `(("dav1d" ,dav1d) @@ -973,6 +971,7 @@ operate properly.") ("mesa" ,mesa) ("openal" ,openal) ("pulseaudio" ,pulseaudio) + ("rav1e" ,rav1e) ("sdl" ,sdl2) ("soxr" ,soxr) ("speex" ,speex) @@ -1054,6 +1053,7 @@ operate properly.") "--enable-libmp3lame" "--enable-libopus" "--enable-libpulse" + "--enable-librav1e" "--enable-libsoxr" "--enable-libspeex" "--enable-libtheora" @@ -1132,10 +1132,10 @@ audio/video codec library.") (arguments (substitute-keyword-arguments (package-arguments ffmpeg) ((#:configure-flags flags) - `(delete "--enable-libdav1d" (delete "--enable-libaom" - ,flags))))) - (inputs (alist-delete "dav1d" (alist-delete "libaom" - (package-inputs ffmpeg)))))) + `(delete "--enable-libdav1d" (delete "--enable-libaom" (delete "--enable-librav1e" + ,flags)))))) + (inputs (alist-delete "dav1d" (alist-delete "libaom" (alist-delete "rav1e" + (package-inputs ffmpeg))))))) (define-public ffmpeg-for-stepmania (hidden-package From eaca906219b55406cecb25715fe025148a788da4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Jun 2020 14:20:46 -0400 Subject: [PATCH 141/241] gnu: VLC: Find dav1d via FFmpeg. * gnu/packages/video.scm (vlc)[inputs]: Remove dav1d. --- gnu/packages/video.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e3d99feccd..149058a1a2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1220,10 +1220,6 @@ videoformats depend on the configuration flags of ffmpeg.") (inputs `(("alsa-lib" ,alsa-lib) ("avahi" ,avahi) - ;; XXX Try removing dav1d here and testing AV1 playback when FFmpeg 4.3 - ;; is released. - ;; - ("dav1d" ,dav1d) ("dbus" ,dbus) ("eudev" ,eudev) ("flac" ,flac) From 89528896361c5e79ba11214bd1fbfe8373ccee81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 23:09:09 +0200 Subject: [PATCH 142/241] gnu: handbrake: Update to 1.3.3. * gnu/packages/video.scm (handbrake): Update to 1.3.3. --- 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 149058a1a2..4bd2dca909 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2769,7 +2769,7 @@ supported players in addition to this package.") (define-public handbrake (package (name "handbrake") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/HandBrake/HandBrake/" @@ -2777,7 +2777,7 @@ supported players in addition to this package.") "HandBrake-" version "-source.tar.bz2")) (sha256 (base32 - "0w7jxjrccvxp7g15dv0spildg5apmqp4gwbcqmg58va2gylynvzc")) + "11bzhyp052bmng5119x74xvdj5632smx6qsk537ygda8bzckg2i1")) (modules '((guix build utils))) (snippet ;; Remove "contrib" and source not necessary for From 5b186c71176e1b7f4529b2494e5f54d98860f2af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 23:57:29 +0200 Subject: [PATCH 143/241] gnu: perl-text-csv-xs: Update to 1.43. * gnu/packages/perl.scm (perl-text-csv-xs): Update to 1.43. --- 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 4ca1b5afd4..51b4d04a13 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -9739,14 +9739,14 @@ can combine fields into a CSV string and parse a CSV string into fields.") (define-public perl-text-csv-xs (package (name "perl-text-csv-xs") - (version "1.39") + (version "1.43") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/H/HM/HMBRAND/" "Text-CSV_XS-" version ".tgz")) (sha256 - (base32 "1gcy1bxym6f7qsxivkl3c5p94r1bjhf9csy1x38a1gk8mx744kma")))) + (base32 "1frh8awr5ipry21x4403wdkbglpl707n69smksg8sf79ia75756d")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Text-CSV_XS") (synopsis "Routines for manipulating CSV files") From 12f9c50ac470de162913d624d1d840571c6229b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jun 2020 23:57:38 +0200 Subject: [PATCH 144/241] gnu: perl-yaml: Update to 1.30. * gnu/packages/perl.scm (perl-yaml): Update to 1.30. --- 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 51b4d04a13..7f0f1e71b7 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10767,14 +10767,14 @@ neither visible nor modifiable from Perl space).") (define-public perl-yaml (package (name "perl-yaml") - (version "1.29") + (version "1.30") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/T/TI/TINITA/" "YAML-" version ".tar.gz")) (sha256 - (base32 "0gl5ssvrdajlbc85cy6z873n9cwlssk5q8z97a31vyiikhw5fp4w")))) + (base32 "1kbrfksjg4k4vmx1i337m5n69m00m0m5bgsh61c15bzzrgbacc2h")))) (build-system perl-build-system) (native-inputs `(("perl-test-yaml" ,perl-test-yaml))) From be2278afab4cdb5b664e6d340be15d58582ef5b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Jun 2020 00:42:56 +0200 Subject: [PATCH 145/241] gnu: perl-getopt-long: Update to 2.51. * gnu/packages/perl.scm (perl-getopt-long): Update to 2.51. --- 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 7f0f1e71b7..be5f6e3aa0 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -4871,15 +4871,14 @@ back to a full directory scan if none of these are available.") (define-public perl-getopt-long (package (name "perl-getopt-long") - (version "2.49.1") + (version "2.51") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/J/JV/JV/" - "Getopt-Long-v" (substring version 1) ".tar.gz")) + "Getopt-Long-" version ".tar.gz")) (sha256 - (base32 - "0bw8gbhj8s5gmkqvs3m7pk9arqhgqssrby4yimh29ah9alix9ylq")))) + (base32 "0r659i6rkz8zkfgdccbn29zmd4bk9lcdc4y20ng6w2glqaa3pd10")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Getopt-Long") (synopsis "Module to handle parsing command line options") From 654c13f6c1a6346d6d5903d9abc2346f0f999862 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Jun 2020 00:43:08 +0200 Subject: [PATCH 146/241] gnu: perl-date-manip: Update to 6.82. * gnu/packages/perl.scm (perl-date-manip): Update to 6.82. --- 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 be5f6e3aa0..41c6da67d4 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2913,14 +2913,14 @@ Date::Calc.") (define-public perl-date-manip (package (name "perl-date-manip") - (version "6.78") + (version "6.82") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/S/SB/SBECK/" "Date-Manip-" version ".tar.gz")) (sha256 - (base32 "1faxj6gafrqir9hvy9r8q57s93n57b412s04qycrks7r0520hdnb")))) + (base32 "0ak72kpydwhq2z03mhdfwm3ganddzb8gawzh6crpsjvb9kwvr5ps")))) (build-system perl-build-system) (arguments ;; Tests would require tzdata for timezone information, but tzdata is in From 667e3f490a4e8afa4cbab0010fcc463bdc473cf4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Jun 2020 01:41:30 +0200 Subject: [PATCH 147/241] gnu: meshlab: Update to 2020.06. * gnu/packages/engineering.scm (meshlab): Update to 2020.06. --- 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 961174ee51..edbaa5bf63 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2623,7 +2623,7 @@ export filters.") (define-public meshlab (package (name "meshlab") - (version "2020.05") + (version "2020.06") (source (origin (method git-fetch) (uri (git-reference @@ -2632,7 +2632,7 @@ export filters.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "00sim20ka9vjwljixdj4cqd285j21mpaq05ari7nqq2w8yyglp5m")))) + (base32 "1cgx24wxh2ah5pff51rcrk6x8qcdjpkxcdak7s4cfzmxvjlshydd")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) From 85c4364c7847a6c71432974c7f29d2239f1c32e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Jun 2020 02:29:41 +0200 Subject: [PATCH 148/241] gnu: wesnoth: Update to 1.14.13. * gnu/packages/games.scm (wesnoth): Update to 1.14.13. --- 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 6601c077f6..39669ba1c9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3011,7 +3011,7 @@ falling, themeable graphics and sounds, and replays.") (define-public wesnoth (package (name "wesnoth") - (version "1.14.12") + (version "1.14.13") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" @@ -3020,7 +3020,7 @@ falling, themeable graphics and sounds, and replays.") "wesnoth-" version ".tar.bz2")) (sha256 (base32 - "027bc1363hdgahw7dvd22fvvqd132byxnljfbq6lvlr5ci01q8mk")))) + "1pmqj4rah0256qi9w394ksb9apid723i5f5agkg6x1lahb1ac91q")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no check target From f4f5adcb50aa631ee5d87cf56ffedbb912309fef Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 18 Jun 2020 00:36:41 -0400 Subject: [PATCH 149/241] gnu: linux-libre@5.7: Update to 5.7.3 * gnu/packages/linux.scm (linux-libre-5.7-version): Update to 5.7.3 (linux-libre-5.7-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 f2b35e33c5..cba6f462a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -371,10 +371,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.7-version "5.7.2") +(define-public linux-libre-5.7-version "5.7.3") (define-public linux-libre-5.7-pristine-source (let ((version linux-libre-5.7-version) - (hash (base32 "02brxm78n0kg4mh48acvjsr7mpvaqd279ycyaixaflid1s1awrb0"))) + (hash (base32 "1sgwdcyn9105lfgg25q41yj30sy9cqfdm8m4dmka8gzllxxyq407"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.7))) From c7c7e115d0cd20b0af0df90d34a93270c79d55be Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 18 Jun 2020 00:39:23 -0400 Subject: [PATCH 150/241] gnu: linux-libre: Update to 5.4.47 * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.47 (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 cba6f462a7..6e0b8b5831 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -379,10 +379,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.7))) -(define-public linux-libre-5.4-version "5.4.46") +(define-public linux-libre-5.4-version "5.4.47") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "13hvnfdcbcb9a21zizq8d90mc8maxz03zmzsj6iqsjd2y7r4y1rh"))) + (hash (base32 "0v4d86yci4lq82nb1fgf0g3j0348v6q6m77czpm4b3cs7lwrs2wp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) From 620796e66bb828ca22b5d4932275bc36a7b4706a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Jun 2020 01:49:47 -0400 Subject: [PATCH 151/241] gnu: lib2geom: Fix tests on aarch64, i686-linux architectures. Fixes . This change also removes obsolete patches. * gnu/packages/patches/lib2geom-fix-tests.patch: New file. * gnu/packages/patches/lib2geom-link-tests-against-glib.patch: Delete file. * gnu/packages/patches/lib2geom-use-system-googletest.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/graphics.scm (lib2geom)[origin]: Use new patch. --- gnu/local.mk | 3 +- gnu/packages/graphics.scm | 8 +- gnu/packages/patches/lib2geom-fix-tests.patch | 172 ++++++++++++++++++ .../lib2geom-link-tests-against-glib.patch | 34 ---- .../lib2geom-use-system-googletest.patch | 94 ---------- 5 files changed, 178 insertions(+), 133 deletions(-) create mode 100644 gnu/packages/patches/lib2geom-fix-tests.patch delete mode 100644 gnu/packages/patches/lib2geom-link-tests-against-glib.patch delete mode 100644 gnu/packages/patches/lib2geom-use-system-googletest.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8b33c23f6d..fd3cc88af5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1161,8 +1161,7 @@ dist_patch_DATA = \ %D%/packages/patches/leela-zero-gtest.patch \ %D%/packages/patches/less-hurd-path-max.patch \ %D%/packages/patches/lib2geom-enable-assertions.patch \ - %D%/packages/patches/lib2geom-link-tests-against-glib.patch \ - %D%/packages/patches/lib2geom-use-system-googletest.patch \ + %D%/packages/patches/lib2geom-fix-tests.patch \ %D%/packages/patches/liba52-enable-pic.patch \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 44d78c036b..0d768b8a0e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -405,9 +405,11 @@ exception-handling library.") (base32 "195rs0kdbs8w62irha1nwy83bccz04wglmk578qrj1mky7fc4rjv")) (patches - ;; Patch submitted to upstream (see: - ;; https://gitlab.com/inkscape/lib2geom/merge_requests/17). - (search-patches "lib2geom-enable-assertions.patch")) + ;; Patches submitted to upstream (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/17, + ;; https://gitlab.com/inkscape/lib2geom/-/merge_requests/32). + (search-patches "lib2geom-enable-assertions.patch" + "lib2geom-fix-tests.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/lib2geom-fix-tests.patch b/gnu/packages/patches/lib2geom-fix-tests.patch new file mode 100644 index 0000000000..9118658e49 --- /dev/null +++ b/gnu/packages/patches/lib2geom-fix-tests.patch @@ -0,0 +1,172 @@ +From 488edbf84e918e0353e7a8f438abbf6eeca3767e Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Wed, 17 Jun 2020 23:20:53 -0400 +Subject: [PATCH] tests: Fix tests on non-x86_64 platforms. + +On platform other than x86_64 such as aarch64-linux or i686-linux, +some double comparison would fail. + +See . + +* tests/bezier-test.cpp: (Casteljau): Replace EXPECT_EQ by +EXPECT_near. +(Subdivide): Replace EXPECT_EQ by EXPECT_DOUBLE_EQ. +(Portion): Replace EXPECT_EQ by EXPECT_near. +* tests/ellipse-test.cpp (BezierIntersection): Lower error tolerance +from 6e-13 to 6e-12. +* tests/line-test.cpp (Reflection): Replace EXPECT_FLOAT_EQ BY +EXPECT_near. +(Coefficients): Skip test. +* tests/parallelogram-test.cpp (area): Replace EXPECT_EQ by +EXPECT_DOUBLE_EQ. +--- + tests/bezier-test.cpp | 31 +++++++++++++++++-------------- + tests/ellipse-test.cpp | 2 +- + tests/line-test.cpp | 11 +++++++---- + tests/parallelogram-test.cpp | 8 ++++---- + 4 files changed, 29 insertions(+), 23 deletions(-) + +diff --git a/tests/bezier-test.cpp b/tests/bezier-test.cpp +index 4054a65..46209f4 100644 +--- a/tests/bezier-test.cpp ++++ b/tests/bezier-test.cpp +@@ -152,11 +152,13 @@ TEST_F(BezierTest, Casteljau) { + EXPECT_vector_equal(right2, right); + + double vnone = casteljau_subdivision(t, &wiggle[0], NULL, NULL, wiggle.order()); +- EXPECT_EQ(vnone, vok); ++ EXPECT_near(vnone, vok, 1e-12); + } + } + + TEST_F(BezierTest, Portion) { ++ constexpr Coord eps{1e-12}; ++ + for (unsigned i = 0; i < 10000; ++i) { + double from = g_random_double_range(0, 1); + double to = g_random_double_range(0, 1); +@@ -165,8 +167,8 @@ TEST_F(BezierTest, Portion) { + Bezier result = portion(input, from, to); + + // the endpoints must correspond exactly +- EXPECT_EQ(result.at0(), input.valueAt(from)); +- EXPECT_EQ(result.at1(), input.valueAt(to)); ++ EXPECT_near(result.at0(), input.valueAt(from), eps); ++ EXPECT_near(result.at1(), input.valueAt(to), eps); + } + } + } +@@ -181,16 +183,16 @@ TEST_F(BezierTest, Subdivide) { + + // the endpoints must correspond exactly + // moreover, the subdivision point must be exactly equal to valueAt(t) +- EXPECT_EQ(result.first.at0(), input.at0()); +- EXPECT_EQ(result.first.at1(), result.second.at0()); +- EXPECT_EQ(result.second.at0(), input.valueAt(t)); +- EXPECT_EQ(result.second.at1(), input.at1()); ++ EXPECT_DOUBLE_EQ(result.first.at0(), input.at0()); ++ EXPECT_DOUBLE_EQ(result.first.at1(), result.second.at0()); ++ EXPECT_DOUBLE_EQ(result.second.at0(), input.valueAt(t)); ++ EXPECT_DOUBLE_EQ(result.second.at1(), input.at1()); + + // ditto for valueAt +- EXPECT_EQ(result.first.valueAt(0), input.valueAt(0)); +- EXPECT_EQ(result.first.valueAt(1), result.second.valueAt(0)); +- EXPECT_EQ(result.second.valueAt(0), input.valueAt(t)); +- EXPECT_EQ(result.second.valueAt(1), input.valueAt(1)); ++ EXPECT_DOUBLE_EQ(result.first.valueAt(0), input.valueAt(0)); ++ EXPECT_DOUBLE_EQ(result.first.valueAt(1), result.second.valueAt(0)); ++ EXPECT_DOUBLE_EQ(result.second.valueAt(0), input.valueAt(t)); ++ EXPECT_DOUBLE_EQ(result.second.valueAt(1), input.valueAt(1)); + + if (result.first.at1() != result.second.at0()) { + errors.push_back(std::pair(input, t)); +@@ -271,9 +273,10 @@ TEST_F(BezierTest, Deflate) { + EXPECT_FLOAT_EQ(0, b.at0()); + b = b.deflate(); + const double rootposition = (0.5-0.25) / (1-0.25); +- EXPECT_FLOAT_EQ(0, b.valueAt(rootposition)); ++ constexpr Coord eps{1e-12}; ++ EXPECT_near(0.0, b.valueAt(rootposition), eps); + b = b.subdivide(rootposition).second; +- EXPECT_FLOAT_EQ(0, b.at0()); ++ EXPECT_near(0.0, b.at0(), eps); + } + + TEST_F(BezierTest, Roots) { +@@ -364,7 +367,7 @@ TEST_F(BezierTest, Operators) { + for(int i = 0; i <= 16; i++) { + double t = i/16.0; + double b = B.valueAt(t); +- EXPECT_FLOAT_EQ(b*b, product.valueAt(t)); ++ EXPECT_near(b*b, product.valueAt(t), 1e-12); + } + } + } +diff --git a/tests/ellipse-test.cpp b/tests/ellipse-test.cpp +index 561c285..d6e65d8 100644 +--- a/tests/ellipse-test.cpp ++++ b/tests/ellipse-test.cpp +@@ -199,7 +199,7 @@ TEST(EllipseTest, BezierIntersection) { + std::vector xs = e.intersect(b); + + EXPECT_EQ(xs.size(), 2ul); +- EXPECT_intersections_valid(e, b, xs, 6e-13); ++ EXPECT_intersections_valid(e, b, xs, 6e-12); + } + + TEST(EllipseTest, Coefficients) { +diff --git a/tests/line-test.cpp b/tests/line-test.cpp +index 99546dd..2399130 100644 +--- a/tests/line-test.cpp ++++ b/tests/line-test.cpp +@@ -91,10 +91,12 @@ TEST(LineTest, Reflection) { + + Point testra = pa * reflecta; + Point testrb = pb * reflectb; +- EXPECT_FLOAT_EQ(testra[X], ra[X]); +- EXPECT_FLOAT_EQ(testra[Y], ra[Y]); +- EXPECT_FLOAT_EQ(testrb[X], rb[X]); +- EXPECT_FLOAT_EQ(testrb[Y], rb[Y]); ++ ++ constexpr Coord eps{1e-12}; ++ EXPECT_near(testra[X], ra[X], eps); ++ EXPECT_near(testra[Y], ra[Y], eps); ++ EXPECT_near(testrb[X], rb[X], eps); ++ EXPECT_near(testrb[Y], rb[Y], eps); + } + + TEST(LineTest, RotationToZero) { +@@ -115,6 +117,7 @@ TEST(LineTest, RotationToZero) { + } + + TEST(LineTest, Coefficients) { ++ GTEST_SKIP() << "This test fails on i686-linux and aarch64-linux"; + std::vector lines; + lines.push_back(Line(Point(1e9,1e9), Point(1,1))); + //the case below will never work without normalizing the line +diff --git a/tests/parallelogram-test.cpp b/tests/parallelogram-test.cpp +index 8109ead..70ccea1 100644 +--- a/tests/parallelogram-test.cpp ++++ b/tests/parallelogram-test.cpp +@@ -106,13 +106,13 @@ TEST(ParallelogramTest, area) + { + Rect r(2, 4, 7, 8); + Parallelogram p(r); +- EXPECT_EQ(p.area(), r.area()); ++ EXPECT_DOUBLE_EQ(p.area(), r.area()); + p *= Rotate(M_PI / 4.0); // 45° +- EXPECT_EQ(p.area(), r.area()); ++ EXPECT_DOUBLE_EQ(p.area(), r.area()); + p *= HShear(2); +- EXPECT_EQ(p.area(), r.area()); ++ EXPECT_DOUBLE_EQ(p.area(), r.area()); + p *= Scale(2); +- EXPECT_EQ(p.area(), r.area() * 4); ++ EXPECT_DOUBLE_EQ(p.area(), r.area() * 4); + } + + class ParallelogramTest +-- +2.26.2 + diff --git a/gnu/packages/patches/lib2geom-link-tests-against-glib.patch b/gnu/packages/patches/lib2geom-link-tests-against-glib.patch deleted file mode 100644 index 2b4f7ca6bf..0000000000 --- a/gnu/packages/patches/lib2geom-link-tests-against-glib.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f95925afef451755fc1449e57fbfdc2e7277f4b4 Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Sat, 11 Jan 2020 00:44:55 -0500 -Subject: [PATCH 1/3] tests: Link against GLib. - -This resolves an error about not finding when linking the -tests that make use of GLib. - -* src/tests/CMakeLists.txt[2GEOM_GTESTS_SRC]: Add the glib library to -the link target libraries. ---- - src/tests/CMakeLists.txt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt -index 5ddf7f9c..626cfd87 100644 ---- a/src/tests/CMakeLists.txt -+++ b/src/tests/CMakeLists.txt -@@ -32,8 +32,10 @@ sbasis-test - - foreach(source ${2GEOM_GTESTS_SRC}) - add_executable(${source} ${source}.cpp) -- target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}) -- target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) -+ target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} -+ ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) -+ target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} -+ ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) - add_test(NAME ${source} COMMAND ${source}) - endforeach() - --- -2.24.1 - diff --git a/gnu/packages/patches/lib2geom-use-system-googletest.patch b/gnu/packages/patches/lib2geom-use-system-googletest.patch deleted file mode 100644 index 16cce1799f..0000000000 --- a/gnu/packages/patches/lib2geom-use-system-googletest.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 6693b9c8ff1ae1ec02c9002c0a8f5f416f0c88f0 Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Sun, 12 Jan 2020 23:23:33 -0500 -Subject: [PATCH 3/3] build: Prefer googletest from the system. - -Fixes issue #4. - -The build system now look for a system installed googletest or falls -back to the bundled copy of googletest otherwise. - -* CMakeLists.txt: Add call to find_package(GTest). -(include_directories): Remove "src/googletest/googletest/include" from -arg. -* src/CMakeLists.txt[NOT GTEST_FOUND]: Define the gtest and gtest_main -libraries when GTEST_FOUND is false. Globally include the googletest -headers here. Define aliases for the gtest and gtest_main libraries -that match those defined by the FindGTest module. -* src/tests/CMakeLists.txt: Replace references to gtest_main and gtest -by GTest::Main and GTest::GTest, respectively. ---- - CMakeLists.txt | 3 ++- - src/CMakeLists.txt | 15 +++++++++++---- - src/tests/CMakeLists.txt | 6 +++--- - 3 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bfeb8f03..96fbd58c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,13 +25,14 @@ find_package(DoubleConversion REQUIRED) - find_package(PkgConfig REQUIRED) - find_package(Cython) - find_package(Threads) -+find_package(GTest) - pkg_check_modules(GTK3 gtk+-3.0) - pkg_check_modules(GLIB glib-2.0) - pkg_check_modules(CAIRO cairo) - pkg_check_modules(GSL gsl) - - # Add global include and link directories --include_directories(src src/googletest/googletest/include ${CMAKE_CURRENT_BINARY_DIR}) -+include_directories(src ${CMAKE_CURRENT_BINARY_DIR}) - link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/2geom) - - check_cxx_source_compiles("#include \nint main() { double a=0.5,b=0.5,c=0.5; sincos(a, &b, &c); return 0; }" HAVE_SINCOS) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index eefb3ac5..941dc4c7 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,7 +1,14 @@ --add_library(gtest SHARED googletest/googletest/src/gtest-all.cc) --target_include_directories(gtest PRIVATE googletest/googletest) --target_link_libraries(gtest Threads::Threads) --add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc) -+if(NOT GTEST_FOUND) -+ message("No system googletest library: using bundled copy.") -+ add_library(gtest SHARED googletest/googletest/src/gtest-all.cc) -+ add_library(gtest_main STATIC googletest/googletest/src/gtest_main.cc) -+ target_include_directories(gtest PRIVATE googletest/googletest) -+ target_link_libraries(gtest Threads::Threads) -+ include_directories(SYSTEM googletest/googletest/include) -+ # Aliases to share the same nomenclature with FindGTest. -+ add_library(GTest::GTest ALIAS gtest) -+ add_library(GTest::Main ALIAS gtest_main) -+endif() - - add_subdirectory(2geom) - add_subdirectory(tests) -diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt -index 626cfd87..3538f8cf 100644 ---- a/src/tests/CMakeLists.txt -+++ b/src/tests/CMakeLists.txt -@@ -34,15 +34,15 @@ foreach(source ${2GEOM_GTESTS_SRC}) - add_executable(${source} ${source}.cpp) - target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} - ${GTK3_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) -- target_link_libraries(${source} 2geom gtest_main gtest ${GSL_LIBRARIES} -- ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) -+ target_link_libraries(${source} 2geom GTest::Main GTest::GTest -+ ${GSL_LIBRARIES} ${GTK3_LIBRARIES} ${GLIB_LIBRARIES}) - add_test(NAME ${source} COMMAND ${source}) - endforeach() - - foreach(source ${2GEOM_TESTS_SRC}) - add_executable(${source} ${source}.cpp) - target_include_directories(${source} PRIVATE ${GSL_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}) -- target_link_libraries(${source} 2geom gtest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) -+ target_link_libraries(${source} 2geom GTest::GTest ${GSL_LIBRARIES} ${GTK3_LIBRARIES}) - add_test(NAME ${source} COMMAND ${source}) - endforeach(source) - --- -2.24.1 - From 416439263cb295260ba38ab1cce5b4468ae5691e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 15 Jun 2020 04:12:10 -0400 Subject: [PATCH 152/241] gnu: icecat: Remove the bundled Onion Browser Button [security]. Fixes . The Onion Browser Button (tortm-browser-button@jeremybenthum) version 0.1.8, available from addons.mozilla.org and bundled with IceCat, malfunctions with both IceCat 68.9 and Firefox ESR 68.9. It tells the user that it's connected to Tor, but fails to route traffic through it. The same happens on Debian 9 with its "firefox-esr" package. Remove this extension from IceCat, pending further investigation. * gnu/packages/gnuzilla.scm (icecat-source): Remove the "data/extensions/ tortm-browser-button@jeremybenthum" directory before running makeicecat. --- gnu/packages/gnuzilla.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0a8edcb1e4..3bffe12577 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -648,6 +648,12 @@ from forcing GEXP-PROMISE." "-p1" "--input" #+makeicecat-patch) (invoke "patch" "--force" "--no-backup-if-mismatch" "-p1" "--input" #+gnuzilla-fixes-patch) + + ;; Remove the bundled tortm-browser-button extension, + ;; which doesn't seem to be working properly. + (delete-file-recursively + "data/extensions/tortm-browser-button@jeremybenthum") + (patch-shebang "makeicecat") (substitute* "makeicecat" (("^FFMAJOR=(.*)" all ffmajor) From c00564192a9924ab2218c243342963aba89d67d1 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Wed, 17 Jun 2020 07:29:30 +0200 Subject: [PATCH 153/241] gnu: coreutils: Update broken tests for the Hurd. * gnu/packages/base.scm (coreutils)[arguments]: When compiling for the Hurd, remove hanging "timeout-group" test. Remove tests "shred-passes", "l-chunk" and "stats" from XFAIL_TESTS, they pass now. --- gnu/packages/base.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c66ea5a187..50e426fadf 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -342,10 +342,7 @@ used to apply commands with arbitrarily long arguments.") (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl" " tests/misc/kill.sh" " tests/misc/nice.sh" - " tests/misc/shred-passes.sh" " tests/split/fail.sh" - " tests/split/l-chunk.sh" - " tests/dd/stats.sh" " test-fdutimensat" " test-futimens" " test-linkat" @@ -365,7 +362,15 @@ used to apply commands with arbitrarily long arguments.") (("/bin/sh") (which "sh"))) (substitute* (find-files "tests" "\\.sh$") (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t))))) + #t)) + ,@(if (hurd-target?) + `((add-after 'unpack 'remove-tests + (lambda _ + (substitute* "Makefile.in" + ;; this test hangs + (("^ *tests/misc/timeout-group.sh.*") "")) + #t))) + '())))) (synopsis "Core GNU utilities (file, text, shell)") (description "GNU Coreutils package includes all of the basic command-line tools that From 2df4ef03f03843e4cca5f8bda3a840e5bba54bac Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 7 May 2020 18:25:26 +0200 Subject: [PATCH 154/241] gnu: guix: Update to 1.1.0-12.c00564192a. * gnu/packages/package-management.scm (guix): Update to 1.1.0-12.c00564192a. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0e4293629e..2cd7886011 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "204623bc68a7ba0445953605208ec1a1131d85bc") - (revision 11)) + (commit "c00564192a9924ab2218c243342963aba89d67d1") + (revision 12)) (package (name "guix") @@ -135,7 +135,7 @@ (commit commit))) (sha256 (base32 - "0fx1ncs77n19r6mby0pxfdg3b54qncyawaghfx6nhl3c81c6fd1q")) + "008ywpdkc5f2jh25x6rr9glzvq4a6qih7v73w5dbxscpddx5c5g2")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments From 3cd74035840cfe977b7c20e537c39738fa98f0ea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Jun 2020 10:35:14 +0300 Subject: [PATCH 155/241] gnu: mutt: Update to 1.14.3. * gnu/packages/mail.scm (mutt): Update to 1.14.3. --- 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 e89a6f330f..9c9ccf9785 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -421,7 +421,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (list @@ -431,7 +431,7 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2")) + "0wd4cv1c9hqymvml979g607nh3xxmlyx1ifc4r4qf39v6grnsmdi")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs From f817a0c095f77ccd30a2b9e776bee9a92b1c45e6 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 18 Jun 2020 09:32:45 +0200 Subject: [PATCH 156/241] system: hurd: Add "/bin/sh" and "/usr/bin/env". * gnu/system/hurd.scm (%base-services/hurd): Add extra-special-files "/bin/sh" and "/usr/bin/env". --- gnu/system/hurd.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 2205def577..43d98cc8c2 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -81,7 +81,10 @@ (service guix-service-type (guix-configuration (extra-options '("--disable-chroot" - "--disable-deduplication")))))) + "--disable-deduplication")))) + (service special-files-service-type + `(("/bin/sh" ,(file-append bash "/bin/sh")) + ("/usr/bin/env" ,(file-append coreutils "/bin/env")))))) (define %hurd-default-operating-system (operating-system From e418c3d076ec301a2deda42568035d75f5ed174d Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 18 Jun 2020 09:37:06 +0200 Subject: [PATCH 157/241] gnu: privoxy: Fix daemon with default configuration. * gnu/packages/tor.scm (privoxy)[arguments]: Add --localstatedir=/var to configure flags. Patch default configuration to disable logging and thus allowing non-root users to use it. Signed-off-by: Pierre Neidhardt --- gnu/packages/tor.scm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 2f2623b0e6..19ab5cf374 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -141,8 +142,28 @@ rejects UDP traffic from the application you're using.") ;; $out/etc/privoxy. #:configure-flags (list (string-append "--sysconfdir=" (assoc-ref %outputs "out") - "/etc/privoxy")) - #:tests? #f)) + "/etc/privoxy") + "--localstatedir=/var") + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-default-logging + (lambda _ + (with-fluids ((%default-port-encoding "ISO-8859-1")) + ;; Do not create /var/run nor /var/log/privoxy/logfile. + (substitute* "GNUmakefile.in" + (("(logfile \\|\\| exit )1" _ match) + (string-append match "0")) + (("(\\$\\(DESTDIR\\)\\$\\(SHARE_DEST\\)) \\\\" _ match) + match) + ((".*\\$\\(LOG_DEST\\) \\$\\(DESTDIR\\)\\$\\(PID_DEST\\).*") + "")) + ;; Disable logging in the default configuration to allow for + ;; non-root users using it as is. + (substitute* "config" + (("^logdir") "#logdir") + (("^logfile") "#logfile"))) + #t))))) (inputs `(("w3m" ,w3m) ("pcre" ,pcre) From 290c3166212d1c7150ac64ea6d6f6ad506c4d29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 17 Jun 2020 22:22:12 +0200 Subject: [PATCH 158/241] repl: Fix typo that would lead ~/.guile to be used when running scripts. This is a followup to c924e541390f9595d819edc33c19d979917c15ec. * guix/scripts/repl.scm (guix-repl)[opts]: Set 'ignore-dot-guile?', with question mark. --- guix/scripts/repl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index e2679f4301..0ea9c3655c 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -144,7 +144,7 @@ call THUNK." (leave (G_ "~A: unrecognized option~%") name)) (lambda (arg result) (append `((script . ,arg) - (ignore-dot-guile . #t)) + (ignore-dot-guile? . #t)) result)) %default-options)) From f9a0fc9dbbfcdf28c77fd9199e3f1a73d901199c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Jun 2020 11:27:06 +0200 Subject: [PATCH 159/241] build-system/gnu: Fix 'install' phase of 'gnu-dist'. * guix/build/gnu-dist.scm (install-dist): Fix 2nd argument to 'for-each'. --- guix/build/gnu-dist.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index ade3b42cab..fce1cd0759 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -40,13 +40,10 @@ (apply invoke "make" dist-target make-flags)) (define* (install-dist #:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (meta (string-append out "/nix-support")) ; Hydra meta-data - (tarballs (find-files "." "\\.tar\\."))) - (mkdir out) + (let ((out (assoc-ref outputs "out"))) (for-each (lambda (tarball) - (copy-file tarball (string-append out "/" tarball))) - out) + (install-file tarball out)) + (find-files "." "\\.tar\\.")) #t)) (define %dist-phases From 97a46055ca9f72986740c26a5406b5138176ca61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Jun 2020 11:51:44 +0200 Subject: [PATCH 160/241] database: 'register-items' takes an open database. * guix/store/database.scm (store-database-directory) (store-database-file): New procedures. (call-with-database): Add call to 'mkdir-p'. (register-items): Add 'db' parameter and remove #:state-directory and #:schema. (register-path): Use 'store-database-file' and 'with-database', and parameterize SQL-SCHEMA. * gnu/build/image.scm (register-closure): Likewise. * gnu/build/vm.scm (register-closure): Likewise. * guix/scripts/pack.scm (store-database)[build]: Likewise. --- gnu/build/image.scm | 13 +++--- gnu/build/vm.scm | 13 +++--- guix/scripts/pack.scm | 15 ++++--- guix/store/database.scm | 98 +++++++++++++++++++++++------------------ 4 files changed, 77 insertions(+), 62 deletions(-) diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 893b846976..e8df5866a7 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -137,12 +137,13 @@ produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is true, reset timestamps on store files and, if DEDUPLICATE? is true, deduplicates files common to CLOSURE and the rest of PREFIX." (let ((items (call-with-input-file closure read-reference-graph))) - (register-items items - #:prefix prefix - #:deduplicate? deduplicate? - #:reset-timestamps? reset-timestamps? - #:registration-time %epoch - #:schema schema))) + (parameterize ((sql-schema schema)) + (with-database (store-database-file #:prefix prefix) db + (register-items db items + #:prefix prefix + #:deduplicate? deduplicate? + #:reset-timestamps? reset-timestamps? + #:registration-time %epoch))))) (define* (initialize-efi-partition root #:key diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 0f0ceae18f..287d099f79 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -223,12 +223,13 @@ produced by #:references-graphs.. As a side effect, if RESET-TIMESTAMPS? is true, reset timestamps on store files and, if DEDUPLICATE? is true, deduplicates files common to CLOSURE and the rest of PREFIX." (let ((items (call-with-input-file closure read-reference-graph))) - (register-items items - #:prefix prefix - #:deduplicate? deduplicate? - #:reset-timestamps? reset-timestamps? - #:registration-time %epoch - #:schema schema))) + (parameterize ((sql-schema schema)) + (with-database (store-database-file #:prefix prefix) db + (register-items db items + #:prefix prefix + #:deduplicate? deduplicate? + #:reset-timestamps? reset-timestamps? + #:registration-time %epoch))))) ;;; diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 55fb3e8df3..e0f9cc1a12 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -146,13 +146,16 @@ dependencies are registered." (define (read-closure closure) (call-with-input-file closure read-reference-graph)) + (define db-file + (store-database-file #:state-directory #$output)) + + (sql-schema #$schema) (let ((items (append-map read-closure '#$labels))) - (register-items items - #:state-directory #$output - #:deduplicate? #f - #:reset-timestamps? #f - #:registration-time %epoch - #:schema #$schema)))))) + (with-database db-file db + (register-items db items + #:deduplicate? #f + #:reset-timestamps? #f + #:registration-time %epoch))))))) (computed-file "store-database" build #:options `(#:references-graphs ,(zip labels items)))) diff --git a/guix/store/database.scm b/guix/store/database.scm index ad9ca68efe..a38e4d7e52 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -37,6 +37,7 @@ #:use-module (system foreign) #:export (sql-schema %default-database-file + store-database-file with-database path-id sqlite-register @@ -65,6 +66,28 @@ (unless (zero? ret) ((@@ (sqlite3) sqlite-error) db "sqlite-exec" ret)))))) +(define* (store-database-directory #:key prefix state-directory) + "Return the store database directory, taking PREFIX and STATE-DIRECTORY into +account when provided." + ;; Priority for options: first what is given, then environment variables, + ;; then defaults. %state-directory, %store-directory, and + ;; %store-database-directory already handle the "environment variables / + ;; defaults" question, so we only need to choose between what is given and + ;; those. + (cond (state-directory + (string-append state-directory "/db")) + (prefix + (string-append prefix %localstatedir "/guix/db")) + (else + %store-database-directory))) + +(define* (store-database-file #:key prefix state-directory) + "Return the store database file name, taking PREFIX and STATE-DIRECTORY into +account when provided." + (string-append (store-database-directory #:prefix prefix + #:state-directory state-directory) + "/db.sqlite")) + (define (initialize-database db) "Initializing DB, an empty database, by creating all the tables and indexes as specified by SQL-SCHEMA." @@ -77,7 +100,10 @@ as specified by SQL-SCHEMA." (define (call-with-database file proc) "Pass PROC a database record corresponding to FILE. If FILE doesn't exist, create it and initialize it as a new database." - (let ((new? (not (file-exists? file))) + (let ((new? (and (not (file-exists? file)) + (begin + (mkdir-p (dirname file)) + #t))) (db (sqlite-open file))) ;; Turn DB in "write-ahead log" mode, which should avoid SQLITE_LOCKED ;; errors when we have several readers: . @@ -361,45 +387,32 @@ Return #t on success. Use with care as it directly modifies the store! This is primarily meant to be used internally by the daemon's build hook." - (register-items (list (store-info path deriver references)) - #:prefix prefix #:state-directory state-directory - #:deduplicate? deduplicate? - #:reset-timestamps? reset-timestamps? - #:schema schema - #:log-port (%make-void-port "w"))) + (define db-file + (store-database-file #:prefix prefix + #:state-directory state-directory)) + + (parameterize ((sql-schema schema)) + (with-database db-file db + (register-items db (list (store-info path deriver references)) + #:prefix prefix + #:deduplicate? deduplicate? + #:reset-timestamps? reset-timestamps? + #:log-port (%make-void-port "w"))))) (define %epoch ;; When it all began. (make-time time-utc 0 1)) -(define* (register-items items - #:key prefix state-directory +(define* (register-items db items + #:key prefix (deduplicate? #t) (reset-timestamps? #t) registration-time - (schema (sql-schema)) (log-port (current-error-port))) "Register all of ITEMS, a list of records as returned by -'read-reference-graph', in the database under PREFIX/STATE-DIRECTORY. ITEMS -must be in topological order (with leaves first.) If the database is -initially empty, apply SCHEMA to initialize it. REGISTRATION-TIME must be the -registration time to be recorded in the database; #f means \"now\". -Write a progress report to LOG-PORT." - - ;; Priority for options: first what is given, then environment variables, - ;; then defaults. %state-directory, %store-directory, and - ;; %store-database-directory already handle the "environment variables / - ;; defaults" question, so we only need to choose between what is given and - ;; those. - - (define db-dir - (cond (state-directory - (string-append state-directory "/db")) - (prefix - (string-append prefix %localstatedir "/guix/db")) - (else - %store-database-directory))) - +'read-reference-graph', in DB. ITEMS must be in topological order (with +leaves first.) REGISTRATION-TIME must be the registration time to be recorded +in the database; #f means \"now\". Write a progress report to LOG-PORT." (define store-dir (if prefix (string-append prefix %storedir) @@ -438,17 +451,14 @@ Write a progress report to LOG-PORT." (when deduplicate? (deduplicate real-file-name hash #:store store-dir))))) - (mkdir-p db-dir) - (parameterize ((sql-schema schema)) - (with-database (string-append db-dir "/db.sqlite") db - (call-with-retrying-transaction db - (lambda () - (let* ((prefix (format #f "registering ~a items" (length items))) - (progress (progress-reporter/bar (length items) - prefix log-port))) - (call-with-progress-reporter progress - (lambda (report) - (for-each (lambda (item) - (register db item) - (report)) - items))))))))) + (call-with-retrying-transaction db + (lambda () + (let* ((prefix (format #f "registering ~a items" (length items))) + (progress (progress-reporter/bar (length items) + prefix log-port))) + (call-with-progress-reporter progress + (lambda (report) + (for-each (lambda (item) + (register db item) + (report)) + items))))))) From d7fb5538013710288e91657499f0e04207115776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Jun 2020 11:58:41 +0200 Subject: [PATCH 161/241] nar: Avoid opening the database an additional time. * guix/nar.scm (finalize-store-file): Call 'register-items' and pass it DB. This avoids opening the database a second time and hopefully reduces contention on 'db.sqlite-shm'. --- guix/nar.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/nar.scm b/guix/nar.scm index eff4becbce..16dfe28766 100644 --- a/guix/nar.scm +++ b/guix/nar.scm @@ -27,6 +27,7 @@ ;; (guix store) since this is "daemon-side" code. #:use-module (guix store) #:use-module (guix store database) + #:use-module ((guix build store-copy) #:select (store-info)) #:use-module (guix ui) ; for '_' #:use-module (gcrypt hash) @@ -115,9 +116,8 @@ held." ;; Register TARGET. As a side effect, it resets the timestamps of all ;; its files, recursively, and runs a deduplication pass. - (register-path target - #:references references - #:deriver deriver)) + (register-items db + (list (store-info target deriver references)))) (when lock? (delete-file (string-append target ".lock")) From 3b72618f6ed2e145d07b9bce7bd9b06d0c95c00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Jun 2020 14:26:48 +0200 Subject: [PATCH 162/241] nar: Use (guix i18n). * guix/nar.scm: Use (guix i18n) instead of (guix ui). --- guix/nar.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/nar.scm b/guix/nar.scm index 16dfe28766..6bb2ea5b96 100644 --- a/guix/nar.scm +++ b/guix/nar.scm @@ -29,7 +29,7 @@ #:use-module (guix store database) #:use-module ((guix build store-copy) #:select (store-info)) - #:use-module (guix ui) ; for '_' + #:use-module (guix i18n) #:use-module (gcrypt hash) #:use-module (guix pki) #:use-module (gcrypt pk-crypto) From fea072d7275958a67fe24ab7bd9b661b2f3f8972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Jun 2020 14:33:55 +0200 Subject: [PATCH 163/241] profiles: Reindent 'linux-module-database'. * guix/profiles.scm (linux-module-database): Reindent. --- guix/profiles.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 9df63c97e9..f7af01b9b2 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1202,17 +1202,18 @@ for both major versions of GTK+." and creates the dependency graph of all these kernel modules. This is meant to be used as a profile hook." - (define kmod ; lazy reference + (define kmod ; lazy reference (module-ref (resolve-interface '(gnu packages linux)) 'kmod)) (define build - (with-imported-modules - (source-module-closure '((guix build utils) + (with-imported-modules (source-module-closure + '((guix build utils) (gnu build linux-modules))) #~(begin (use-modules (ice-9 ftw) (ice-9 match) - (srfi srfi-1) ; append-map + (srfi srfi-1) ; append-map (gnu build linux-modules)) + (let* ((inputs '#$(manifest-inputs manifest)) (module-directories (map (lambda (directory) @@ -1220,20 +1221,20 @@ This is meant to be used as a profile hook." inputs)) (directory-entries (lambda (directory) - (scandir directory (lambda (basename) - (not - (string-prefix? "." basename)))))) + (scandir directory + (lambda (basename) + (not (string-prefix? "." basename)))))) ;; Note: Should usually result in one entry. (versions (delete-duplicates (append-map directory-entries module-directories)))) - (match versions - ((version) - (let ((old-path (getenv "PATH"))) - (setenv "PATH" #+(file-append kmod "/bin")) - (make-linux-module-directory inputs version #$output) - (setenv "PATH" old-path))) - (_ (error "Specified Linux kernel and Linux kernel modules + (match versions + ((version) + (let ((old-path (getenv "PATH"))) + (setenv "PATH" #+(file-append kmod "/bin")) + (make-linux-module-directory inputs version #$output) + (setenv "PATH" old-path))) + (_ (error "Specified Linux kernel and Linux kernel modules are not all of the same version"))))))) (gexp->derivation "linux-module-database" build #:local-build? #t From 05f79da93fb4fd5216feb41510bf0a41f8eedf5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Jun 2020 14:35:46 +0200 Subject: [PATCH 164/241] profiles: 'linux-module-database' hooks gracefully handles module-less kernels. Fixes . * guix/profiles.scm (linux-module-database)[build]: Arrange so 'directory-entries' always returns a list. Add 'match' clause for the empty list. Co-authored-by: Ivan Kozlov --- guix/profiles.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index f7af01b9b2..f34f73e17e 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1221,9 +1221,10 @@ This is meant to be used as a profile hook." inputs)) (directory-entries (lambda (directory) - (scandir directory - (lambda (basename) - (not (string-prefix? "." basename)))))) + (or (scandir directory + (lambda (basename) + (not (string-prefix? "." basename)))) + '()))) ;; Note: Should usually result in one entry. (versions (delete-duplicates (append-map directory-entries @@ -1234,6 +1235,10 @@ This is meant to be used as a profile hook." (setenv "PATH" #+(file-append kmod "/bin")) (make-linux-module-directory inputs version #$output) (setenv "PATH" old-path))) + (() + ;; Nothing here, maybe because this is a kernel with + ;; CONFIG_MODULES=n. + (mkdir #$output)) (_ (error "Specified Linux kernel and Linux kernel modules are not all of the same version"))))))) (gexp->derivation "linux-module-database" build From 7568416acb7d54ef85d5a3011f693abd6e23f850 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 17 Jun 2020 13:39:50 +0200 Subject: [PATCH 165/241] doc: Delete description of a nonexistent option. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (Invoking guix pull): Delete a paragraph about the --verbose option, which was removed in 1edcfda81ba5c20ca715473d45315662c60dd81e. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6ce8725ece..2268e159a2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3948,9 +3948,6 @@ Make sure you understand its security implications before using Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host. -@item --verbose -Produce verbose output, writing build logs to the standard error output. - @item --bootstrap Use the bootstrap Guile to build the latest Guix. This option is only useful to Guix developers. From 69288a849a4724b90dba8ae2482c39854cb719a2 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Mon, 15 Jun 2020 15:11:39 -0500 Subject: [PATCH 166/241] gnu: go-ipfs: Update to 0.5.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ipfs.scm (go-ipfs): Update to 0.5.1 Signed-off-by: Ludovic Courtès --- gnu/packages/ipfs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 7ef7108c1f..15f174f8b6 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -212,7 +213,7 @@ written in Go.") (define-public go-ipfs (package (name "go-ipfs") - (version "0.4.23") + (version "0.5.1") (source (origin (method url-fetch/tarbomb) @@ -220,7 +221,7 @@ written in Go.") "https://dist.ipfs.io/go-ipfs/v" version "/go-ipfs-source.tar.gz")) (sha256 - (base32 "191ir4h6c76xcnbwx9fj8j2lzzqyp10inmqd8sa393b5y0jmhi5a")) + (base32 "0lpilycjbc1g9adp4d5kryfprixj18hg3235fnivakmv7fy2akkm")) (file-name (string-append name "-" version "-source")))) (build-system go-build-system) (arguments From e587a8086b6f9e8d0fbd3e9a6c60017cf6b6b7a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Jun 2020 16:22:26 +0300 Subject: [PATCH 167/241] gnu: rust-libnghttp2-sys-0.1: Don't hide package. * gnu/packages/crates-io.scm (rust-libnghttp2-sys-0.1)[source]: Remove bundled code. [arguments]: Skip build. Add rust-libc-0.2, rust-cc-1.0 to cargo-inputs. [inputs]: Add nghttp2. [properties]: Remove field. --- gnu/packages/crates-io.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4da1087671..0fd87d1836 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -11465,18 +11466,25 @@ functions and static variables these libraries contain.") (origin (method url-fetch) (uri (crate-uri "libnghttp2-sys" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qr4lyh7righx9n22c7amlcpk906rn1jnb2zd6gdfpa3yi24s982")))) + "0qr4lyh7righx9n22c7amlcpk906rn1jnb2zd6gdfpa3yi24s982")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "nghttp2") #t)))) (build-system cargo-build-system) - ;(inputs - ; `(("nghttp2" ,nghttp2))) + (arguments + `(#:skip-build? #t ; Uses unstable features + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-cc" ,rust-cc-1.0)))) + (inputs + `(("nghttp2" ,nghttp2))) (home-page "https://github.com/alexcrichton/nghttp2-rs") (synopsis "FFI bindings for libnghttp2 (nghttp2)") (description "This package provides FFI bindings for libnghttp2 (nghttp2).") - (properties '((hidden? . #t))) (license (list license:asl2.0 license:expat)))) From b1ff69195afc4aefac21a4141d5921660ef86c9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Jun 2020 16:25:01 +0300 Subject: [PATCH 168/241] gnu: rust-curl-sys-0.4: Don't hide package. * gnu/packages/crates-io.scm (rust-curl-sys-0.4)[source]: Remove bundled code. [arguments]: Add rust-libc-0.2, rust-libnghttp2-sys-0.1, rust-libz-sys-1.0, rust-openssl-sys-0.9, rust-winapi-0.3, rust-cc-1.0, rust-pkg-config-0.3, rust-vcpkg-0.2 to cargo-inputs. Add custom phase to find system openssl. [native-inputs]: Add pkg-config. [inputs]: Add curl, nghttp2, openssl, zlib. [properties]: Remove field. --- gnu/packages/crates-io.scm | 48 ++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0fd87d1836..b9b74b2c0e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -4620,31 +4621,42 @@ Transparency logs for use with sct crate.") (origin (method url-fetch) (uri (crate-uri "curl-sys" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02542zmvl3fpdqf7ai4cqnamm4albx9j645dkjx5qr1myq8ax42y")))) + "02542zmvl3fpdqf7ai4cqnamm4albx9j645dkjx5qr1myq8ax42y")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "curl") #t)))) (build-system cargo-build-system) - ;(arguments - ; `(#:phases - ; (modify-phases %standard-phases - ; (add-after 'unpack 'find-openssl - ; (lambda* (#:key inputs #:allow-other-keys) - ; (let ((openssl (assoc-ref inputs "openssl"))) - ; (setenv "OPENSSL_DIR" openssl)) - ; #t))))) - ;(native-inputs - ; `(("pkg-config" ,pkg-config))) - ;(inputs - ; `(("curl" ,curl) - ; ("nghttp2" ,nghttp2) - ; ("openssl" ,openssl) - ; ("zlib" ,zlib))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-libnghttp2-sys" ,rust-libnghttp2-sys-0.1) + ("rust-libz-sys" ,rust-libz-sys-1.0) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-vcpkg" ,rust-vcpkg-0.2)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-openssl + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl"))) + (setenv "OPENSSL_DIR" openssl)) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("nghttp2" ,nghttp2) + ("openssl" ,openssl) + ("zlib" ,zlib))) (home-page "https://github.com/alexcrichton/curl-rust") (synopsis "Native bindings to the libcurl library") (description "This package provides native bindings to the @code{libcurl} library.") - (properties '((hidden? . #t))) (license license:expat))) (define-public rust-custom-derive-0.1 From c54bc9bd55490bd9f4f5188fcf7d46ba501754dd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Jun 2020 16:26:51 +0300 Subject: [PATCH 169/241] gnu: rust-libgit2-sys-0.7: Don't hide package. * gnu/packages/crates-io.scm (rust-libgit2-sys-0.7)[source]: Remove bundled code. [arguments]: Add rust-curl-sys-0.4, rust-libc-0.2, rust-libssh2-sys-0.2, rust-libz-sys-1.0, rust-openssl-sys-0.9, rust-cc-1.0, rust-pkg-config-0.3 to cargo-inputs. [properties]: Remove field. --- gnu/packages/crates-io.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b9b74b2c0e..2c1b7152a0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11374,12 +11374,22 @@ macros on libc without stdlib.") (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28")))) - (arguments '()) - (properties '((hidden? . #t))))) + "1wcvg2qqra2aviasvqcscl8gb2rnjnd6h998wy5dlmf2bnriqi28")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "libgit2") #t)))) + (arguments + `(#:cargo-inputs + (("rust-curl-sys" ,rust-curl-sys-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-libssh2-sys" ,rust-libssh2-sys-0.2) + ("rust-libz-sys" ,rust-libz-sys-1.0) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-cc" ,rust-cc-1.0) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) (define-public rust-libloading-0.5 (package From 67b04b82c2af5f7082a8c0239fae1dcdda688947 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Jun 2020 16:33:33 +0300 Subject: [PATCH 170/241] gnu: rust-adler32-1.0: Rename rust-adler32-1. * gnu/packages/crates-io.scm (rust-adler32-1.0): Rename to rust-adler32-1. (rust-deflate-0.7, rust-inflate-0.4, rust-miniz-oxide-0.3): Adjust accordingly. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2c1b7152a0..600b845782 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -151,7 +151,7 @@ Rust, using gimli.") ("rust-memmap" ,rust-memmap-0.7) ("rust-rustc-test" ,rust-rustc-test-0.3)))))) -(define-public rust-adler32-1.0 +(define-public rust-adler32-1 (package (name "rust-adler32") (version "1.0.4") @@ -4848,7 +4848,7 @@ and arithmetic.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-adler32" ,rust-adler32-1.0) + (("rust-adler32" ,rust-adler32-1) ("rust-byteorder" ,rust-byteorder-1.3) ("rust-gzip-header" ,rust-gzip-header-0.3) ("rust-flate2" ,rust-flate2-1.0)))) @@ -10338,7 +10338,7 @@ renamed to indexmap.") "1zxjdn8iwa0ssxrnjmywm3r1v284wryvzrf8vkc7nyf5ijbjknqw")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1.0)))) + `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1)))) (home-page "https://github.com/PistonDevelopers/inflate.git") (synopsis "DEFLATE decoding") (description "This package provides DEFLATE decoding.") @@ -12696,7 +12696,7 @@ for Rust structs.") (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs (("rust-adler32" ,rust-adler32-1.0)))) + #:cargo-inputs (("rust-adler32" ,rust-adler32-1)))) (home-page "https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide") (synopsis "Pure rust replacement for the miniz DEFLATE/zlib encoder/decoder") (description From 9f4cb9986f1bbdf963747de442627da813067628 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Jun 2020 16:38:12 +0300 Subject: [PATCH 171/241] gnu: rust-adler32-1: Update to 1.1.0. * gnu/packages/crates-io.scm (rust-adler32-1): Update to 1.1.0. [arguments]: Don't skip build. Add rust-compiler-builtins-0.1, rust-rustc-std-workspace-core-1.0 to cargo-inputs. Add rust-bencher-0.1 to cargo-development-inputs. --- gnu/packages/crates-io.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 600b845782..8ab88fa243 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -154,7 +154,7 @@ Rust, using gimli.") (define-public rust-adler32-1 (package (name "rust-adler32") - (version "1.0.4") + (version "1.1.0") (source (origin (method url-fetch) @@ -163,12 +163,15 @@ Rust, using gimli.") (string-append name "-" version ".crate")) (sha256 (base32 - "1hnan4fgmnidgn2k84hh2i67c3wp2c5iwd5hs61yi7gwwx1p6bjx")))) + "0bgks405vz823bphgwhj4l9h6vpfh900s0phfk4qqijyh9xhfysn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1.0)) #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.4)))) + (("rust-bencher" ,rust-bencher-0.1) + ("rust-rand" ,rust-rand-0.4)))) (home-page "https://github.com/remram44/adler32-rs") (synopsis "Implementation of the Adler32 rolling hash algorithm") (description From 04dd80181f6f643efff3b7ffe4441410a17f4ca6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 09:50:39 +0200 Subject: [PATCH 172/241] gnu: Add acclimation. * gnu/packages/lisp-xyz.scm (cl-acclimation, sbcl-acclimation): New variables. --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 025d1bc9ef..09d25f0764 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12018,3 +12018,33 @@ tables.") (define-public cl-rdkafka (sbcl-package->cl-source-package sbcl-cl-rdkafka)) + +(define-public sbcl-acclimation + (let ((commit "4d51150902568fcd59335f4cc4cfa022df6116a5")) + (package + (name "sbcl-acclimation") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robert-strandh/Acclimation") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1aw7rarjl8ai57h0jxnp9hr3dka7qrs55mmbl1p6rhd6xj8mp9wq")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/robert-strandh/Acclimation") + (synopsis "Internationalization library for Common Lisp") + (description "This project is meant to provide tools for +internationalizing Common Lisp programs. + +One important aspect of internationalization is of course the language used in +error messages, documentation strings, etc. But with this project we provide +tools for all other aspects of internationalization as well, including dates, +weight, temperature, names of physical quantitites, etc.") + (license license:bsd-2)))) + +(define-public cl-acclimation + (sbcl-package->cl-source-package sbcl-acclimation)) From 5a08660ecb965783f581b95704c150e12d721891 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 16:41:08 +0200 Subject: [PATCH 173/241] build-system/asdf: Add support for component-less systems. * guix/build/lisp-utils.scm (make-asd-file): Ensure lib directory exists and check if prebuilt bundle system was generated. (generate-system-definition): Add :class and :components only if prebuilt system was generated. --- guix/build/lisp-utils.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index c7a589c902..5bb3d81c9e 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -186,13 +186,17 @@ asdf:system-depends-on. First load the system's ASD-FILE." (_ system)))) (define* (generate-system-definition system - #:key version dependencies) + #:key version dependencies component?) `(asdf:defsystem ,(normalize-string system) - :class asdf/bundle:prebuilt-system + ,@(if component? + '(:class asdf/bundle:prebuilt-system) + '()) :version ,version :depends-on ,dependencies - :components ((:compiled-file ,(compiled-system system))) + ,@(if component? + `(:components ((:compiled-file ,(compiled-system system)))) + '()) ,@(if (string=? "ecl" (%lisp-type)) `(:lib ,(string-append system ".a")) '()))) @@ -311,14 +315,20 @@ system to find its dependencies, as described by GENERATE-DEPENDENCY-LINKS." lisp-input-map) (map dependency-name dependencies))) + ;; Ensure directory exists, which might not be the case for an .asd without components. + (mkdir-p (dirname asd-file)) (call-with-output-file asd-file (lambda (port) (display (replace-escaped-macros (format #f "~y~%~y~%" - (generate-system-definition system - #:version version - #:dependencies dependencies) + (generate-system-definition + system + #:version version + #:dependencies dependencies + ;; Some .asd don't have components, and thus they don't generate any .fasl. + #:component? (pair? + (find-files (dirname asd-file) "--system\\.fasl$"))) (generate-dependency-links registry system))) port)))) From 74fb7f900e046e65d99563ba439526c51039f9d4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 16:43:18 +0200 Subject: [PATCH 174/241] gnu: cl-cxml: Remove ASD fix since our build system supports component-less asd. * gnu/packages/lisp-xyz.scm (cl-cxml)[arguments]: Remove 'remove-component phase. --- gnu/packages/lisp-xyz.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 09d25f0764..d2c7560418 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5719,22 +5719,7 @@ offered, one SAX-like, the other similar to StAX.") (install-file "catalog.dtd" (string-append (assoc-ref outputs "out") - "/lib/" (%lisp-type))))) - (add-after 'create-asd 'remove-component - ;; XXX: The original .asd has no components, but our build system - ;; creates an entry nonetheless. We need to remove it for the - ;; generated .asd to load properly. See trivia.trivial for a - ;; similar problem. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (asd (string-append out "/lib/sbcl/cxml.asd"))) - (substitute* asd - ((" :components -") - "")) - (substitute* asd - ((" *\\(\\(:compiled-file \"cxml--system\"\\)\\)") - "")))))))))) + "/lib/" (%lisp-type)))))))))) (define-public cl-cxml (sbcl-package->cl-source-package sbcl-cxml)) From 7432a419b8c1a7aa469a8714040108ea73e5a7f8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 16:44:35 +0200 Subject: [PATCH 175/241] gnu: sbcl-fare-quasiquote-readtable: Remove ASD component fix. * gnu/packages/lisp-xyz.scm (sbcl-fare-quasiquote-readtable)[arguments]: Remove 'fix-asd-file phase now that our build system supports component-less .asd files. --- gnu/packages/lisp-xyz.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d2c7560418..8fde80d48f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6121,7 +6121,6 @@ This package uses fare-quasiquote with named-readtable."))) (define-public cl-fare-quasiquote-readtable (sbcl-package->cl-source-package sbcl-fare-quasiquote-readtable)) -;; TODO: Add support for component-less system in asdf-build-system/sbcl. (define-public sbcl-fare-quasiquote-extras (package (inherit sbcl-fare-quasiquote) @@ -6141,22 +6140,7 @@ This package uses fare-quasiquote with named-readtable."))) (install-file "fare-quasiquote-extras.asd" lib) (make-file-writable (string-append lib "/fare-quasiquote-extras.asd")) - #t))) - (add-after 'create-asd-file 'fix-asd-file - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib/" (%lisp-type))) - (asd (string-append lib "/fare-quasiquote-extras.asd"))) - (substitute* asd - ((":class") - "") - (("asdf/bundle:prebuilt-system") - "") - ((":components") - "") - (("\\(\\(:compiled-file \"fare-quasiquote-extras--system\"\\)\\)") - ""))) - #t))))) + #t)))))) (description "This library combines @code{fare-quasiquote-readtable} and @code{fare-quasiquote-optima}."))) From 6f517910226f65bf17e22d7baca9347d475f7a9e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 16:47:00 +0200 Subject: [PATCH 176/241] gnu: sbcl-triva.trivial: Remove ASD component fix. * gnu/packages/lisp-xyz.scm (sbcl-triva.trivial)[arguments]: Don't replace create-asd-file phase now that our build system supports component-less .asd files. --- gnu/packages/lisp-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8fde80d48f..0fcc5c005a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6216,32 +6216,6 @@ with extensible optimizer interface."))) (name "sbcl-trivia.trivial") (inputs `(("trivia.level2" ,sbcl-trivia.level2))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'create-asd-file - (lambda* (#:key outputs inputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib/" (%lisp-type))) - (level2 (assoc-ref inputs "trivia.level2"))) - (mkdir-p lib) - (install-file "trivia.trivial.asd" lib) - ;; XXX: This .asd does not have any component and the build - ;; system fails to work in this case. We should update the - ;; build system to handle component-less .asd. - ;; TODO: How do we append to file in Guile? It seems that - ;; (open-file ... "a") gets a "Permission denied". - (substitute* (string-append lib "/trivia.trivial.asd") - (("\"\\)") - (string-append "\") - -(progn (asdf/source-registry:ensure-source-registry) - (setf (gethash - \"trivia.level2\" - asdf/source-registry:*source-registry*) - #p\"" - level2 - "/share/common-lisp/sbcl-bundle-systems/trivia.level2.asd\"))"))))))))) (description "Trivia is a pattern matching compiler that is compatible with Optima, another pattern matching library for Common Lisp. It is meant to be faster and more extensible than Optima. From 797f43af75d61dcc91112f704c5c99c67f8b1fe7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 16:48:37 +0200 Subject: [PATCH 177/241] gnu: sbcl-triva: Remove ASD component fix. * gnu/packages/lisp-xyz.scm (sbcl-triva)[arguments]: Remove 'remove-component phase now that our build system supports component-less .asd files. --- gnu/packages/lisp-xyz.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0fcc5c005a..7b086000b4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6293,24 +6293,7 @@ This system contains the CFFI foreign slot access extension."))) ("trivia.cffi" ,sbcl-trivia.cffi) ("optima" ,sbcl-optima))) (arguments - `(#:test-asd-file "trivia.test.asd" - #:phases - (modify-phases %standard-phases - (add-after 'create-asd 'remove-component - ;; XXX: The original .asd has no components, but our build system - ;; creates an entry nonetheless. We need to remove it for the - ;; generated .asd to load properly. See trivia.trivial for a - ;; similar problem. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (asd (string-append out "/lib/" (%lisp-type) "/trivia.asd"))) - (substitute* asd - ((" :components -") - "")) - (substitute* asd - ((" *\\(\\(:compiled-file \"trivia--system\"\\)\\)") - "")))))))) + `(#:test-asd-file "trivia.test.asd")) (description "Trivia is a pattern matching compiler that is compatible with Optima, another pattern matching library for Common Lisp. It is meant to be faster and more extensible than Optima."))) From ba1727b0410326d4cd90eb7236d5539abaff8c67 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 16:52:54 +0200 Subject: [PATCH 178/241] gnu: Add sbcl-clump-2-3-tree. * gnu/packages/lisp-xyz.scm (sbcl-clump-2-3-tree): New variable. --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7b086000b4..eed2026b72 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11974,3 +11974,39 @@ weight, temperature, names of physical quantitites, etc.") (define-public cl-acclimation (sbcl-package->cl-source-package sbcl-acclimation)) + +(define-public sbcl-clump-2-3-tree + (let ((commit "1ea4dbac1cb86713acff9ae58727dd187d21048a")) + (package + (name "sbcl-clump-2-3-tree") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robert-strandh/Clump") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1639msyagsswj85gc0wd90jgh8588j3qg5q70by9s2brf2q6w4lh")))) + (arguments + '(#:asd-file "2-3-tree/clump-2-3-tree.asd" + #:asd-system-name "clump-2-3-tree")) + (inputs + `(("acclimation" ,sbcl-acclimation))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/robert-strandh/Clump") + (synopsis "Implementation of 2-3 trees for Common Lisp") + (description "The purpose of this library is to provide a collection of +implementations of trees. + +In contrast to existing libraries such as cl-containers, it does not impose a +particular use for the trees. Instead, it aims for a stratified design, +allowing client code to choose between different levels of abstraction. + +As a consequence of this policy, low-level interfaces are provided where +the concrete representation is exposed, but also high level interfaces +where the trees can be used as search trees or as trees that represent +sequences of objects.") + (license license:bsd-2)))) From 106354eaa42ceb83cf1eff66aee220531452a5c4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 16:53:09 +0200 Subject: [PATCH 179/241] gnu: Add sbcl-clump-binary-tree. * gnu/packages/lisp-xyz.scm (sbcl-clump-binary-tree): New variable. --- gnu/packages/lisp-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index eed2026b72..cf5e763c78 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12010,3 +12010,12 @@ the concrete representation is exposed, but also high level interfaces where the trees can be used as search trees or as trees that represent sequences of objects.") (license license:bsd-2)))) + +(define-public sbcl-clump-binary-tree + (package + (inherit sbcl-clump-2-3-tree) + (name "sbcl-clump-binary-tree") + (arguments + '(#:asd-file "Binary-tree/clump-binary-tree.asd" + #:asd-system-name "clump-binary-tree")) + (synopsis "Implementation of binary trees for Common Lisp"))) From 409fcee9e5074987ee251c9c025c437fbf0671c7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 16:53:20 +0200 Subject: [PATCH 180/241] gnu: Add clump. * gnu/packages/lisp-xyz.scm (cl-clump, sbcl-clump): New variables. --- gnu/packages/lisp-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index cf5e763c78..2840539816 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12019,3 +12019,18 @@ sequences of objects.") '(#:asd-file "Binary-tree/clump-binary-tree.asd" #:asd-system-name "clump-binary-tree")) (synopsis "Implementation of binary trees for Common Lisp"))) + +(define-public sbcl-clump + (package + (inherit sbcl-clump-2-3-tree) + (name "sbcl-clump") + (arguments + '(#:asd-file "clump.asd" + #:asd-system-name "clump")) + (inputs + `(("clump-2-3-tree" ,sbcl-clump-2-3-tree) + ("clump-binary-tree" ,sbcl-clump-binary-tree))) + (synopsis "Collection of tree implementations for Common Lisp"))) + +(define-public cl-clump + (sbcl-package->cl-source-package sbcl-clump)) From 19a1a98fb4f05178f890dc78980099f2c53f2d2c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 17:46:53 +0200 Subject: [PATCH 181/241] gnu: Add sbcl-cluffer-base. * gnu/packages/lisp-xyz.scm (sbcl-cluffer-base): New variable. --- gnu/packages/lisp-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2840539816..74d141fa04 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12034,3 +12034,32 @@ sequences of objects.") (define-public cl-clump (sbcl-package->cl-source-package sbcl-clump)) + +(define-public sbcl-cluffer-base + (let ((commit "4aad29c276a58a593064e79972ee4d77cae0af4a")) + (package + (name "sbcl-cluffer-base") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robert-strandh/cluffer") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bcg13g7qb3dr8z50aihdjqa6miz5ivlc9wsj2csgv1km1mak2kj")))) + (arguments + '(#:asd-file "Base/cluffer-base.asd" + #:asd-system-name "cluffer-base")) + (inputs + `(("acclimation" ,sbcl-acclimation))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/robert-strandh/cluffer") + (synopsis "Common Lisp library providing a protocol for text-editor buffers") + (description "Cluffer is a library for representing the buffer of a text +editor. As such, it defines a set of CLOS protocols for client code to +interact with the buffer contents in various ways, and it supplies different +implementations of those protocols for different purposes.") + (license license:bsd-2)))) From a4a24f66fa15bfd9ef15a85dcde59ace773994b8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 17:47:10 +0200 Subject: [PATCH 182/241] gnu: Add sbcl-cluffer-standard-line. * gnu/packages/lisp-xyz.scm (sbcl-cluffer-standard-line): New variable. --- gnu/packages/lisp-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 74d141fa04..36ece586df 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12063,3 +12063,13 @@ editor. As such, it defines a set of CLOS protocols for client code to interact with the buffer contents in various ways, and it supplies different implementations of those protocols for different purposes.") (license license:bsd-2)))) + +(define-public sbcl-cluffer-standard-line + (package + (inherit sbcl-cluffer-base) + (name "sbcl-cluffer-standard-line") + (arguments + '(#:asd-file "Standard-line/cluffer-standard-line.asd" + #:asd-system-name "cluffer-standard-line")) + (inputs + `(("cluffer-base" ,sbcl-cluffer-base))))) From 37f2d5835e9cad5e799bd6090029c6572baff95b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 17:47:30 +0200 Subject: [PATCH 183/241] gnu: Add sbcl-cluffer-standard-buffer. * gnu/packages/lisp-xyz.scm (sbcl-cluffer-standard-buffer): New variable. --- gnu/packages/lisp-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 36ece586df..41f3819b14 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12073,3 +12073,14 @@ implementations of those protocols for different purposes.") #:asd-system-name "cluffer-standard-line")) (inputs `(("cluffer-base" ,sbcl-cluffer-base))))) + +(define-public sbcl-cluffer-standard-buffer + (package + (inherit sbcl-cluffer-base) + (name "sbcl-cluffer-standard-buffer") + (arguments + '(#:asd-file "Standard-buffer/cluffer-standard-buffer.asd" + #:asd-system-name "cluffer-standard-buffer")) + (inputs + `(("cluffer-base" ,sbcl-cluffer-base) + ("clump" ,sbcl-clump))))) From 5e3fcdf8f69b18773d8aeef7b7b52117091ec850 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 17:47:45 +0200 Subject: [PATCH 184/241] gnu: Add sbcl-cluffer-simple-line. * gnu/packages/lisp-xyz.scm (sbcl-cluffer-simple-line): New variable. --- gnu/packages/lisp-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 41f3819b14..bcd26a2620 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12084,3 +12084,13 @@ implementations of those protocols for different purposes.") (inputs `(("cluffer-base" ,sbcl-cluffer-base) ("clump" ,sbcl-clump))))) + +(define-public sbcl-cluffer-simple-line + (package + (inherit sbcl-cluffer-base) + (name "sbcl-cluffer-simple-line") + (arguments + '(#:asd-file "Simple-line/cluffer-simple-line.asd" + #:asd-system-name "cluffer-simple-line")) + (inputs + `(("cluffer-base" ,sbcl-cluffer-base))))) From d6ad0b72485bb6fa28e7ec94b79936a3ab6dc2fb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 17:47:58 +0200 Subject: [PATCH 185/241] gnu: Add sbcl-cluffer-simple-buffer. * gnu/packages/lisp-xyz.scm (sbcl-cluffer-simple-buffer): New variable. --- gnu/packages/lisp-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bcd26a2620..3856c940e5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12094,3 +12094,13 @@ implementations of those protocols for different purposes.") #:asd-system-name "cluffer-simple-line")) (inputs `(("cluffer-base" ,sbcl-cluffer-base))))) + +(define-public sbcl-cluffer-simple-buffer + (package + (inherit sbcl-cluffer-base) + (name "sbcl-cluffer-simple-buffer") + (arguments + '(#:asd-file "Simple-buffer/cluffer-simple-buffer.asd" + #:asd-system-name "cluffer-simple-buffer")) + (inputs + `(("cluffer-base" ,sbcl-cluffer-base))))) From 89c98c063af3123a8f7b563f99e128a93041a86a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 18 Jun 2020 17:48:13 +0200 Subject: [PATCH 186/241] gnu: Add cluffer. * gnu/packages/lisp-xyz.scm (cl-cluffer, sbcl-cluffer): New variables. --- gnu/packages/lisp-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3856c940e5..c89ad4aef9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12104,3 +12104,20 @@ implementations of those protocols for different purposes.") #:asd-system-name "cluffer-simple-buffer")) (inputs `(("cluffer-base" ,sbcl-cluffer-base))))) + +(define-public sbcl-cluffer + (package + (inherit sbcl-cluffer-base) + (name "sbcl-cluffer") + (arguments + '(#:asd-file "cluffer.asd" + #:asd-system-name "cluffer")) + (inputs + `(("cluffer-base" ,sbcl-cluffer-base) + ("cluffer-standard-line" ,sbcl-cluffer-standard-line) + ("cluffer-standard-buffer" ,sbcl-cluffer-standard-buffer) + ("cluffer-simple-line" ,sbcl-cluffer-simple-line) + ("cluffer-simple-buffer" ,sbcl-cluffer-simple-buffer))))) + +(define-public cl-cluffer + (sbcl-package->cl-source-package sbcl-cluffer)) From f43e4104701340acea0d5504bc26723d7d4cbe08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Sat, 28 Mar 2020 00:20:31 +0100 Subject: [PATCH 187/241] gnu: Add unicorn. * gnu/packages/emulators.scm (unicorn): New variable. --- gnu/packages/emulators.scm | 117 ++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7e797d1dae..ab5b662915 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -44,7 +44,9 @@ #:use-module (gnu packages boost) #:use-module (gnu packages backup) #:use-module (gnu packages cdrom) + #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages elf) #:use-module (gnu packages fonts) @@ -88,7 +90,8 @@ #:use-module (gnu packages web) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python)) (define-public desmume (package @@ -1663,3 +1666,115 @@ from various forks of Gens, and improved platform portability.") "bsnes is a Super Nintendo / Super Famicom emulator that focuses on performance, features, and ease of use.") (license license:gpl3))) + +;; python-pwntools requires a -rc release of unicorn +(define-public unicorn + (let ((unless-x86 + (lambda (code) + (if (member (%current-system) '("x86_64-linux" "i686-linux")) + '() + code)))) + (package + (name "unicorn") + (version "1.0.2-rc4") + ;; NOTE: unicorn ships a bundled QEMU, but with a lot of custom modifications. + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/unicorn-engine/unicorn") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy")))) + (outputs '("out" "python")) + ;; The main library is not written in Python, but the build process has + ;; little in common with any defined build system, so we might as well + ;; build on top of python-build-system and make use of all + ;; the Python-specific phases that can be reused. + (build-system python-build-system) + (arguments + `(#:modules ((srfi srfi-26) + (guix build python-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'install-bindings-to-python-output + (lambda* (#:key outputs #:allow-other-keys) + ;; python-build-system will build the bindings and install them to + ;; the "out" output, so change the build-internal names of the + ;; outputs. + ;; + ;; TODO: remove this once #40469 lands, through the core-updates + ;; holding zone, on master. + (set-car! (assoc "out" outputs) "lib") + (set-car! (assoc "python" outputs) "out") + #t)) + (add-before 'build 'build-library + (lambda* (#:key inputs #:allow-other-keys) + (invoke "make" + "-j" (number->string (parallel-job-count)) + "UNICORN_STATIC=no" + "CC=gcc"))) + (add-after 'build-library 'install-library + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "install" + "UNICORN_STATIC=no" + (string-append + "PREFIX=" + (assoc-ref outputs "lib"))))) + (add-before 'build 'prepare-bindings + (lambda* (#:key outputs #:allow-other-keys) + (chdir "bindings/python") + ;; Set this environment variable so that the Python bindings + ;; don't build their own copy of the shared object, but use + ;; a dummy value such that the bindings test suite uses the + ;; same mechanism for loading the library as any other user. + (setenv "LIBUNICORN_PATH" "1") + (substitute* "unicorn/unicorn.py" + (("_path_list = \\[.*") + (string-append + "_path_list = [\"" + (assoc-ref outputs "lib") + ;; eat the rest of the list + "/lib\"] + 0*["))) + #t)) + (add-before 'check 'check-library + (lambda* (#:key outputs #:allow-other-keys) + (for-each + (lambda (suite) + (with-directory-excursion + (string-append "../../tests/" suite) + (invoke "make" "test" "CC=gcc" + ,@(unless-x86 + '("AS=i686-unknown-linux-gnu-as" + "OBJCOPY=i686-unknown-linux-gnu-objcopy"))))) + '("unit" "regress")) + #t)) + (add-after 'install 'install-samples + (lambda* (#:key outputs #:allow-other-keys) + (let* ((python-samples (find-files "." "sample_.*")) + (c-samples (find-files "../../samples" ".*\\.c")) + (python-docdir + (string-append (assoc-ref outputs "out") + "/share/doc/unicorn/samples")) + (c-docdir + (string-append (assoc-ref outputs "lib") + "/share/doc/unicorn/samples"))) + (for-each (cut install-file <> c-docdir) c-samples) + (for-each (cut install-file <> python-docdir) python-samples) + #t)))))) + (native-inputs + ;; NOTE: cross-binutils needs to be wrapped with unless-x86, as otherwise + ;; the linker provided by the package will be used, circumventing the ld-wrapper. + `(,@(unless-x86 + `(("assembler-for-tests" ,(cross-binutils "i686-unknown-linux-gnu")))) + ("cmocka" ,cmocka) + ("hexdump-for-tests" ,util-linux))) + (home-page "http://www.unicorn-engine.org") + (synopsis "Unicorn CPU emulator framework") + (description + "Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator +framework based on QEMU.") + (license license:gpl2+)))) From 8fdd0da49c81366a2061da35739cede3df107e15 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 18 Jun 2020 18:22:49 +0200 Subject: [PATCH 188/241] gnu: Add multimon-ng. * gnu/packages/radio.scm (multimon-ng): New variable. --- gnu/packages/radio.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index d18af8f75c..a607ad1bae 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1070,3 +1070,41 @@ their position, altitude, speed, etc.") from devices on the 433 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz ISM bands.") (home-page "https://github.com/merbanan/rtl_433") (license license:gpl2+))) + +(define-public multimon-ng + (package + (name "multimon-ng") + (version "1.1.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/EliasOenal/multimon-ng.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8")))) + (build-system cmake-build-system) + (inputs + `(("libx11" ,libx11) + ("pulseaudio" ,pulseaudio))) + (arguments + '(#:tests? #f)) ; No test suite + (home-page "https://github.com/EliasOenal/multimon-ng") + (synopsis "Decoder for digital radio transmission modes") + (description "Multimon-ng can decode several digital radio transmission +modes: +@itemize +@item POCSAG512, POCSAG1200, POCSAG2400 +@item FLEX +@item EAS +@item UFSK1200, CLIPFSK, AFSK1200, AFSK2400, AFSK2400_2, AFSK2400_3 +@item HAPN4800 +@item FSK9600 +@item DTMF +@item ZVEI1, ZVEI2, ZVEI3, DZVEI, PZVEI +@item EEA, EIA, CCIR +@item MORSE CW +@item X10 +@end itemize") + (license license:gpl2+))) From 1d763933b8b2e783da56d66743eee2ae5c9c0b55 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 18 Jun 2020 15:59:33 -0400 Subject: [PATCH 189/241] gnu: linux-libre@5.7: Update to 5.7.4. * gnu/packages/linux.scm (linux-libre-5.7-version): Update to 5.7.4. (linux-libre-5.7-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 6e0b8b5831..3d595cde41 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -371,10 +371,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (sha256 hash))) -(define-public linux-libre-5.7-version "5.7.3") +(define-public linux-libre-5.7-version "5.7.4") (define-public linux-libre-5.7-pristine-source (let ((version linux-libre-5.7-version) - (hash (base32 "1sgwdcyn9105lfgg25q41yj30sy9cqfdm8m4dmka8gzllxxyq407"))) + (hash (base32 "06mm0bmjw54aypfhhbm9aaz5bmgymvygfak587iwv901635gb95w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.7))) From 3328e3643801169acd0bc09f97c26b0bb44adc29 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Jun 2020 23:36:49 +0200 Subject: [PATCH 190/241] gnu: emacs-leaf: Update to 4.2.5. * gnu/packages/emacs-xyz.scm (emacs-leaf): Update to 4.2.5. [source]: Switch to GNU ELPA URL. --- gnu/packages/emacs-xyz.scm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d8a04214b7..6537216935 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10048,26 +10048,17 @@ performance-oriented and tidy.") (define-public emacs-leaf (package (name "emacs-leaf") - (version "3.5.0") + (version "4.2.5") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/conao3/leaf.el.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "leaf-" version ".tar")) (sha256 - (base32 - "1rgd59146wad92yc64las0qgx67k2ifgsw1vwhp40xvkd7kb0r6d")))) + (base32 "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw")))) (build-system emacs-build-system) (home-page "https://github.com/conao3/leaf.el") - (arguments - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "leaf-tests.el" - "-f" "cort-test-run"))) - (synopsis - "Simplify your init.el configuration, extended use-package") + (synopsis "Simplify your init.el configuration, extended use-package") (description "This package provides macros that allows you to declaratively configure settings typical of an Elisp package with various keywords. The syntax is From f3396e788439eb0645171b2e64021c10de01a42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Endsj=C3=B8?= Date: Thu, 18 Jun 2020 20:47:56 +0200 Subject: [PATCH 191/241] gnu: Update Iosevka fonts from 2.3.3 to 3.1.1. * gnu/packages/fonts.scm (font-iosevka): (font-iosevka-slab): (font-iosevka-term): (font-iosevka-term-slab): Update to 3.1.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/fonts.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1ff7b0327a..3f21468313 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020 Zhu Zihao +;;; Copyright © 2020 Simen Endsjø ;;; ;;; This file is part of GNU Guix. ;;; @@ -1170,7 +1171,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.") (package (name "font-iosevka") ;; When updating, also update the hash of the Iosevka variant(s) below. - (version "2.3.3") + (version "3.1.1") (source (origin (method url-fetch/zipbomb) @@ -1178,7 +1179,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.") "/releases/download/v" version "/ttc-iosevka-" version ".zip")) (sha256 - (base32 "0jkv5rkg5hi0avhwyhcjiqzjslp6zjj77f09vxx2gj9l93byz731")))) + (base32 "1xnkfr11rdjnin2fvgkp9vxxigfbfdncr0wy6n78mlm3p1pqwfrm")))) (build-system font-build-system) (home-page "https://be5invis.github.io/Iosevka/") (synopsis "Coders' typeface, built from code") @@ -1201,7 +1202,7 @@ programming. Iosevka is completely generated from its source code.") "/releases/download/v" version "/ttc-iosevka-slab-" version ".zip")) (sha256 - (base32 "1rkmgi08kknc1fg54zpa6w92m3b3v7pc8cpwygz22kgd2h0mdrr8")))))) + (base32 "1n3lh015mvsdbyygpg3p3yqjpqdn1fdvjh1bhi2ggjanhifjsgzh")))))) (define-public font-iosevka-term (package @@ -1213,10 +1214,10 @@ programming. Iosevka is completely generated from its source code.") (method url-fetch/zipbomb) (uri (string-append "https://github.com/be5invis/Iosevka" "/releases/download/v" version - "/02-iosevka-term-" version ".zip")) + "/ttf-iosevka-term-" version ".zip")) (sha256 (base32 - "1mxlb3qf64nykjd0x4gjfvib3k5kyv9ssv9iyzxxgk2z80bydz00")))) + "1mwzwpdppmcf03fgb5q6ksj0kk93wwaz2isk24wj1cm66r8psxk0")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1235,10 +1236,10 @@ programming. Iosevka is completely generated from its source code.") (method url-fetch/zipbomb) (uri (string-append "https://github.com/be5invis/Iosevka" "/releases/download/v" version - "/06-iosevka-term-slab-" version ".zip")) + "/ttf-iosevka-term-slab-" version ".zip")) (sha256 (base32 - "1gc16hih157qy6vpa8f88psq0fnksiigi3msqazc75zsm3z4kzqj")))) + "0fiwxkf2gv38ia695wh8cvnb58sqs3fixjd33q1pp9cps94wzjpg")))) (arguments `(#:phases (modify-phases %standard-phases From 7fd5f901f692fcaef2e9a262fcda082c96cf2775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Endsj=C3=B8?= Date: Thu, 18 Jun 2020 20:48:54 +0200 Subject: [PATCH 192/241] gnu: Add Iosevka quasi-proportioal fonts. * gnu/packages/fonts.scm (font-iosevka-aile, font-iosevka-etoile, font-iosevka-sparkle): New variables. Signed-off-by: Nicolas Goaziou --- gnu/packages/fonts.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3f21468313..bce1762278 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1248,6 +1248,48 @@ programming. Iosevka is completely generated from its source code.") (for-each make-file-writable (find-files "." ".*")) #t))))))) +(define-public font-iosevka-aile + (package + (inherit font-iosevka) + (name "font-iosevka-aile") + (version (package-version font-iosevka)) + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://github.com/be5invis/Iosevka" + "/releases/download/v" version + "/ttc-iosevka-aile-" version ".zip")) + (sha256 + (base32 "15kz8ahlynnb79s2d367a1fallc4l3j3957yj43qrymayagkh8sv")))))) + +(define-public font-iosevka-etoile + (package + (inherit font-iosevka) + (name "font-iosevka-etoile") + (version (package-version font-iosevka)) + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://github.com/be5invis/Iosevka" + "/releases/download/v" version + "/ttc-iosevka-etoile-" version ".zip")) + (sha256 + (base32 "0q9299mc595m251v9zj9b0zparl2qq8dwx090l0jkfpr2az9xr8q")))))) + +(define-public font-iosevka-sparkle + (package + (inherit font-iosevka) + (name "font-iosevka-sparkle") + (version (package-version font-iosevka)) + (source + (origin + (method url-fetch/zipbomb) + (uri (string-append "https://github.com/be5invis/Iosevka" + "/releases/download/v" version + "/ttc-iosevka-sparkle-" version ".zip")) + (sha256 + (base32 "0nhvcnvl11iqmsxsyrxlbnwy9z1vdhqv6p3g7fig9ra6n5j9k5kn")))))) + (define-public font-sarasa-gothic (package (name "font-sarasa-gothic") From e520aa8f41a8dbdbcee4e3537364f1d451583012 Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Thu, 18 Jun 2020 22:08:14 +0000 Subject: [PATCH 193/241] gnu: oil: Update to 0.8.pre6. * gnu/packages/shells.scm (oil): Update to 0.8.pre6. Signed-off-by: Nicolas Goaziou --- gnu/packages/shells.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8f251bb850..109baacc30 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -803,14 +803,14 @@ Shell (pdksh).") (package (name "oil") ;; https://www.oilshell.org/blog/2020/04/release-0.8.pre4.html#comment-on-version-numbering - (version "0.8.pre5") + (version "0.8.pre6") (source (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "02llxx10izxpv1y32qn8k6r0y7al01rzxjirc8h6x8nd9kiaqknl")))) + (base32 "11nfwn5b1w74hv78065jg2zm45mqzi59381b0f649j7n3g7yp3iq")))) (build-system gnu-build-system) (arguments `(#:strip-binaries? #f ; strip breaks the binary @@ -827,7 +827,7 @@ Shell (pdksh).") (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 + ;; https://github.com/oilshell/oil/blob/release/0.8.pre6/INSTALL.txt#L38-L48 (lambda _ (let* ((oil "_bin/oil.ovm")) (invoke/quiet oil "osh" "-c" "echo hi") From 0dd04b9986dd834782c988035569089785a6987d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Jun 2020 21:12:35 -0400 Subject: [PATCH 194/241] machine: ssh: Fix guix deploy hang when using non-DCE UUIDs. Fixes . The UUID type information was lost when passing to the lower gexp code strata, which led to not being able to recreate the UUID in the generated script. This occurred for non-DCE type UUIDs such as that of a FAT file system. A following commit will prevent the find-partition-by-uuid procedure from entering a loop when its UUID argument is invalid. Reported-by: Brice Waegeneire * gnu/machine/ssh.scm (machine-check-file-system-availability): Replace the STRING->UUID procedure by the UUID macro, and provide the UUID type as its second argument. --- gnu/machine/ssh.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 116da86327..7194181681 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -210,10 +210,9 @@ exist on the machine." (use-modules (gnu build file-systems) (gnu system uuid)) - (define uuid - (string->uuid #$(uuid->string (file-system-device fs)))) - - (find-partition-by-uuid uuid)))) + (let ((uuid (uuid #$(uuid->string (file-system-device fs)) + '#$(uuid-type (file-system-device fs))))) + (find-partition-by-uuid uuid))))) (remote-let ((result remote-exp)) (unless result From 04a4af6dd4fbfcfc564eac5eafe647b192ba3a8f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Jun 2020 23:07:43 -0400 Subject: [PATCH 195/241] uuid: Prevent a loop on invalid arguments. * gnu/system/uuid.scm (uuid=?): Use type predicates in the fallback case to prevent looping on invalid arguments. --- gnu/system/uuid.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/uuid.scm b/gnu/system/uuid.scm index 225959e2b7..bc3af69610 100644 --- a/gnu/system/uuid.scm +++ b/gnu/system/uuid.scm @@ -298,5 +298,5 @@ corresponding bytevector; otherwise return #f." (bytevector=? (uuid-bytevector a) b)) (((? uuid? a) (? uuid? b)) (bytevector=? (uuid-bytevector a) (uuid-bytevector b))) - ((a b) + (((or (? uuid? a) (? bytevector? a)) (or (? uuid? b) (? bytevector? b))) (uuid=? b a)))) From 42ed562691640fc38a08e2269379fc181bdfe0f9 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 19 Jun 2020 08:23:18 +0200 Subject: [PATCH 196/241] =?UTF-8?q?news:=20Add=20=E2=80=98de=E2=80=99=20tr?= =?UTF-8?q?anslation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/news.scm: Add a ‘de’ translation. --- etc/news.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index 292a33f391..c51cae4292 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -14,7 +14,8 @@ (version 0) (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") - (title (en "@command{guix pull} authenticates channels")) + (title (en "@command{guix pull} authenticates channels") + (de "@command{guix pull} authentifiziert Kanäle")) (body (en "The @command{guix pull} and @command{guix time-machine} commands now authenticate the source code that they pull, unless the new @@ -24,7 +25,17 @@ authorized developer. This protects you from attempts to tamper with the Guix repository and from attempts to ship malicious code to users. This feature is currently limited to the @code{guix} channel but will soon be -available to third-party channel authors."))) +available to third-party channel authors.") + (de "Die Befehle @command{guix pull} und @command{guix time-machine} +prüfen nun die Authentizität des heruntergeladenen Quellcodes, außer wenn die +neue Befehlszeilenoption @option{--disable-authentication} angegeben +wurde. Das bedeutet, Guix stellt sicher, dass jeder empfangene Commit durch +einen autorisierten Entwickler kryptografisch signiert wurde. Das schützt Sie +vor Versuchen, das Guix-Repository zu manipulieren oder bösartigen Code an die +Nutzer auszuliefern. + +Diese Funktionalität ist auf den @code{guix}-Kanal beschränkt, sie wird jedoch +bald auch Autoren dritter Kanäle zur Verfügung stehen."))) (entry (commit "c924e541390f9595d819edc33c19d979917c15ec") (title (en "@command{guix repl} adds support for running Guile scripts") From 951847ee3792f8fa57d2bd38d84d9fa9c276c0fa Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 8 Jun 2020 13:02:13 +0200 Subject: [PATCH 197/241] hurd-boot: Create individual translators instead of running MAKEDEV. * gnu/build/hurd-boot.scm (make-hurd-device-nodes): Do not create dev/{null,zero,full,random,urandom} mount points. (passive-translator-xattr?, passive-translator-installed?, translated?, set-translator, set-hurd-device-translators): New procedures. (false-if-EEXIST): New macro. (boot-hurd-system): Use them instead of running MAKEDEV. --- gnu/build/hurd-boot.scm | 190 ++++++++++++++++++++++++++++++---------- 1 file changed, 143 insertions(+), 47 deletions(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 09326233d2..f4b6dc734d 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -80,16 +80,8 @@ Return the value associated with OPTION, or #f on failure." (string-append root (if (string-suffix? "/" root) "" "/") dir)) (mkdir (scope "dev")) - (for-each (lambda (file) - (call-with-output-file (scope file) - (lambda (port) - (display file port) ;avoid hard-linking - (chmod port #o666)))) - '("dev/null" - "dev/zero" - "dev/full" - "dev/random" - "dev/urandom")) + ;; Don't create /dev/null etc just yet; the store + ;; messes-up the permission bits. ;; Don't create /dev/console, /dev/vcs, etc.: they are created by ;; console-run on first boot. @@ -115,6 +107,143 @@ Return the value associated with OPTION, or #f on failure." ;; settings? ) +(define (passive-translator-xattr? file-name) + "Return true if FILE-NAME has an extended @code{gnu.translator} attribute +set." + (catch 'system-error + (lambda _ (not (string-null? (getxattr file-name "gnu.translator")))) + (lambda args + (if (= ENODATA (system-error-errno args)) + #f + (apply throw args))))) + +(define (passive-translator-installed? file-name) + "Return true if @file{showtrans} finds a translator installed on FILE-NAME." + (with-output-to-port (%make-void-port "w") + (lambda _ + (with-error-to-port (%make-void-port "w") + (lambda _ + (zero? (system* "showtrans" "--silent" file-name))))))) + +(define (translated? file-name) + "Return true if a translator is installed on FILE-NAME." + (if (string-contains %host-type "linux-gnu") + (passive-translator-xattr? file-name) + (passive-translator-installed? file-name))) + +(define* (set-translator file-name command #:optional (mode #o600)) + "Setup translator COMMAND on FILE-NAME." + (unless (translated? file-name) + (let ((dir (dirname file-name))) + (unless (directory-exists? dir) + (mkdir-p dir)) + (unless (file-exists? file-name) + (call-with-output-file file-name + (lambda (port) + (display file-name port) ;avoid hard-linking + (chmod port mode))))) + (catch 'system-error + (lambda _ + (apply invoke "settrans" "--create" file-name command)) + (lambda (key . args) + (let ((errno (system-error-errno (cons key args)))) + (format (current-error-port) "~a: ~a\n" + (strerror errno) file-name) + (format (current-error-port) "Ignoring...Good Luck!\n")))))) + +(define-syntax-rule (false-if-EEXIST exp) + "Evaluate EXP but return #f if it raises to 'system-error with EEXIST." + (catch 'system-error + (lambda () exp) + (lambda args + (if (= EEXIST (system-error-errno args)) + #f + (apply throw args))))) + +(define* (set-hurd-device-translators #:optional (root "/")) + "Make some of the device nodes needed on GNU/Hurd." + + (define (scope dir) + (string-append root (if (string-suffix? "/" root) "" "/") dir)) + + (define scope-set-translator + (match-lambda + ((file-name command) + (scope-set-translator (list file-name command #o600))) + ((file-name command mode) + (let ((mount-point (scope file-name))) + (set-translator mount-point command mode))))) + + (define (mkdir* dir) + (let ((dir (scope dir))) + (unless (file-exists? dir) + (mkdir-p dir)))) + + (define servers + '(("servers/crash-dump-core" ("/hurd/crash" "--dump-core")) + ("servers/crash-kill" ("/hurd/crash" "--kill")) + ("servers/crash-suspend" ("/hurd/crash" "--suspend")) + ("servers/password" ("/hurd/password")) + ("servers/socket/1" ("/hurd/pflocal")) + ("servers/socket/2" ("/hurd/pfinet" + "--interface" "eth0" + "--address" + "10.0.2.15" ;the default QEMU guest IP + "--netmask" "255.255.255.0" + "--gateway" "10.0.2.2" + "--ipv6" "/servers/socket/16")))) + + (define devices + '(("dev/full" ("/hurd/null" "--full") #o666) + ("dev/null" ("/hurd/null") #o666) + ("dev/random" ("/hurd/random" "--seed-file" "/var/lib/random-seed") + #o644) + ("dev/zero" ("/hurd/storeio" "--store-type=zero") #o666) + + ("dev/console" ("/hurd/term" "/dev/console" "device" "console")) + + ("dev/klog" ("/hurd/streamio" "kmsg")) + ("dev/mem" ("/hurd/storeio" "--no-cache" "mem") #o660) + ("dev/shm" ("/hurd/tmpfs" "--mode=1777" "50%") #o644) + ("dev/time" ("/hurd/storeio" "--no-cache" "time") #o644) + + ("dev/vcs" ("/hurd/console")) + ("dev/tty" ("/hurd/magic" "tty") #o666) + + ("dev/tty1" ("/hurd/term" "/dev/tty1" "hurdio" "/dev/vcs/1/console") + #o666) + ("dev/tty2" ("/hurd/term" "/dev/tty2" "hurdio" "/dev/vcs/2/console") + #o666) + ("dev/tty3" ("/hurd/term" "/dev/tty3" "hurdio" "/dev/vcs/3/console") + #o666) + + ("dev/ptyp0" ("/hurd/term" "/dev/ptyp0" "pty-master" "/dev/ttyp0") + #o666) + ("dev/ptyp1" ("/hurd/term" "/dev/ptyp1" "pty-master" "/dev/ttyp1") + #o666) + ("dev/ptyp2" ("/hurd/term" "/dev/ptyp2" "pty-master" "/dev/ttyp2") + #o666) + + ("dev/ttyp0" ("/hurd/term" "/dev/ttyp0" "pty-slave" "/dev/ptyp0") + #o666) + ("dev/ttyp1" ("/hurd/term" "/dev/ttyp1" "pty-slave" "/dev/ptyp1") + #o666) + ("dev/ttyp2" ("/hurd/term" "/dev/ttyp2" "pty-slave" "/dev/ptyp2") + #o666))) + + (for-each scope-set-translator servers) + (mkdir* (scope "dev/vcs/1")) + (mkdir* (scope "dev/vcs/2")) + (mkdir* (scope "dev/vcs/2")) + (rename-file (scope "/dev/console") (scope "/dev/console-")) + (for-each scope-set-translator devices) + + (false-if-EEXIST (symlink "/dev/random" (scope "dev/urandom"))) + (mkdir* (scope "dev/fd")) + (false-if-EEXIST (symlink "/dev/fd/0" (scope "dev/stdin"))) + (false-if-EEXIST (symlink "/dev/fd/1" (scope "dev/stdout"))) + (false-if-EEXIST (symlink "/dev/fd/2" (scope "dev/stderr")))) + (define* (boot-hurd-system #:key (on-error 'debug)) "This procedure is meant to be called from an early RC script. @@ -126,20 +255,9 @@ starting the Shepherd. XXX TODO: see linux-boot.scm:boot-system. XXX TODO: add proper file-system checking, mounting XXX TODO: move bits to (new?) (hurd?) (activation?) services -XXX TODO: use settrans/setxattr instead of MAKEDEV +XXX TODO: use Linux xattr/setxattr to remove (settrans in) /libexec/RUNSYSTEM " - (define translators - '(("/servers/crash-dump-core" ("/hurd/crash" "--dump-core")) - ("/servers/crash-kill" ("/hurd/crash" "--kill")) - ("/servers/crash-suspend" ("/hurd/crash" "--suspend")) - ("/servers/password" ("/hurd/password")) - ("/servers/socket/1" ("/hurd/pflocal")) - ("/servers/socket/2" ("/hurd/pfinet" "--interface" "eth0" - "--address" "10.0.2.15" ;the default QEMU guest IP - "--netmask" "255.255.255.0" - "--gateway" "10.0.2.2" - "--ipv6" "/servers/socket/16")))) (display "Welcome, this is GNU's early boot Guile.\n") (display "Use '--repl' for an initrd REPL.\n\n") @@ -147,35 +265,13 @@ XXX TODO: use settrans/setxattr instead of MAKEDEV (call-with-error-handling (lambda () - (define (translated? node) - ;; Return true if a translator is installed on NODE. - (with-output-to-port (%make-void-port "w") - (lambda () - (with-error-to-port (%make-void-port "w") - (lambda () - (zero? (system* "showtrans" "--silent" node))))))) - (let* ((args (command-line)) (system (find-long-option "--system" args)) (to-load (find-long-option "--load" args))) - (format #t "Creating essential servers...\n") - (setenv "PATH" (string-append system "/profile/bin" - ":" system "/profile/sbin")) - (for-each (match-lambda - ((node command) - (unless (translated? node) - (mkdir-p (dirname node)) - (apply invoke "settrans" "--create" node command)))) - translators) - - (format #t "Creating essential device nodes...\n") - (with-directory-excursion "/dev" - (invoke "MAKEDEV" "--devdir=/dev" "std") - (invoke "MAKEDEV" "--devdir=/dev" "vcs") - (invoke "MAKEDEV" "--devdir=/dev" "tty1""tty2" "tty3" "tty4" "tty5" "tty6") - (invoke "MAKEDEV" "--devdir=/dev" "ptyp0" "ptyp1" "ptyp2") - (invoke "MAKEDEV" "--devdir=/dev" "console")) + (format #t "Setting-up essential translators...\n") + (setenv "PATH" (string-append system "/profile/bin")) + (set-hurd-device-translators) (false-if-exception (delete-file "/hurd")) (let ((hurd/hurd (readlink* (string-append system "/profile/hurd")))) From f25e8f76fec03e5a31c221e7427d6962ece1aa67 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 8 Jun 2020 12:25:24 +0200 Subject: [PATCH 198/241] hurd-boot: Use 'setxattr' instead of invoking settrans. Note: Using `getxattr' on the Hurd instead of running showtrans does not work (yet?). * gnu/build/hurd-boot.scm (setup-translator): Use 'setxattr' instead of invoking settrans. * gnu/system.scm (hurd-multiboot-modules): Add --x-xattr-translator-records to enable xattr-embedding of translators. --- gnu/build/hurd-boot.scm | 2 +- gnu/system.scm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index f4b6dc734d..aea2ac3307 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -144,7 +144,7 @@ set." (chmod port mode))))) (catch 'system-error (lambda _ - (apply invoke "settrans" "--create" file-name command)) + (setxattr file-name "gnu.translator" (string-join command "\0" 'suffix))) (lambda (key . args) (let ((errno (system-error-errno (cons key args)))) (format (current-error-port) "~a: ~a\n" diff --git a/gnu/system.scm b/gnu/system.scm index d51691fe76..25cc63a9df 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1191,6 +1191,7 @@ a list of , to populate the \"old entries\" menu." "--device-master-port='${device-port}'" "--exec-server-task='${exec-task}'" "--store-type=typed" + "--x-xattr-translator-records" "'${root}'" "'$(task-create)'" "'$(task-resume)'")) (target (%current-target-system)) (libc (if target From 748a167c81521e7e2fc57c2e51f48e4d90e4448b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 19 Jun 2020 11:49:31 +0200 Subject: [PATCH 199/241] gnu: sudo: Update to 1.9.1. * gnu/packages/admin.scm (sudo): Update to 1.9.1. --- 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 a1b84f70a4..de2f6534f8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1364,7 +1364,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.0") + (version "1.9.1") (source (origin (method url-fetch) (uri @@ -1374,7 +1374,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0p7r3cl16pjwbc48ff1gbhjw51lngrghvwblxz5lxpyzqlwi88xb")) + "1zxd6hxwhxqrm876wsn9bfajbfc4hc6l9ivzj5rjg80hzv71ch99")) (modules '((guix build utils))) (snippet '(begin From d72009bf0841b55e460bcc049e3723c3bd4f6603 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 19 Jun 2020 19:49:16 +0000 Subject: [PATCH 200/241] gnu: diffoscope: Update to 148. * gnu/packages/diffoscope (diffoscope): Update to 148. [arguments] Remove add-known-tools phase, fixed upstream. --- gnu/packages/diffoscope.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 51a1127783..f5387f8501 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "147") + (version "148") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0vfj9zv9mh9fffnm3h721yfkrkksv6667x6xjihvmfs8j9javgaz")))) + "0siv5z8iqgkzl51dmv69ifqids6hqmiir00yyl1aaqbginrwyhyv")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -92,12 +92,6 @@ (lambda _ (substitute* "setup.py" (("'python-magic',") "")))) - ;; Patch in support for known tools - (add-after 'unpack 'add-known-tools - (lambda _ - (substitute* "diffoscope/external_tools.py" - (("'debian': 'openssl'") - "'debian': 'openssl', 'guix': 'openssl'")))) ;; This test is broken because our `file` package has a ;; bug in berkeley-db file type detection. (add-after 'unpack 'remove-berkeley-test From aed0d0fd73b33824edfe3409fa7e2cbbdde6a6e1 Mon Sep 17 00:00:00 2001 From: Alex Sassmannshausen Date: Sat, 20 Jun 2020 11:58:03 +0200 Subject: [PATCH 201/241] gnu: guile-config: Update to 0.4.2. * gnu/packages/guile-xyz.scm (guile-config): Update to 0.4.2. --- 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 0942e7cf74..8386f9522e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1396,7 +1396,7 @@ PostgreSQL.") (define-public guile-config (package (name "guile-config") - (version "0.4.1") + (version "0.4.2") (source (origin (method git-fetch) @@ -1405,7 +1405,7 @@ PostgreSQL.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1c59ch96d5p4c7si8qp55fdc15375klf2hyh29y3ap8ahqx9pxqj")))) + "09028ylbddjdp3d67zdjz3pnsjqz6zs2bfck5rr3dfaa0qjap40n")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) From 4330cca8dea6319bf6dd2f13d396790bf845e01c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 20 Jun 2020 12:49:59 +0200 Subject: [PATCH 202/241] gnu: hydrogen: Update to 1.0.0-rc1. * gnu/packages/music.scm (hydrogen): Update to 1.0.0-rc1. --- 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 49f784f529..b5d275b660 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -503,7 +503,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (define-public hydrogen (package (name "hydrogen") - (version "1.0.0-beta2") + (version "1.0.0-rc1") (source (origin (method git-fetch) @@ -512,7 +512,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1s3jrdyjpm92flw9mkkxchnj0wz8nn1y1kifii8ws252iiqjya4a")))) + (base32 "1ibbdzyk30nj83jrq7py78hwpjgy0lq7ji6gi2pdp1pqzz1mqp0v")))) (build-system cmake-build-system) (arguments `(#:test-target "tests" From cdea526556b1d19e823fe6d5ec010a58278e25d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Jun 2020 01:09:03 +0200 Subject: [PATCH 203/241] doc: Make issues.guix.gnu.org more visible. * doc/contributing.texi (Tracking Bugs and Patches): Make issues.guix.gnu.org more visible, update issue URL. --- doc/contributing.texi | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 4d3b930177..2a73d2c47a 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1128,18 +1128,20 @@ browse issues: @itemize @item +@url{https://issues.guix.gnu.org} provides a pleasant +interface@footnote{The web interface at +@url{https://issues.guix.gnu.org} is powered by Mumi, a nice piece of +software written in Guile, and you can help! See +@url{https://git.elephly.net/gitweb.cgi?p=software/mumi.git}.} to browse +bug reports and patches, and to participate in discussions; +@item @url{https://bugs.gnu.org/guix} lists bug reports; @item @url{https://bugs.gnu.org/guix-patches} lists patch submissions. @end itemize -You can also access both of these @i{via} the (nicer) -@url{https://issues.guix.gnu.org} interface@footnote{The web interface -at @url{https://issues.guix.gnu.org} is powered by Mumi, a nice piece of -software written in Guile, and you can help! See -@url{https://git.elephly.net/gitweb.cgi?p=software/mumi.git}.}. To view -discussions related to issue number @var{n}, go to -@indicateurl{https://issues.guix.gnu.org/issue/@var{n}} or +To view discussions related to issue number @var{n}, go to +@indicateurl{https://issues.guix.gnu.org/@var{n}} or @indicateurl{https://bugs.gnu.org/@var{n}}. If you use Emacs, you may find it more convenient to interact with From 90f496be9ad53802fd260cac3840e7bae24a3e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Jun 2020 12:54:05 +0200 Subject: [PATCH 204/241] tests: Actually run 'tests/guix-environment-container.sh'. This test was skipped since the switch to Guile 3 because 'assert-container-features' would be inlined and thus accessing it with @@ would fail with an unbound-variable error. * guix/scripts/environment.scm (assert-container-features): Export. * tests/guix-environment-container.sh: Use single '@'. --- guix/scripts/environment.scm | 3 ++- tests/guix-environment-container.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 03f455ab7b..d3b8b57ccc 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -48,7 +48,8 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:use-module (srfi srfi-98) - #:export (guix-environment)) + #:export (assert-container-features + guix-environment)) ;; Protect some env vars from purification. Borrowed from nix-shell. (define %precious-variables diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index d313f2e734..45264d4978 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -24,7 +24,7 @@ set -e guix environment --version -if ! guile -c '((@@ (guix scripts environment) assert-container-features))' +if ! guile -c '((@ (guix scripts environment) assert-container-features))' then # User containers are not supported; skip this test. exit 77 From 7b06781a58326f251c4af6340379d68e3cb98adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Jun 2020 12:55:59 +0200 Subject: [PATCH 205/241] tests: Skip tests that requires gpg when gpg is unavailable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Partly fixes . Reported by Simen Endsjø . * tests/git-authenticate.scm ("signed commits, SHA1 signature"): Use 'gpg+git-available?' in skip guard. --- tests/git-authenticate.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm index a06176c16b..865481f7c5 100644 --- a/tests/git-authenticate.scm +++ b/tests/git-authenticate.scm @@ -56,7 +56,7 @@ #:keyring-reference "master") 'failed))))) -(unless (which (git-command)) (test-skip 1)) +(unless (which (gpg+git-available?)) (test-skip 1)) (test-assert "signed commits, SHA1 signature" (with-fresh-gnupg-setup (list %ed25519-public-key-file %ed25519-secret-key-file) From 13870bbe44b668ce08acc28722c0af186832497e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Jun 2020 13:17:31 +0200 Subject: [PATCH 206/241] news: Add 'fr' translation. * etc/news.scm: Add French translation. --- etc/news.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/etc/news.scm b/etc/news.scm index c51cae4292..62ec68bab2 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -15,7 +15,8 @@ (entry (commit "43badf261f4688c8a7a7a9004a4bff8acb205835") (title (en "@command{guix pull} authenticates channels") - (de "@command{guix pull} authentifiziert Kanäle")) + (de "@command{guix pull} authentifiziert Kanäle") + (fr "@command{guix pull} authentifie les canaux")) (body (en "The @command{guix pull} and @command{guix time-machine} commands now authenticate the source code that they pull, unless the new @@ -35,7 +36,17 @@ vor Versuchen, das Guix-Repository zu manipulieren oder bösartigen Code an die Nutzer auszuliefern. Diese Funktionalität ist auf den @code{guix}-Kanal beschränkt, sie wird jedoch -bald auch Autoren dritter Kanäle zur Verfügung stehen."))) +bald auch Autoren dritter Kanäle zur Verfügung stehen.") + (fr "Les commandes @command{guix pull} et @command{guix time-machine} +authentifient dorénavant le code source qu'elles obtiennent, à moins que la +nouvelle option @option{--disable-authentication} soit utilisée. Cela +signifie que Guix s'assure que chaque soumission (@i{commit}) récupéré dispose +d'une signature cryptographique par un·e développeur·euse autorisé·e. Cela te +protège de tentatives de modifications du dépôt Guix et de tentatives de +livrer du code malintentionné. + +Cette fonctionnalité n'est actuellement disponible que pour le canal +@code{guix} mais le sera bientôt pour les canaux tiers."))) (entry (commit "c924e541390f9595d819edc33c19d979917c15ec") (title (en "@command{guix repl} adds support for running Guile scripts") From ef6d3b643689953b71fe103e8c6f520b54996f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Mon, 1 Jun 2020 02:37:03 +0200 Subject: [PATCH 207/241] gnu: Add hashcash. * gnu/packages/networking.scm (hashcash): New variable. --- gnu/packages/networking.scm | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e8f398e521..1e6f70e1ff 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2019 Diego N. Barbato ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -3287,3 +3288,49 @@ CDP. The goal of LLDP is to provide an inter-vendor compatible mechanism to deliver Link-Layer notifications to adjacent network devices. @code{lldpd} is an implementation of LLDP. It also supports some proprietary protocols.") (license license:isc))) + +(define-public hashcash + (package + (name "hashcash") + (version "1.22") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.hashcash.org/source/hashcash-" + version ".tgz")) + (sha256 + (base32 + "15kqaimwb2y8wvzpn73021bvay9mz1gqqfc40gk4hj6f84nz34h1")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + ;; No tests available. + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((outdir (assoc-ref outputs "out")) + (bindir (string-append outdir "/bin")) + (mandir (string-append outdir "/share/man/man1")) + (docdir (string-append outdir "/share/doc/hashcash-" ,version))) + ;; Install manually, as we don't need the `sha1' binary + (install-file "hashcash" bindir) + (install-file "hashcash.1" mandir) + (install-file "README" docdir) + (install-file "LICENSE" docdir) + (install-file "CHANGELOG" docdir) + #t)))))) + (home-page "https://www.hashcash.org/") + (synopsis "Denial-of-service countermeasure") + (description "Hashcash is a proof-of-work algorithm, which has been used +as a denial-of-service countermeasure technique in a number of systems. + +A hashcash stamp constitutes a proof-of-work which takes a parametrizable +amount of work to compute for the sender. The recipient can verify received +hashcash stamps efficiently. + +This package contains a command-line tool for computing and verifying hashcash +stamps.") + (license license:public-domain))) From 7d80d795248b029183b27361e9ab4895079375f7 Mon Sep 17 00:00:00 2001 From: "LaFreniere, Joseph" Date: Fri, 2 Aug 2019 23:16:19 -0500 Subject: [PATCH 208/241] gnu: Add emacs-hyperbole. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-hyperbole): Add at 7.0.3 Signed-off-by: Jakub Kądziołka --- gnu/packages/emacs-xyz.scm | 68 +++++++++++++++ .../emacs-hyperbole-do-not-check-dir.patch | 24 ++++++ .../patches/emacs-hyperbole-domainname.patch | 29 +++++++ .../emacs-hyperbole-toggle-messaging.patch | 86 +++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch create mode 100644 gnu/packages/patches/emacs-hyperbole-domainname.patch create mode 100644 gnu/packages/patches/emacs-hyperbole-toggle-messaging.patch diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6537216935..0247874c04 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -250,6 +250,74 @@ using geiser.") (license license:bsd-3) (home-page "https://github.com/xiaohanyu/ac-geiser")))) +(define-public emacs-hyperbole + (package + (name "emacs-hyperbole") + (version "7.0.3") + (source (origin + (method url-fetch) + (uri (string-append + "http://ftpmirror.gnu.org/hyperbole/" + "hyperbole-" version ".tar.gz")) + (sha256 + (base32 + "0znsjhm0lmzpmkgfni4qzx4l6dp604bmrzp3mwxxax2v96wpwmcx")) + (patches + (search-patches + "emacs-hyperbole-do-not-check-dir.patch" + "emacs-hyperbole-domainname.patch" + "emacs-hyperbole-toggle-messaging.patch")))) + (build-system emacs-build-system) + (arguments + `(#:include '("DEMO" + "DEMO-ROLO.otl" + "HY-ABOUT" + "\\.el$" + "\\.info$" + "\\.kotl$") + #:phases + (modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (invoke "make" "info")))))) + (propagated-inputs `(("inetutils" ,inetutils))) + (home-page "https://www.gnu.org/software/hyperbole/") + (synopsis "The Everyday Hypertextual Information Manager") + (description + "GNU Hyperbole, or just Hyperbole, is an easy-to-use, yet powerful and +programmable hypertextual information management system implemented as a GNU +Emacs package. It offers rapid views and interlinking of all kinds of textual +information, utilizing Emacs for editing. It can dramatically increase your +productivity and greatly reduce the number of keyboard/mouse keys you'll need +to work efficiently. Hyperbole lets you: + +@itemize +@item Quickly create hyperlink buttons either from the keyboard or by dragging +between a source and destination window with a mouse button depressed. Later, +activate buttons by pressing/clicking on them or by giving the name of the +button. +@item Activate many kinds of \"implicit buttons\" recognized by context within +text buffers, e.g. URLs, grep output lines, and git commits. A single key or +mouse button automatically does the right thing in dozens of contexts; just +press and go. +@item Build outlines with multi-level numbered outline nodes, e.g. 1.4.8.6, +that all renumber automatically as any node or tree is moved in the outline. +Each node also has a permanent hyperlink anchor that you can reference from +any other node. +@item Manage all your contacts quickly with hierarchical categories and embed +hyperlinks within each entry. Or create an archive of documents with +hierarchical entries and use the same search mechanism to quickly find any +matching entry. +@item Use single keys to easily manage your Emacs windows or frames and +quickly retrieve saved window and frame configurations. +@item Search for things in your current buffers, in a directory tree or across +major web search engines with the touch of a few keys. +@end itemize + +The common thread in all these features is making retrieval, management and +display of information fast and easy. That is Hyperbole's purpose.") + (license license:gpl3+))) + (define-public emacs-paredit (package (name "emacs-paredit") diff --git a/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch b/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch new file mode 100644 index 0000000000..66c7a0fb08 --- /dev/null +++ b/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch @@ -0,0 +1,24 @@ +From 3016fbd61e47978be73bbbaf7a8c2709bec42066 Mon Sep 17 00:00:00 2001 +From: Joseph LaFreniere +Date: Fri, 12 Jul 2019 13:12:40 -0500 +Subject: [PATCH] Do not run hyperb:check-dir-user during initialization + +--- + hyperbole.el | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/hyperbole.el b/hyperbole.el +index 872dbaf..6edb2a7 100644 +--- a/hyperbole.el ++++ b/hyperbole.el +@@ -653,7 +653,6 @@ If FLAG is nil then text is shown, while if FLAG is t the text is hidden." + (interactive) + (message "Initializing Hyperbole...") + (run-hooks 'hyperbole-init-hook) +- (hyperb:check-dir-user) + (or (stringp hyperb:user-email) + (setq hyperb:user-email + (or (and (boundp 'user-mail-address) +-- +2.22.0 + diff --git a/gnu/packages/patches/emacs-hyperbole-domainname.patch b/gnu/packages/patches/emacs-hyperbole-domainname.patch new file mode 100644 index 0000000000..cf4b63b54b --- /dev/null +++ b/gnu/packages/patches/emacs-hyperbole-domainname.patch @@ -0,0 +1,29 @@ +From 17c87ac58ce6d475fa1987347fcb868ef7f75e40 Mon Sep 17 00:00:00 2001 +From: Joseph LaFreniere +Date: Sun, 2 Jun 2019 12:38:27 -0500 +Subject: [PATCH] Replace executable domainname with hostname + +Fixes build failure: +> ice-9/boot-9.scm:752:25: In procedure dispatch-exception: +> patch-el-files: unable to locate "domainname" +--- + hypb.el | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/hypb.el b/hypb.el +index 6abc17a..0332946 100644 +--- a/hypb.el ++++ b/hypb.el +@@ -183,8 +183,7 @@ Global keymap is used unless optional KEYMAP is given." + + (defun hypb:domain-name () + "Returns current Internet domain name with '@' prepended or nil if none." +- (let* ((dname-cmd (or (file-exists-p "/usr/bin/domainname") +- (file-exists-p "/bin/domainname"))) ++ (let* ((dname-cmd (file-exists-p "/bin/hostname")) + (dname (or (and (boundp 'message-user-fqdn) (stringp message-user-fqdn) + (string-match "\\." message-user-fqdn) + message-user-fqdn) +-- +2.21.0 + diff --git a/gnu/packages/patches/emacs-hyperbole-toggle-messaging.patch b/gnu/packages/patches/emacs-hyperbole-toggle-messaging.patch new file mode 100644 index 0000000000..ab66e1b389 --- /dev/null +++ b/gnu/packages/patches/emacs-hyperbole-toggle-messaging.patch @@ -0,0 +1,86 @@ +From 6d5c587ec719e3309077c7d637b03b13db65c047 Mon Sep 17 00:00:00 2001 +From: Joseph LaFreniere +Date: Fri, 12 Jul 2019 12:43:46 -0500 +Subject: [PATCH] Move definition of hyperbole-toggle-messaging to hsettings + +--- + hsettings.el | 25 +++++++++++++++++++++++++ + hyperbole.el | 26 -------------------------- + 2 files changed, 25 insertions(+), 26 deletions(-) + +diff --git a/hsettings.el b/hsettings.el +index 6cdd1b8..9632067 100644 +--- a/hsettings.el ++++ b/hsettings.el +@@ -163,6 +163,31 @@ package to display search results." + search-term))) + (user-error "(Hyperbole): Invalid web search service `%s'" service-name)))) + ++;;;###autoload ++(defun hyperbole-toggle-messaging (&optional arg) ++ "Toggle Hyperbole support for explicit buttons in mail and news buffers. ++Toggles the boolean variable `inhibit-hyperbole-messaging’ and either ++adds hooks (nil value) or removes them (t value). ++ ++With optional prefix ARG > 0, enables support. If ARG <= 0, ++disables/inhibits support." ++ (interactive "P") ++ (setq inhibit-hyperbole-messaging (if (null arg) ++ (not inhibit-hyperbole-messaging) ++ (<= (prefix-numeric-value arg) 0))) ++ (if inhibit-hyperbole-messaging ++ (var:remove-all) ++ (var:append-all) ++ ;; Add any hooks that were skipped when inhibit-hyperbole-messaging ++ ;; was nil. ++ (cond ((boundp 'hyperbole-loading)) ++ ((not after-init-time) ++ (add-hook 'after-init-hook (lambda () (load "hyperbole")))) ++ (t (load "hyperbole")))) ++ (if (called-interactively-p 'interactive) ++ (message "Hyperbole messaging button support is %s" ++ (if inhibit-hyperbole-messaging "disabled" "enabled")))) ++ + (defcustom inhibit-hyperbole-messaging t + "*Determines whether Hyperbole supports explicit buttons in mail and news buffers. + The default of t means disable such support (work remains to +diff --git a/hyperbole.el b/hyperbole.el +index 4aa427d..872dbaf 100644 +--- a/hyperbole.el ++++ b/hyperbole.el +@@ -121,32 +121,6 @@ + t))) + (error "(Hyperbole): Startup failure: `hyperb:dir' must be manually added to `load-path' to fix."))) + +-;; This must be defined before the defcustom `inhbit-hyperbole-messaging'. +-;;;###autoload +-(defun hyperbole-toggle-messaging (&optional arg) +- "Toggle Hyperbole support for explicit buttons in mail and news buffers. +-Toggles the boolean variable `inhibit-hyperbole-messaging’ and either +-adds hooks (nil value) or removes them (t value). +- +-With optional prefix ARG > 0, enables support. If ARG <= 0, +-disables/inhibits support." +- (interactive "P") +- (setq inhibit-hyperbole-messaging (if (null arg) +- (not inhibit-hyperbole-messaging) +- (<= (prefix-numeric-value arg) 0))) +- (if inhibit-hyperbole-messaging +- (var:remove-all) +- (var:append-all) +- ;; Add any hooks that were skipped when inhibit-hyperbole-messaging +- ;; was nil. +- (cond ((boundp 'hyperbole-loading)) +- ((not after-init-time) +- (add-hook 'after-init-hook (lambda () (load "hyperbole")))) +- (t (load "hyperbole")))) +- (if (called-interactively-p 'interactive) +- (message "Hyperbole messaging button support is %s" +- (if inhibit-hyperbole-messaging "disabled" "enabled")))) +- + (defgroup hyperbole-koutliner nil + "Hyperbole multi-level autonumbered outliner customizations." + :group 'hyperbole) +-- +2.22.0 + From 85621248621f9ee1d14ae72cd85c60fa0bddd969 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 20 Jun 2020 17:21:09 -0400 Subject: [PATCH 209/241] gnu: Mutt: Update to 1.14.4. * gnu/packages/mail.scm (mutt): Update to 1.14.4. --- 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 9c9ccf9785..87388747e4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -421,7 +421,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.14.3") + (version "1.14.4") (source (origin (method url-fetch) (uri (list @@ -431,7 +431,7 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "0wd4cv1c9hqymvml979g607nh3xxmlyx1ifc4r4qf39v6grnsmdi")) + "1hykkq3m7kqic5r7vzg45xaww7415fv5i2d03slzykqb47w5d3na")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs From 50e7e6a065dbf463aa7f56e852f4bc8aab55c4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Jun 2020 22:56:08 +0200 Subject: [PATCH 210/241] build-system/gnu: Cross builds properly handle #:allowed-references & co. Fixes . * guix/build-system/gnu.scm (gnu-cross-build)[canonicalize-reference]: Pass TARGET and SYSTEM to 'package-cross-derivation'. --- guix/build-system/gnu.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 60851c5897..6b481ad45c 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -513,9 +513,11 @@ platform." (define canonicalize-reference (match-lambda ((? package? p) - (derivation->output-path (package-cross-derivation store p system))) + (derivation->output-path (package-cross-derivation store p + target system))) (((? package? p) output) - (derivation->output-path (package-cross-derivation store p system) + (derivation->output-path (package-cross-derivation store p + target system) output)) ((? string? output) output))) From 9ee8b41f2b9cf9e9f1db4be96bb57d2dc4ec3628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Jun 2020 23:09:31 +0200 Subject: [PATCH 211/241] gnu: gnutls: Leave #:disallowed-references empty for GNU/Hurd. Partly fixes . This is a followup to a9bcc6474667d6699500f03d69f9c8212a50d711. * gnu/packages/tls.scm (gnutls)[arguments]: Let #:disallowed-references empty when 'hurd-target?' returns true. --- gnu/packages/tls.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ec401416ce..d9c8e7a15e 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -184,7 +184,7 @@ living in the same process.") (arguments `(,@(if (hurd-target?) '(#:tests? #f) '()) ; Ensure we don't keep a reference to this buggy software. - #:disallowed-references (,net-tools) + #:disallowed-references ,(if (hurd-target?) '() (list net-tools)) #:configure-flags (list ;; GnuTLS doesn't consult any environment variables to specify From 9015ed66880497ed88854551eca0510a734fe8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 20 Jun 2020 23:11:54 +0200 Subject: [PATCH 212/241] gnu: gnutls: Pass #:tests? unconditionally. * gnu/packages/tls.scm (gnutls)[arguments]: Add #:tests? unconditionally. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d9c8e7a15e..37f62c95bf 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -182,8 +182,8 @@ living in the same process.") "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z")))) (build-system gnu-build-system) (arguments - `(,@(if (hurd-target?) '(#:tests? #f) '()) - ; Ensure we don't keep a reference to this buggy software. + `(#:tests? ,(not (hurd-target?)) + ;; Ensure we don't keep a reference to net-tools. #:disallowed-references ,(if (hurd-target?) '() (list net-tools)) #:configure-flags (list From 915d898f1502e64fd59e7948dbbb6cd708012f8d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 20 Jun 2020 23:41:45 +0200 Subject: [PATCH 213/241] gnu: emacs-hyperbole: Update to 7.0.6. * gnu/packages/emacs-xyz.scm (emacs-hyperbole): Update to 7.0.6. [source]: Use GNU ELPA URL. Remove some patches. [arguments]: Add phase. * gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch: Delete file. * gnu/packages/patches/emacs-hyperbole-domainname.patch: Delete file. * gnu/local.mk: Register sole patch. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 37 ++++++++++--------- .../emacs-hyperbole-do-not-check-dir.patch | 24 ------------ .../patches/emacs-hyperbole-domainname.patch | 29 --------------- 4 files changed, 21 insertions(+), 70 deletions(-) delete mode 100644 gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch delete mode 100644 gnu/packages/patches/emacs-hyperbole-domainname.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd3cc88af5..090d0eec36 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -891,6 +891,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-hyperbole-toggle-messaging.patch \ %D%/packages/patches/emacs-libgit-use-system-libgit2.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0247874c04..b6696d28f2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -253,20 +253,16 @@ using geiser.") (define-public emacs-hyperbole (package (name "emacs-hyperbole") - (version "7.0.3") - (source (origin - (method url-fetch) - (uri (string-append - "http://ftpmirror.gnu.org/hyperbole/" - "hyperbole-" version ".tar.gz")) - (sha256 - (base32 - "0znsjhm0lmzpmkgfni4qzx4l6dp604bmrzp3mwxxax2v96wpwmcx")) - (patches - (search-patches - "emacs-hyperbole-do-not-check-dir.patch" - "emacs-hyperbole-domainname.patch" - "emacs-hyperbole-toggle-messaging.patch")))) + (version "7.0.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "hyperbole-" version ".tar")) + (sha256 + (base32 "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab")) + (patches + (search-patches "emacs-hyperbole-toggle-messaging.patch")))) (build-system emacs-build-system) (arguments `(#:include '("DEMO" @@ -277,10 +273,17 @@ using geiser.") "\\.kotl$") #:phases (modify-phases %standard-phases - (add-before 'install 'make-info + ;; Fix build issues about missing "domainname" and "hpmap:dir-user" + ;; parent dir. + (add-after 'unpack 'fix-build (lambda _ - (invoke "make" "info")))))) - (propagated-inputs `(("inetutils" ,inetutils))) + (substitute* "hypb.el" + (("(/usr)?/bin/domainname") "/bin/hostname")) + (substitute* "hyperbole.el" + (("\\(hyperb:check-dir-user\\)") "")) + #t))))) + (propagated-inputs + `(("inetutils" ,inetutils))) ;for hostname (home-page "https://www.gnu.org/software/hyperbole/") (synopsis "The Everyday Hypertextual Information Manager") (description diff --git a/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch b/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch deleted file mode 100644 index 66c7a0fb08..0000000000 --- a/gnu/packages/patches/emacs-hyperbole-do-not-check-dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3016fbd61e47978be73bbbaf7a8c2709bec42066 Mon Sep 17 00:00:00 2001 -From: Joseph LaFreniere -Date: Fri, 12 Jul 2019 13:12:40 -0500 -Subject: [PATCH] Do not run hyperb:check-dir-user during initialization - ---- - hyperbole.el | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/hyperbole.el b/hyperbole.el -index 872dbaf..6edb2a7 100644 ---- a/hyperbole.el -+++ b/hyperbole.el -@@ -653,7 +653,6 @@ If FLAG is nil then text is shown, while if FLAG is t the text is hidden." - (interactive) - (message "Initializing Hyperbole...") - (run-hooks 'hyperbole-init-hook) -- (hyperb:check-dir-user) - (or (stringp hyperb:user-email) - (setq hyperb:user-email - (or (and (boundp 'user-mail-address) --- -2.22.0 - diff --git a/gnu/packages/patches/emacs-hyperbole-domainname.patch b/gnu/packages/patches/emacs-hyperbole-domainname.patch deleted file mode 100644 index cf4b63b54b..0000000000 --- a/gnu/packages/patches/emacs-hyperbole-domainname.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 17c87ac58ce6d475fa1987347fcb868ef7f75e40 Mon Sep 17 00:00:00 2001 -From: Joseph LaFreniere -Date: Sun, 2 Jun 2019 12:38:27 -0500 -Subject: [PATCH] Replace executable domainname with hostname - -Fixes build failure: -> ice-9/boot-9.scm:752:25: In procedure dispatch-exception: -> patch-el-files: unable to locate "domainname" ---- - hypb.el | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/hypb.el b/hypb.el -index 6abc17a..0332946 100644 ---- a/hypb.el -+++ b/hypb.el -@@ -183,8 +183,7 @@ Global keymap is used unless optional KEYMAP is given." - - (defun hypb:domain-name () - "Returns current Internet domain name with '@' prepended or nil if none." -- (let* ((dname-cmd (or (file-exists-p "/usr/bin/domainname") -- (file-exists-p "/bin/domainname"))) -+ (let* ((dname-cmd (file-exists-p "/bin/hostname")) - (dname (or (and (boundp 'message-user-fqdn) (stringp message-user-fqdn) - (string-match "\\." message-user-fqdn) - message-user-fqdn) --- -2.21.0 - From 377a5f65edd370ceae32a268c953a94f83ca5155 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Jun 2020 19:02:44 +0200 Subject: [PATCH 214/241] gnu: emacs-magit: Update to 0746bf1b. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 0746bf1b. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b6696d28f2..a4f26ed3c0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -40,7 +40,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms -;;; Copyright © 2018, 2019 Pierre Langlois +;;; Copyright © 2018, 2019, 2020 Pierre Langlois ;;; Copyright © 2018, 2019, 2020 Brett Gilio ;;; Copyright © 2019, 2020 Dimakakos Dimos ;;; Copyright © 2019, 2020 Brian Leung @@ -470,10 +470,10 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (define-public emacs-magit ;; There hasn't been an official release since 2018-11-16. - (let ((commit "d05545ec2fd7edf915eaf1b9c15c785bb08975cc")) + (let ((commit "0746bf1bacfe896d3917ccc19c7fb9d95c18b1e9")) (package (name "emacs-magit") - (version (git-version "2.90.1" "4" commit)) + (version (git-version "2.90.1" "5" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -482,7 +482,7 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (file-name (git-file-name name version)) (sha256 (base32 - "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg")))) + "1sgdygr81s2qxq2ahf998hl89qrb0r2wbgnsiz3hdda1431p0wzg")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs-no-x ;module support is required From a70e2f0f0742f3af81e9dc9e00f3813290702bff Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Jun 2020 00:13:38 +0200 Subject: [PATCH 215/241] gnu: emacs-hyperbole: Use inputs instead of propagated inputs. * gnu/packages/emacs-xyz.scm (emacs-hyperbole)[arguments]: Replace domainname with dnsdomainname, not hostname. [propagated-inputs]: move to... [inputs]: ...this. --- gnu/packages/emacs-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a4f26ed3c0..32d905aa80 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -276,14 +276,16 @@ using geiser.") ;; Fix build issues about missing "domainname" and "hpmap:dir-user" ;; parent dir. (add-after 'unpack 'fix-build - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "hypb.el" - (("(/usr)?/bin/domainname") "/bin/hostname")) + (("/bin/domainname") + (string-append (assoc-ref inputs "inetutils") + "/bin/dnsdomainname"))) (substitute* "hyperbole.el" (("\\(hyperb:check-dir-user\\)") "")) #t))))) - (propagated-inputs - `(("inetutils" ,inetutils))) ;for hostname + (inputs + `(("inetutils" ,inetutils))) (home-page "https://www.gnu.org/software/hyperbole/") (synopsis "The Everyday Hypertextual Information Manager") (description From fb5296605e84a09764c7428e778c54af5033b722 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Jun 2020 00:45:08 +0200 Subject: [PATCH 216/241] gnu: xmoto: Update to 0.6.0-0-f7ca787. * gnu/packages/games.scm (xmoto): Update to 0.6.0-0-f7ca787. [source]: Remove patches. [arguments]: Remove make-flags keyword. * gnu/packages/patches/xmoto-remove-glext.patch: * gnu/packages/patches/xmoto-reproducible.patch: * gnu/packages/patches/xmoto-utf8.patch: Delete files. * gnu/local.mk: Register previous deletions. --- gnu/local.mk | 3 - gnu/packages/games.scm | 187 ++++++++++-------- gnu/packages/patches/xmoto-remove-glext.patch | 23 --- gnu/packages/patches/xmoto-reproducible.patch | 24 --- gnu/packages/patches/xmoto-utf8.patch | 16 -- 5 files changed, 104 insertions(+), 149 deletions(-) delete mode 100644 gnu/packages/patches/xmoto-remove-glext.patch delete mode 100644 gnu/packages/patches/xmoto-reproducible.patch delete mode 100644 gnu/packages/patches/xmoto-utf8.patch diff --git a/gnu/local.mk b/gnu/local.mk index 090d0eec36..347d4bbb17 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1609,9 +1609,6 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ - %D%/packages/patches/xmoto-utf8.patch \ - %D%/packages/patches/xmoto-remove-glext.patch \ - %D%/packages/patches/xmoto-reproducible.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ %D%/packages/patches/xplanet-1.3.1-libimage_gif.c.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 39669ba1c9..d01d3fc8d9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10420,89 +10420,110 @@ This package is part of the KDE games module.") (license (list license:gpl2+ license:fdl1.2+)))) (define-public xmoto - (package - (name "xmoto") - (version "0.5.11") - (source - (origin - (method url-fetch) - (uri (string-append - "http://download.tuxfamily.org/xmoto/xmoto/" version "/" - "xmoto-" version "-src.tar.gz")) - (sha256 - (base32 "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155")) - (patches - (search-patches - "xmoto-remove-glext.patch" ;fixes licensing issue - "xmoto-reproducible.patch" - "xmoto-utf8.patch")) - ;; Unbundle ODE. - (modules '((guix build utils))) - (snippet - `(begin - (delete-file-recursively "src/ode") - #t)))) - (build-system gnu-build-system) - (arguments - ;; XXX: First flag prevents a build error with GCC7+. The second - ;; flag works around missing text in game. Both are fixed - ;; upstream. Remove once xmoto 0.5.12+ is released. - `(#:make-flags '("CXXFLAGS=-fpermissive -D_GLIBCXX_USE_CXX11_ABI=0") - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (apps (string-append out "/share/applications")) - (pixmaps (string-append out "/share/pixmaps"))) - (install-file "extra/xmoto.desktop" apps) - (install-file "extra/xmoto.xpm" pixmaps) - #t))) - (add-after 'install-desktop-file 'install-fonts - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((font-dir (string-append (assoc-ref inputs "font-dejavu") - "/share/fonts/truetype/")) - (target-dir (string-append (assoc-ref outputs "out") - "/share/xmoto/Textures/Fonts/"))) - (for-each (lambda (f) - (let ((font (string-append font-dir f)) - (target (string-append target-dir f))) - (delete-file target) - (symlink font target))) - '("DejaVuSans.ttf" "DejaVuSansMono.ttf")) - #t))) - (add-after 'install-fonts 'install-man-page - (lambda* (#:key outputs #:allow-other-keys) - (install-file "xmoto.6" - (string-append (assoc-ref outputs "out") - "/share/man/man6")) - #t))))) - (native-inputs - `(("gettext" ,gettext-minimal))) - (inputs - `(("curl" ,curl) - ("font-dejavu" ,font-dejavu) - ("glu" ,glu) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxdg-basedir" ,libxdg-basedir) - ("libxml2" ,libxml2) - ("lua" ,lua-5.2) - ("ode" ,ode) - ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) - ("sqlite" ,sqlite) - ("zlib" ,zlib))) - (home-page "https://xmoto.tuxfamily.org/") - (synopsis "2D motocross platform game") - (description "X-Moto is a challenging 2D motocross platform game, where -physics play an all important role in the gameplay. You need to control your -bike to its limit, if you want to have a chance finishing the more difficult -challenges.") - (license (list license:gpl2+ ;whole project - license:bsd-4 ;src/bzip - license:bsd-3 ;src/md5sum - license:lgpl2.1+ ;src/iqsort.h - license:expat)))) + ;; The commit below includes a fix to a build error. + (let ((commit "f7ca787d02bd876c6eb989a28b180a05220621ee") + (revision "0")) + (package + (name "xmoto") + (version (git-version "0.6.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xmoto/xmoto.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kiwqni58vjdqfb289d1dqcb758hdl2k970dawxq5vdaqrbnsxv4")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + ;; XXX: Remove some bundled libraries. Guix provides + ;; Chipmunk, but it appears to be incompatible with the + ;; (older) one bundled. Likewise, Guix provides ODE, but + ;; using it induces rendering issues. Eventually, libccd is + ;; required to compile built-in ODE. + (snippet + `(begin + (let ((keep '("chipmunk" "glad" "libccd" "md5sum" "ode"))) + (with-directory-excursion "vendor" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep)))) + (substitute* "src/CMakeLists.txt" + (("add_subdirectory\\(.*?/vendor/(.+?)\".*" line library) + (if (member library keep) line "")))) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + ;; Install phase ignores this man page. Install it early, + ;; because the process moves to another directory shortly + ;; after. + (add-after 'unpack 'install-man-page + (lambda* (#:key outputs #:allow-other-keys) + (install-file "xmoto.6" + (string-append (assoc-ref outputs "out") + "/share/man/man6")) + #t)) + (add-after 'unpack 'fix-hard-coded-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/common/VFileIO.cpp" + (("/usr/share") + (string-append (assoc-ref outputs "out") "/share"))) + #t)) + (add-before 'build 'set-SDL + ;; Set correct environment for SDL. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append + (assoc-ref inputs "sdl") "/include/SDL:" + (or (getenv "CPATH") ""))) + #t)) + (add-after 'install 'unbundle-fonts + ;; Unbundle DejaVuSans TTF files. + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((font-dir (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/")) + (target-dir (string-append (assoc-ref outputs "out") + "/share/xmoto/Textures/Fonts/"))) + (for-each (lambda (f) + (let ((font (string-append font-dir f)) + (target (string-append target-dir f))) + (delete-file target) + (symlink font target))) + '("DejaVuSans.ttf" "DejaVuSansMono.ttf")) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("bzip2" ,bzip2) + ("curl" ,curl) + ("font-dejavu" ,font-dejavu) + ("glu" ,glu) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libxdg-basedir" ,libxdg-basedir) + ("libxml2" ,libxml2) + ("lua" ,lua-5.1) + ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://xmoto.tuxfamily.org/") + (synopsis "2D motocross platform game") + (description + "X-Moto is a challenging 2D motocross platform game, where +physics play an all important role in the gameplay. You need to +control your bike to its limit, if you want to have a chance finishing +the more difficult challenges.") + (license (list license:gpl2+ ;whole project + license:bsd-3 ;vendor/md5sum + license:lgpl2.1+ + license:expat))))) (define-public eboard (package diff --git a/gnu/packages/patches/xmoto-remove-glext.patch b/gnu/packages/patches/xmoto-remove-glext.patch deleted file mode 100644 index ad0c848d1d..0000000000 --- a/gnu/packages/patches/xmoto-remove-glext.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Allow building without upstream-supplied glext.h -Author: Stephen Kitt -Bug: http://todo.xmoto.tuxfamily.org/index.php?do=details&task_id=803 - ---- xmoto-0.5.9+dfsg.orig/src/include/xm_OpenGL.h -+++ xmoto-0.5.9+dfsg/src/include/xm_OpenGL.h -@@ -1,7 +1,6 @@ - #ifdef ENABLE_OPENGL - /* Pull in OpenGL headers */ - /* following scissored from SDL_opengl.h */ --#define __glext_h_ /* Don't let gl.h include glext.h */ - #ifdef HAVE_APPLE_OPENGL_FRAMEWORK - #include /* Header File For The OpenGL Library */ - #include /* Header File For The GLU Library */ -@@ -12,8 +11,5 @@ - #include /* Header File For The OpenGL Library */ - #include /* Header File For The GLU Library */ - #endif --#undef __glext_h_ -- --#include "../glext.h" - - #endif diff --git a/gnu/packages/patches/xmoto-reproducible.patch b/gnu/packages/patches/xmoto-reproducible.patch deleted file mode 100644 index 606f4ec714..0000000000 --- a/gnu/packages/patches/xmoto-reproducible.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Avoid __DATE__ and __TIME__ to build reproducibly -Author: Stephen Kitt - ---- a/src/GameInit.cpp -+++ b/src/GameInit.cpp -@@ -248,7 +248,6 @@ - Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */ - - LogInfo(std::string("X-Moto " + XMBuild::getVersionString(true)).c_str()); -- LogInfo("compiled at "__DATE__" "__TIME__); - if(SwapEndian::bigendien) { - LogInfo("Systeme is bigendien"); - } else { ---- a/src/states/StateOptions.cpp -+++ b/src/states/StateOptions.cpp -@@ -1233,8 +1233,6 @@ - int p=25; - makeWindowOptions_infos_line(v_window, "Version", "X-Moto " + XMBuild::getVersionString(true), p); - p+=20; -- makeWindowOptions_infos_line(v_window, "Compilation date", __DATE__ " " __TIME__, p); -- p+=20; - makeWindowOptions_infos_line(v_window, "User data directory", XMFS::getUserDir(FDT_DATA), p); - p+=20; - makeWindowOptions_infos_line(v_window, "User config directory", XMFS::getUserDir(FDT_CONFIG), p); diff --git a/gnu/packages/patches/xmoto-utf8.patch b/gnu/packages/patches/xmoto-utf8.patch deleted file mode 100644 index e5d0dfb2a4..0000000000 --- a/gnu/packages/patches/xmoto-utf8.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Build with g++'s new utf8.h -Author: Stephen Kitt - ---- a/src/helpers/utf8.h -+++ b/src/helpers/utf8.h -@@ -18,8 +18,8 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - =============================================================================*/ - --#ifndef __UTF8_H__ --#define __UTF8_H__ -+#ifndef __XMOTO_UTF8_H__ -+#define __XMOTO_UTF8_H__ - - #include - #include From 027285691ae2ac1806cbf19bbdcf9b6e2dd451ff Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Jun 2020 01:47:05 +0200 Subject: [PATCH 217/241] gnu: xmoto: Unbundle ODE and libccd. * gnu/packages/games.scm (xmoto): Unbundle ODE and libccd. [inputs]: Add ode. --- gnu/packages/games.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d01d3fc8d9..76ddbabc2e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10438,14 +10438,11 @@ This package is part of the KDE games module.") (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) - ;; XXX: Remove some bundled libraries. Guix provides - ;; Chipmunk, but it appears to be incompatible with the - ;; (older) one bundled. Likewise, Guix provides ODE, but - ;; using it induces rendering issues. Eventually, libccd is - ;; required to compile built-in ODE. + ;; XXX: Remove some bundled libraries. Guix provides Chipmunk, but + ;; it appears to be incompatible with the (older) one bundled. (snippet `(begin - (let ((keep '("chipmunk" "glad" "libccd" "md5sum" "ode"))) + (let ((keep '("chipmunk" "glad" "md5sum"))) (with-directory-excursion "vendor" (for-each delete-file-recursively (lset-difference string=? @@ -10510,6 +10507,7 @@ This package is part of the KDE games module.") ("libxdg-basedir" ,libxdg-basedir) ("libxml2" ,libxml2) ("lua" ,lua-5.1) + ("ode" ,ode) ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) ("sqlite" ,sqlite) ("zlib" ,zlib))) From f6c6970e0dbebb7cac679f46656c2655dfe532c2 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sun, 21 Jun 2020 11:23:22 +0800 Subject: [PATCH 218/241] system: Add 'sg' and 'newgrp' to %SETUID-PROGRAMS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system.scm (%setuid-programs): Add 'sg' and 'newgrp'. Signed-off-by: 宋文武 --- gnu/system.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/system.scm b/gnu/system.scm index 25cc63a9df..44baacee7b 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -941,7 +941,9 @@ use 'plain-file' instead~%") ;; Default set of setuid-root programs. (let ((shadow (@ (gnu packages admin) shadow))) (list (file-append shadow "/bin/passwd") + (file-append shadow "/bin/sg") (file-append shadow "/bin/su") + (file-append shadow "/bin/newgrp") (file-append shadow "/bin/newuidmap") (file-append shadow "/bin/newgidmap") (file-append inetutils "/bin/ping") From 11fab4a85adbd902e15ba51f2eb6c2f3057725fb Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Jun 2020 11:38:20 +0800 Subject: [PATCH 219/241] gnu: emacs-hy-mode: Update to 1.0.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-hy-mode): Update to 1.0.4. Signed-off-by: 宋文武 --- 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 32d905aa80..b621c24dc5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14621,7 +14621,7 @@ documentation.") (define-public emacs-hy-mode (package (name "emacs-hy-mode") - (version "1.0.3") + (version "1.0.4") (source (origin (method git-fetch) @@ -14630,7 +14630,7 @@ documentation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jxximiznz7fw9ys5k6plw85zrbzvxidql7py1fdi425fdp4058z")))) + (base32 "0gihxlmfminadaqdr8d2zccd7wwygl3m0gfzxsk5izi7f8hl4w7f")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) From 292b26d4e598ba00d88f9a0498acc359ea338326 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 17 Jun 2020 19:40:43 -0400 Subject: [PATCH 220/241] gnu: git-annex: Update to 8.20200617. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20200617. Signed-off-by: Efraim Flashner --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index a453ba168c..f8bee424c3 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -341,14 +341,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20200522") + (version "8.20200617") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1v71k5k9mcj1nq4pb8apx99rgw2rmckr6yshhvjl1dr6j70d67x8")))) + (base32 "1vgpqbscvxm03ibxy6cjnp9vd1wpsr3gkajp4z3m9nnkmjz5r4q4")))) (build-system haskell-build-system) (arguments `(#:configure-flags From 512d23c65d82bb874ca1fb3c12095b1cec8bbfca Mon Sep 17 00:00:00 2001 From: "B. Wilson" Date: Fri, 19 Jun 2020 23:08:40 +0900 Subject: [PATCH 221/241] gnu: Add poke. * gnu/packages/engineering.scm (poke): New variable. * gnu/packages/bison.scm (bison-3.6): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/bison.scm | 13 +++++++ gnu/packages/engineering.scm | 68 ++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index ae8d1a141b..63b14c7059 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2015, 2019 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2020 B. Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +65,18 @@ grammar. It is versatile enough to have many applications, from parsers for simple tools through complex programming languages.") (license gpl3+))) +(define-public bison-3.6 + (package + (inherit bison) + (name "bison-3.6") + (version "3.6.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/bison/bison-" version ".tar.xz")) + (sha256 + (base32 "0gdpnjh6ra9xa9vj6hzjdf0c04x4pjyy8vssm3qdb7fya4v7knq6")))))) + (define-public bison-3.0 (package (inherit bison) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index edbaa5bf63..f2d32e663f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2020 B. Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bdw-gc) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -61,6 +63,7 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages dejagnu) #:use-module (gnu packages digest) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) @@ -85,8 +88,10 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) ;FIXME: for pcb + #:use-module (gnu packages lisp) #:use-module (gnu packages m4) #:use-module (gnu packages maths) + #:use-module (gnu packages man) #:use-module (gnu packages multiprecision) #:use-module (gnu packages mpi) #:use-module (gnu packages ncurses) @@ -103,6 +108,7 @@ #:use-module (gnu packages tls) #:use-module (gnu packages tex) #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) #:use-module (gnu packages openkinect) @@ -2676,3 +2682,65 @@ proper, a versatile program with a graphical user interface, and meshlabserver, a program that can perform mesh processing tasks in batch mode, without a GUI.") (license license:gpl3+))) + +(define-public poke + ;; Upstream has yet to tag any releases. + (let ((commit "d33317a46e3b7c48130a471a48cbfea1abab70d8") + (revision "0")) + (package + (name "poke") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.savannah.gnu.org/poke.git") + (commit commit) + (recursive? #t))) + (sha256 + (base32 "1dd0r1x123bqi78lrsk58rvg9c9wka0kywdyzn7g3i4hkh54xb7d")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + ;; The GUI, which we elide, requires tcl and tk. + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ;; Requires bison 3.6+ but we currently only have 3.5. + ;; Bison 3.6 will be available in the next core update. + ("bison-3.6" ,bison-3.6) + ("clisp" ,clisp) + ("dejagnu" ,dejagnu) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("help2man" ,help2man) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-2" ,python-2) + ("python-3" ,python-3) + ("texinfo" ,texinfo))) + ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged). + ;; FIXME: A "hyperlinks-capable" `libtexststyle' needed for the hserver. + (inputs `(("json-c" ,json-c) + ("libgc" ,libgc) + ("readline" ,readline))) + (arguments + ;; To build the GUI, add the `--enable-gui' configure flag. + ;; To enable the "hyperlink server", add the `--enable-hserver' flag. + `(#:configure-flags '("--enable-mi") + #:phases (modify-phases %standard-phases + ;; This is a non-trivial bootstrap that needs many of the + ;; native-inputs and thus must run after `patch-shebangs'. + (delete 'bootstrap) + (add-after 'patch-source-shebangs 'bootstrap + (lambda _ + (invoke "./bootstrap" "--no-git" + "--no-bootstrap-sync" + "--gnulib-srcdir=gnulib") + #t))))) + (home-page "http://jemarch.net/poke.html") + (synopsis "Interactive, extensible editor for binary data") + (description "GNU poke is an interactive, extensible editor for binary + data. Not limited to editing basic entities such as bits and bytes, it + provides a full-fledged procedural, interactive programming language designed + to describe data structures and to operate on them.") + (license license:gpl3+)))) From b7249aa4726193653e05e694ec4bb311aa4ec6c2 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 20 Jun 2020 10:04:30 +0200 Subject: [PATCH 222/241] services: childhurd: Support more than one instance. * gnu/services/virtualization.scm ()[options]: Remove "--hda" option. [id,net-options]: New fields. (hurd-vm-net-options): New procedure. Parameterize port forwarding with ID. * gnu/services/virtualization.scm (hurd-vm-shepherd-service): Use them. Parameterize provision with ID, if set. Hardcode "--hda" option for image. * doc/guix.texi (Virtualization Services): Document new fields. Update for hardcoding of "--hda". --- doc/guix.texi | 35 ++++++++++++++++++++------- gnu/services/virtualization.scm | 43 ++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2268e159a2..5b854ccbd4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24728,12 +24728,31 @@ The size of the disk image. @item @code{memory-size} (default: @code{512}) The memory size of the Virtual Machine in mebibytes. -@item @code{options} (default: @code{'("--device"} @code{"rtl8139,netdev=net0"} @ - @code{"--netdev"} @ - @code{"user,id=net0,hostfwd=tcp:127.0.0.1:20022-:2222,hostfwd=tcp:127.0.0.1:25900-:5900"} @ - @code{"--snapshot"} @ - @code{"--hda")}) +@item @code{options} (default: @code{'("--snapshot")}) The extra options for running QEMU. + +@item @code{id} (default: @code{#f}) +If set, a non-zero positive integer used to parameterize Childhurd +instances. It is appended to the service's name, +e.g. @code{childhurd1}. + +@item @code{net-options} (default: @var{hurd-vm-net-options}) +The procedure used to produce the list of QEMU networking options. + +By default, it produces + +@lisp +'("--device" "rtl8139,netdev=net0" + "--netdev" "user,id=net0\ + ,hostfwd=tcp:127.0.0.1:-:2222\ + ,hostfwd=tcp:127.0.0.1:-:5900") +@end lisp +with forwarded ports +@example +: @code{(+ 10022 (* 1000 @var{ID}))} +: @code{(+ 15900 (* 1000 @var{ID}))} +@end example + @end table @end deftp @@ -24745,10 +24764,8 @@ the @code{--snapshot} flag using something along these lines: @lisp (service hurd-vm-service-type (hurd-vm-configuration - (image (const "/out/of/store/writable/hurd.img")) - (options '("--device" "rtl8139,netdev=net0" - "--netdev" - "user,id=net0,hostfwd=tcp:127.0.0.1:20022-:2222")))) + (image (const "/out/of/store/writable/hurd.img")) + (options '("--hda")))) @end lisp @node Version Control Services diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 4e96607680..1a15ffbd48 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -51,6 +51,10 @@ #:export (%hurd-vm-operating-system hurd-vm-configuration + hurd-vm-disk-image + hurd-vm-id + hurd-vm-net-options + hurd-vm-options hurd-vm-service-type libvirt-configuration @@ -832,14 +836,12 @@ functionality of the kernel Linux."))) (memory-size hurd-vm-configuration-memory-size ;number (default 512)) (options hurd-vm-configuration-options ;list of string - (default - `("--device" "rtl8139,netdev=net0" - "--netdev" ,(string-append - "user,id=net0" - ",hostfwd=tcp:127.0.0.1:20022-:2222" - ",hostfwd=tcp:127.0.0.1:25900-:5900") - "--snapshot" - "--hda")))) + (default `("--snapshot"))) + (id hurd-vm-configuration-id ;#f or integer [1..] + (default #f)) + (net-options hurd-vm-configuration-net-options ;list of string + (thunked) + (default (hurd-vm-net-options this-record)))) (define (hurd-vm-disk-image config) "Return a disk-image for the Hurd according to CONFIG." @@ -851,26 +853,45 @@ functionality of the kernel Linux."))) (size disk-size) (operating-system os))))) +(define (hurd-vm-net-options config) + (let ((id (or (hurd-vm-configuration-id config) 0))) + (define (qemu-vm-port base) + (number->string (+ base (* 1000 id)))) + `("--device" "rtl8139,netdev=net0" + "--netdev" ,(string-append + "user,id=net0" + ",hostfwd=tcp:127.0.0.1:" (qemu-vm-port 10022) "-:2222" + ",hostfwd=tcp:127.0.0.1:" (qemu-vm-port 15900) "-:5900")))) + (define (hurd-vm-shepherd-service config) "Return a for a Hurd in a Virtual Machine with CONFIG." (let ((image (hurd-vm-configuration-image config)) (qemu (hurd-vm-configuration-qemu config)) (memory-size (hurd-vm-configuration-memory-size config)) - (options (hurd-vm-configuration-options config))) + (options (hurd-vm-configuration-options config)) + (id (hurd-vm-configuration-id config)) + (net-options (hurd-vm-configuration-net-options config)) + (provisions '(hurd-vm childhurd))) (define vm-command #~(list (string-append #$qemu "/bin/qemu-system-i386") #$@(if (file-exists? "/dev/kvm") '("--enable-kvm") '()) "-m" (number->string #$memory-size) + #$@net-options #$@options - #+image)) + "--hda" #+image)) (list (shepherd-service (documentation "Run the Hurd in a Virtual Machine: a Childhurd.") - (provision '(hurd-vm childhurd)) + (provision (if id + (map + (cute symbol-append <> + (string->symbol (number->string id))) + provisions) + provisions)) (requirement '(networking)) (start #~(make-forkexec-constructor #$vm-command)) (stop #~(make-kill-destructor)))))) From 5dca64fc978d2941f96374dc3612de31435e60d1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Jun 2020 15:48:06 +0200 Subject: [PATCH 223/241] gnu: Add font-fontna-yasashisa-antique. gnu/packages/fonts.scm (font-fontna-yasashisa-antique): New variable. --- gnu/packages/fonts.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index bce1762278..643653f3f5 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -64,6 +64,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) @@ -1838,3 +1839,37 @@ characteristic so that they sit smoothly with the Tamil glyphs.") to write people's name, or for formal business situations where it is necessary to have a detailed and proper character style.") (license license:ipa))) + +(define-public font-fontna-yasashisa-antique + (package + (name "font-fontna-yasashisa-antique") + (version "0") + (source (origin + (method url-fetch) + (uri (string-append "http://flop.sakura.ne.jp/font/fontna-op/" + "YasashisaAntiqueFont.zip")) + (sha256 + (base32 + "1hl2qk3lzmh9h2vv5647vhlslkn3vqbq9rqgp4wzybajafx8c6nj")))) + (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; encoding issues cause many phases to fail + (add-after 'unpack 'fix-encoding + (lambda _ + ;; This directory, TrueType（サポート外）, is not properly encoded, + ;; which makes rename-file fail. Instead, use shell globbing to + ;; select and rename the directory. + (invoke "sh" "-c" "mv TrueType* TrueType") + #t))))) + (native-inputs + `(("bash" ,bash-minimal) + ("coreutils" ,coreutils))) + (home-page "http://www.fontna.com/blog/1122/") + (synopsis "Mix font of gothic kanji and minchou kana") + (description "Antique is a font that is popular to write manga bubbles, +dictionary headwords and picture books. This font reduces the thickness +differences in characters compared to other antique fonts.") + (license (list license:ipa + (license:non-copyleft "mplus-TESTFLIGHT-057/LICENSE_E"))))) From bdafdfcec9861f53f93fc9cf81c2e83fe45c35dd Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 21 Jun 2020 14:17:56 +0200 Subject: [PATCH 224/241] gnu: add convmv. * gnu/packages/convmv.scm: New file. * gnu/local.mk: Add it to build. Signed-off-by: Julien Lepiller --- gnu/local.mk | 1 + gnu/packages/convmv.scm | 60 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 gnu/packages/convmv.scm diff --git a/gnu/local.mk b/gnu/local.mk index 347d4bbb17..602a3c0aed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -134,6 +134,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/compton.scm \ %D%/packages/conky.scm \ %D%/packages/connman.scm \ + %D%/packages/convmv.scm \ %D%/packages/cook.scm \ %D%/packages/coq.scm \ %D%/packages/cpio.scm \ diff --git a/gnu/packages/convmv.scm b/gnu/packages/convmv.scm new file mode 100644 index 0000000000..2a9a4ec68c --- /dev/null +++ b/gnu/packages/convmv.scm @@ -0,0 +1,60 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Leo Prikler +;;; +;;; 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 convmv) + #:use-module (gnu packages) + #:use-module (gnu packages perl) + #:use-module (guix licenses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu)) + +(define-public convmv + (package + (name "convmv") + (version "2.05") + (source (origin + (method url-fetch) + (uri (string-append "https://www.j3e.de/linux/convmv/convmv-" + version ".tar.gz")) + (sha256 + (base32 + "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure) + (add-before 'check 'unpack-testsuite + (lambda _ + (invoke "tar" "xf" "testsuite.tar") + (patch-shebang "suite/dotests.sh") + (patch-shebang "suite/parsable_tester.pl") + #t))))) + (inputs + `(("perl" ,perl))) + (synopsis "Convert filenames between character sets") + (description + "convmv is a file renamer, that converts between different encodings, +e.g. from ISO-8859-1 to UTF-8. It is particularly usefuls for files with +names, that display incorrectly.") + (license (list gpl2 gpl3)) + (home-page "https://www.j3e.de/"))) From 41939c374a3ef421d2d4c6453c327a9cd7af4ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 21 Jun 2020 15:34:53 +0200 Subject: [PATCH 225/241] git-authenticate: Ignore authenticated commit cache when it's not #o600. * guix/git-authenticate.scm (previously-authenticated-commits): Stat PORT; return the empty list if it's no #o600 and change it to #o600. --- guix/git-authenticate.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 228d551d11..082c44ee06 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -306,7 +306,14 @@ IDs (hex strings)." (catch 'system-error (lambda () (call-with-input-file (authenticated-commit-cache-file key) - read)) + (lambda (port) + ;; If PORT has the wrong permissions, it might have been tampered + ;; with by another user so ignore its contents. + (if (= #o600 (stat:perms (stat port))) + (read port) + (begin + (chmod port #o600) + '()))))) (lambda args (if (= ENOENT (system-error-errno args)) '() From e4a4287c5fb51c0e47431606df5ee78b953d71f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 21 Jun 2020 16:39:27 +0200 Subject: [PATCH 226/241] channels: 'authenticate-channel' doesn't check relation with intro commit. Fixes . Reported by Jan Nieuwenhuizen . The relation check imposed an extra restriction that was unnecessary: it's enough to authenticate the set difference between the closure of START-COMMIT and that of END-COMMIT. Any attempt to jump to an unrelated commit would lead to the authentication failure of one commit on the way. * guix/channels.scm (authenticate-channel): Remove extra 'commit-relation' check when (null? commits). --- guix/channels.scm | 58 +++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index c879cb6ffa..3eec5df883 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -350,45 +350,33 @@ fails." (define reporter (progress-reporter/bar (length commits))) - ;; When COMMITS is empty, it's either because AUTHENTICATED-COMMITS - ;; contains END-COMMIT or because END-COMMIT is not a descendant of - ;; START-COMMIT. Check that. - (if (null? commits) - (match (commit-relation start-commit end-commit) - ((or 'self 'ancestor 'descendant) #t) ;nothing to do! - ('unrelated - (raise - (condition - (&message - (message - (format #f (G_ "'~a' is not related to introductory \ -commit of channel '~a'~%") - (oid->string (commit-id end-commit)) - (channel-name channel)))))))) - (begin - (format (current-error-port) - (G_ "Authenticating channel '~a', \ + ;; When COMMITS is empty, it's because END-COMMIT is in the closure of + ;; START-COMMIT and/or AUTHENTICATED-COMMITS, in which case it's known to + ;; be authentic already. + (unless (null? commits) + (format (current-error-port) + (G_ "Authenticating channel '~a', \ commits ~a to ~a (~h new commits)...~%") - (channel-name channel) - (commit-short-id start-commit) - (commit-short-id end-commit) - (length commits)) + (channel-name channel) + (commit-short-id start-commit) + (commit-short-id end-commit) + (length commits)) - ;; If it's our first time, verify CHANNEL's introductory commit. - (when (null? authenticated-commits) - (verify-introductory-commit repository - (channel-introduction channel) - keyring)) + ;; If it's our first time, verify CHANNEL's introductory commit. + (when (null? authenticated-commits) + (verify-introductory-commit repository + (channel-introduction channel) + keyring)) - (call-with-progress-reporter reporter - (lambda (report) - (authenticate-commits repository commits - #:keyring keyring - #:report-progress report))) + (call-with-progress-reporter reporter + (lambda (report) + (authenticate-commits repository commits + #:keyring keyring + #:report-progress report))) - (cache-authenticated-commit cache-key - (oid->string - (commit-id end-commit))))))) + (cache-authenticated-commit cache-key + (oid->string + (commit-id end-commit)))))) (define* (latest-channel-instance store channel #:key (patches %patches) From f458958543c0db5744c70ee4bc655b6627af24ac Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:04 +0200 Subject: [PATCH 227/241] gnu: Add cdrdao. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cdrom.scm (cdrdao): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cdrom.scm | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 67236f86de..ac8dd26af0 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Eric Bavier +;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,9 +39,11 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages bison) #:use-module (gnu packages compression) #:use-module (gnu packages flex) @@ -242,6 +245,54 @@ extra-robust data verification, synchronization, error handling and scratch reconstruction capability.") (license gpl2))) ; libraries under lgpl2.1 +(define-public cdrdao + (package + (name "cdrdao") + (version "1.2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cdrdao/cdrdao.git") + (commit + (string-append "rel_" (string-replace-substring version "." "_"))))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gcl8ibyylamy2d1piq3749nw3xrlp12r0spzp2gmni57b8a6b7j")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list + ;; GCDMaster depends on obsolete libgnomeuimm, see + ;; . + "--without-gcdmaster" + ;; Use the native SCSI interface. + "--without-scglib") + #:phases + (modify-phases %standard-phases + (add-before 'bootstrap 'fix-configure.ac + (lambda _ + ;; Remove reference to missing macro. + (substitute* "configure.ac" (("^AM_GCONF_SOURCE_2.*") "")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("ao" ,ao) + ("lame" ,lame) + ("libmad" ,libmad) + ("libvorbis" ,libvorbis))) + (home-page "http://cdrdao.sourceforge.net") + (synopsis "Read and write CDs in disk-at-once mode") + (description "cdrdao records audio or data CDs in disk-at-once (DAO) mode, +based on a textual description of the contents. This mode writes the complete +disc – lead-in, one or more tracks, and lead-out – in a single step and is +commonly used with audio CDs. @code{cdrdao} can also handle the bin/cue +format, commonly used for VCDs or disks with subchannel data.") + (license gpl2+))) + (define-public cdrtools (package (name "cdrtools") From 7afaab8befef57a8358e4a5881508fb278d18733 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:05 +0200 Subject: [PATCH 228/241] gnu: k3b: Add inputs for external programs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/kde-multimedia.scm (k3b)[inputs]: Add cdrdao, dvd+rw-tools, libburn and sox. [arguments]<#:phases>[wrap-path]: New phase to wrap the binary with paths to the above. Signed-off-by: Ludovic Courtès --- gnu/packages/kde-multimedia.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 938251a532..654aecd858 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019 Hartmut Goebel +;;; Copyright © 2020 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -296,12 +297,26 @@ This package is part of the KDE multimedia module.") (sha256 (base32 "0r01ninrrmqk7pl5jg0g51fcky1ammw0yyq572wyhibw7q8y7ly7")))) (build-system qt-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'qt-wrap 'wrap-path + (lambda _ + ;; Set paths to backend programs. + (wrap-program (string-append (assoc-ref %outputs "out") "/bin/k3b") + `("PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref %build-inputs input) "/bin")) + '("cdrdao" "dvd+rw-tools" "libburn" "sox")))) + #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) ("kdoctools" ,kdoctools))) (inputs - `(("ffmpeg" ,ffmpeg) + `(("cdrdao" ,cdrdao) + ("dvd+rw-tools" ,dvd+rw-tools) + ("ffmpeg" ,ffmpeg) ("flac" ,flac) ("karchive" ,karchive) ("kcmutils" ,kcmutils) @@ -319,6 +334,7 @@ This package is part of the KDE multimedia module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("lame" ,lame) + ("libburn" ,libburn) ("libdvdread" ,libdvdread) ;; TODO: LibFuzzer ("libiconv" ,libiconv) @@ -334,6 +350,7 @@ This package is part of the KDE multimedia module.") ("qtwebkit" ,qtwebkit) ("shared-mime-info" ,shared-mime-info) ("solid" ,solid) + ("sox" ,sox) ("taglib" ,taglib))) (home-page "https://kde.org/applications/multimedia/org.kde.k3b") (synopsis "Sophisticated CD/DVD burning application") From 4aa89a09144e8dac30c9c618ce159f81862da952 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:06 +0200 Subject: [PATCH 229/241] gnu: k3b: Add inputs for libraries loaded at runtime. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch the source to load these from absolute paths. Actual loading is done by the Qt library, so we cannot use k3b’s runpath. * gnu/packages/kde-multimedia.scm (k3b)[inputs]: Add libcdio-paranoia and libdvdcss. [arguments]<#:phases>[set-absolute-library-paths]: New phase. Signed-off-by: Ludovic Courtès --- gnu/packages/kde-multimedia.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 654aecd858..9fab19f1f6 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -300,6 +300,19 @@ This package is part of the KDE multimedia module.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'set-absolute-library-paths + (lambda _ + ;; Set absolute paths for dlopened libraries. We can’t use k3b’s + ;; runpath as they are loaded by the Qt library. + (let ((libcdio-paranoia (assoc-ref %build-inputs "libcdio-paranoia")) + (libdvdcss (assoc-ref %build-inputs "libdvdcss"))) + (substitute* "libk3b/tools/k3bcdparanoialib.cpp" + (("\"(cdio_cdda|cdio_paranoia)\"" _ library) + (string-append "\"" libcdio-paranoia "/lib/" library "\""))) + (substitute* "libk3b/tools/k3blibdvdcss.cpp" + (("\"(dvdcss)\"" _ library) + (string-append "\"" libdvdcss "/lib/" library "\"")))) + #t)) (add-after 'qt-wrap 'wrap-path (lambda _ ;; Set paths to backend programs. @@ -335,6 +348,8 @@ This package is part of the KDE multimedia module.") ("kxmlgui" ,kxmlgui) ("lame" ,lame) ("libburn" ,libburn) + ("libcdio-paranoia" ,libcdio-paranoia) + ("libdvdcss" ,libdvdcss) ("libdvdread" ,libdvdread) ;; TODO: LibFuzzer ("libiconv" ,libiconv) From c9650cef1eff4fc2a59a7891cb8ca9d9d0e4dd40 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:07 +0200 Subject: [PATCH 230/241] gnu: k3b: Note the runtime dependency on udisks-service. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/kde-multimedia.scm (k3b)[description]: Note that udisks-service should be enabled. Signed-off-by: Ludovic Courtès --- gnu/packages/kde-multimedia.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 9fab19f1f6..ecc1afe83b 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -372,7 +372,10 @@ This package is part of the KDE multimedia module.") (description "K3b is CD-writing software which intends to be feature-rich and provide an easily usable interface. Features include burning audio CDs from .WAV and .MP3 audio files, configuring external programs and configuring -devices.") +devices. + +The @code{udisks-service} should be enabled for @command{k3b} to discover the +available CD drives.") (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) From dbadca9ac72ae2a3e228f3dfe4aaacc3db5fbeed Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Wed, 17 Jun 2020 12:50:08 +0200 Subject: [PATCH 231/241] gnu: k3b: Update to 20.04.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/kde-multimedia.scm (k3b): Update to 20.04.2. Signed-off-by: Ludovic Courtès --- gnu/packages/kde-multimedia.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index ecc1afe83b..dd1355010e 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -288,14 +288,14 @@ This package is part of the KDE multimedia module.") (define-public k3b (package (name "k3b") - (version "20.04.1") + (version "20.04.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/k3b-" version ".tar.xz")) (sha256 - (base32 "0r01ninrrmqk7pl5jg0g51fcky1ammw0yyq572wyhibw7q8y7ly7")))) + (base32 "15wm987hz6rfs9ds9l1gbs6gdsardj1ywvk6zmpvj2i2190y4b3q")))) (build-system qt-build-system) (arguments `(#:phases From 3f3c61b8d558f8b35d028df7effa23fd7b67c914 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 21 Jun 2020 21:40:51 +0200 Subject: [PATCH 232/241] gnu: Add font-mplus-testflight. * gnu/packages/fonts.scm (font-mplus-testflight): New variable. --- gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 643653f3f5..5a913441e9 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1873,3 +1873,27 @@ dictionary headwords and picture books. This font reduces the thickness differences in characters compared to other antique fonts.") (license (list license:ipa (license:non-copyleft "mplus-TESTFLIGHT-057/LICENSE_E"))))) + +(define-public font-mplus-testflight + (package + (name "font-mplus-testflight") + (version "063a") + (source (origin + (method url-fetch) + (uri (string-append "https://osdn.net/frs/redir.php?" + "m=gigenet&f=mplus-fonts%2F62344%2Fmplus-TESTFLIGHT-" + version ".tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 + "0yfx9i77638yrgclnwwl4af79ri3vifi1nslwi6mgzva9cxrgss4")))) + (build-system font-build-system) + (home-page "https://mplus-fonts.osdn.jp/index.html") + (synopsis "Japanese font collection") + (description "M+ is a collection of Japanese fonts with all Latin glyph +sets, with Basic Latin, Latin-1 Supplement, Latin Extended-A, and IPA +Extensions. In addition to European letters used in many Western European +languages, it contains Japanese characters, including Kana glyphs and more +than 5,300 Kanji glyphs, as well major international phonetic symbols, +operators and special symbols.") + (license (license:non-copyleft "file:///LICENSE_E")))) From 6d7ed7c05019fac74ff8b63f59f298ffb51cd40c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 12 Jun 2020 11:22:53 +0200 Subject: [PATCH 233/241] gnu: Add seahorse-adventures. * gnu/packages/games.scm (seahorse-adventures): New variable. --- gnu/packages/games.scm | 112 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 76ddbabc2e..25ee733dc4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1774,6 +1774,118 @@ can be explored and changed freely.") license:gpl3+ license:silofl1.1)))) +(define-public seahorse-adventures + (package + (name "seahorse-adventures") + (version "1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dulsi/seahorse-adventures.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rnvk06npaqcpjz5z6xcmssz61i32s422lydp49vrnf3j2g4yimd")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + ;; Remove non-free (non-commercial) font. + (snippet + `(begin + (for-each delete-file (find-files "data/fonts" ".")) + #t)))) + (build-system python-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (delete 'build) ;pure Python + (replace 'install ;no install script + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (applications (string-append share "/applications")) + (data (string-append share "/seahorse-adventures"))) + ;; Install data. + (for-each (lambda (f) + (chmod f #o555) + (install-file f data)) + '("leveledit.py" "run_game.py" "tileedit.py")) + (for-each (lambda (dir) + (let ((target (string-append data "/" dir))) + (mkdir-p target) + (copy-recursively dir target))) + '("data" "lib")) + ;; Create executable. + (mkdir-p bin) + (let ((executable (string-append bin "/seahorse-adventures"))) + (call-with-output-file executable + (lambda (p) + (format p + "#!~a~@ + export PYTHONPATH=~a:~a~@ + exec -a \"~a\" ~a \"$@\"~%" + (which "bash") data (getenv "PYTHONPATH") + (which "python3") + (string-append data "/run_game.py")))) + (chmod executable #o555)) + ;; Add desktop file. + (mkdir-p applications) + (make-desktop-entry-file + (string-append applications "/seahorse-adventures.desktop") + #:name "Seahorse Adventures" + #:comment + '((#f "Help Barbie the seahorse float on bubbles to the moon")) + #:exec ,name + #:icon ,name + #:categories '("Game" "ActionGame") + #:keywords '("game" "retro" "platform")) + ;; Add icons. + (for-each + (lambda (size) + (let ((dir (string-append share "/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p dir) + (copy-file + (string-append "icon" size ".png") + (string-append dir "/searhorse-adventures.png")))) + '("32" "64" "128"))) + #t)) + (add-after 'install 'unbundle-fonts + ;; Unbundle Bitstream Vera font and replace deleted one. + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (data (string-append out "/share/seahorse-adventures")) + (vera (string-append (assoc-ref inputs "font-bitstream-vera") + "/share/fonts/truetype/Vera.ttf"))) + (let ((themes-dir (string-append data "/data/themes/"))) + (for-each + (lambda (theme) + (let ((target (string-append themes-dir theme "/Vera.ttf"))) + (delete-file target) + (symlink vera target))) + '("default" "gray"))) + (symlink vera (string-append data "/data/fonts/04B_20__.TTF")) + (substitute* (string-append data "/lib/main.py") + (("f_scale = 0.35") "f_scale = 0.47"))) + #t))))) + (inputs + `(("font-bitstream-vera" ,font-bitstream-vera) + ("python-pygame" ,python-pygame))) + (home-page "http://www.imitationpickles.org/barbie/") + (synopsis "Help Barbie the seahorse float on bubbles to the moon") + (description + "Barbie Seahorse Adventures is a retro style platform arcade game. +You are Barbie the seahorse who travels through the jungle, up to the +volcano until you float on bubbles to the moon. On the way to your +final destination you will encounter various enemies, servants of the +evil overlord who has stolen the galaxy crystal. Avoid getting hit +and defeat them with your bubbles!") + ;; GPL2+ is for code, CC0 is for art. + (license (list license:gpl2+ license:cc0)))) + (define-public superstarfighter (package (name "superstarfighter") From 89ab6bfbf1bff6da129664d81258e7eed4a8922f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 21 Jun 2020 23:23:23 +0200 Subject: [PATCH 234/241] gnu: guile: Add 3.0.3. * gnu/packages/guile.scm (guile-3.0.3): New variable. --- gnu/packages/guile.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 34d348c344..a8f5019687 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -308,6 +308,19 @@ without requiring the source code to be rewritten.") (files '("lib/guile/3.0/site-ccache" "share/guile/site/3.0"))))))) +(define-public guile-3.0.3 + ;; TODO: Make this 'guile-3.0' on the next rebuild cycle. + (package + (inherit guile-3.0) + (version "3.0.3") + (source (origin + (inherit (package-source guile-3.0)) + (uri (string-append "mirror://gnu/guile/guile-" + version ".tar.xz")) + (sha256 + (base32 + "0fz6fgx7ran6nn0l978jmpckjc9knk4g3bddr75n0daqqmhjs95k")))))) + (define-public guile-next (deprecated-package "guile-next" guile-3.0)) From 9546891f952c1f15b3c9e1216f2be1a3c4bcc2f8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Jun 2020 23:51:19 +0200 Subject: [PATCH 235/241] gnu: emacs-relint: Update to 1.18. * gnu/packages/emacs-xyz.scm (emacs-relint): Update to 1.18. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b621c24dc5..866a5c8ced 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1262,14 +1262,14 @@ optional minor mode which can apply this command automatically on save.") (define-public emacs-relint (package (name "emacs-relint") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/relint-" version ".tar")) + (uri (string-append "https://elpa.gnu.org/packages/" + "relint-" version ".tar")) (sha256 - (base32 "1nv13dqdhf72c1jgk1ml4k6jqb8wsyphcx2vhsyhig5198lg4kd7")))) + (base32 "0zfislsksrkn6qs0w26yaff5xr7xqy2x235dcdpz8s2v35b6dhci")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xr" ,emacs-xr))) (home-page "https://github.com/mattiase/relint") From 37ab7837e768b16a34b8135177d252aa838fdc0f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Jun 2020 00:40:10 +0200 Subject: [PATCH 236/241] gnu: xmoto: Update to 0.6.1. * gnu/packages/games.scm (xmoto): Update to 0.6.1. [arguments]: Remove phase installing man pages, now properly handled by the installation script. --- gnu/packages/games.scm | 186 +++++++++++++++++++---------------------- 1 file changed, 87 insertions(+), 99 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 25ee733dc4..27cbf33fb9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10532,108 +10532,96 @@ This package is part of the KDE games module.") (license (list license:gpl2+ license:fdl1.2+)))) (define-public xmoto - ;; The commit below includes a fix to a build error. - (let ((commit "f7ca787d02bd876c6eb989a28b180a05220621ee") - (revision "0")) - (package - (name "xmoto") - (version (git-version "0.6.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xmoto/xmoto.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1kiwqni58vjdqfb289d1dqcb758hdl2k970dawxq5vdaqrbnsxv4")) - (modules '((guix build utils) - (ice-9 ftw) - (srfi srfi-1))) - ;; XXX: Remove some bundled libraries. Guix provides Chipmunk, but - ;; it appears to be incompatible with the (older) one bundled. - (snippet - `(begin - (let ((keep '("chipmunk" "glad" "md5sum"))) - (with-directory-excursion "vendor" - (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." keep)))) - (substitute* "src/CMakeLists.txt" - (("add_subdirectory\\(.*?/vendor/(.+?)\".*" line library) - (if (member library keep) line "")))) - #t)))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ;no test - #:phases - (modify-phases %standard-phases - ;; Install phase ignores this man page. Install it early, - ;; because the process moves to another directory shortly - ;; after. - (add-after 'unpack 'install-man-page - (lambda* (#:key outputs #:allow-other-keys) - (install-file "xmoto.6" - (string-append (assoc-ref outputs "out") - "/share/man/man6")) - #t)) - (add-after 'unpack 'fix-hard-coded-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/common/VFileIO.cpp" - (("/usr/share") - (string-append (assoc-ref outputs "out") "/share"))) - #t)) - (add-before 'build 'set-SDL - ;; Set correct environment for SDL. - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CPATH" - (string-append - (assoc-ref inputs "sdl") "/include/SDL:" - (or (getenv "CPATH") ""))) - #t)) - (add-after 'install 'unbundle-fonts - ;; Unbundle DejaVuSans TTF files. - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((font-dir (string-append (assoc-ref inputs "font-dejavu") - "/share/fonts/truetype/")) - (target-dir (string-append (assoc-ref outputs "out") - "/share/xmoto/Textures/Fonts/"))) - (for-each (lambda (f) - (let ((font (string-append font-dir f)) - (target (string-append target-dir f))) - (delete-file target) - (symlink font target))) - '("DejaVuSans.ttf" "DejaVuSansMono.ttf")) - #t)))))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) - (inputs - `(("bzip2" ,bzip2) - ("curl" ,curl) - ("font-dejavu" ,font-dejavu) - ("glu" ,glu) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxdg-basedir" ,libxdg-basedir) - ("libxml2" ,libxml2) - ("lua" ,lua-5.1) - ("ode" ,ode) - ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) - ("sqlite" ,sqlite) - ("zlib" ,zlib))) - (home-page "https://xmoto.tuxfamily.org/") - (synopsis "2D motocross platform game") - (description - "X-Moto is a challenging 2D motocross platform game, where + (package + (name "xmoto") + (version "0.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xmoto/xmoto.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + ;; XXX: Remove some bundled libraries. Guix provides Chipmunk, but + ;; it appears to be incompatible with the (older) one bundled. + (snippet + `(begin + (let ((keep '("chipmunk" "glad" "md5sum"))) + (with-directory-excursion "vendor" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep)))) + (substitute* "src/CMakeLists.txt" + (("add_subdirectory\\(.*?/vendor/(.+?)\".*" line library) + (if (member library keep) line "")))) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-hard-coded-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/common/VFileIO.cpp" + (("/usr/share") + (string-append (assoc-ref outputs "out") "/share"))) + #t)) + (add-before 'build 'set-SDL + ;; Set correct environment for SDL. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append + (assoc-ref inputs "sdl") "/include/SDL:" + (or (getenv "CPATH") ""))) + #t)) + (add-after 'install 'unbundle-fonts + ;; Unbundle DejaVuSans TTF files. + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((font-dir (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/")) + (target-dir (string-append (assoc-ref outputs "out") + "/share/xmoto/Textures/Fonts/"))) + (for-each (lambda (f) + (let ((font (string-append font-dir f)) + (target (string-append target-dir f))) + (delete-file target) + (symlink font target))) + '("DejaVuSans.ttf" "DejaVuSansMono.ttf")) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("bzip2" ,bzip2) + ("curl" ,curl) + ("font-dejavu" ,font-dejavu) + ("glu" ,glu) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libxdg-basedir" ,libxdg-basedir) + ("libxml2" ,libxml2) + ("lua" ,lua-5.1) + ("ode" ,ode) + ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://xmoto.tuxfamily.org/") + (synopsis "2D motocross platform game") + (description + "X-Moto is a challenging 2D motocross platform game, where physics play an all important role in the gameplay. You need to control your bike to its limit, if you want to have a chance finishing the more difficult challenges.") - (license (list license:gpl2+ ;whole project - license:bsd-3 ;vendor/md5sum - license:lgpl2.1+ - license:expat))))) + (license (list license:gpl2+ ;whole project + license:bsd-3 ;vendor/md5sum + license:lgpl2.1+ + license:expat)))) (define-public eboard (package From 1d97e871dd60e80abf647fdd9bf50af8039c01e3 Mon Sep 17 00:00:00 2001 From: Peter Lo Date: Sun, 21 Jun 2020 23:28:05 +0800 Subject: [PATCH 237/241] gnu: Add r-boruta. * gnu/packages/statistics.scm (r-boruta): New variable. Signed-off-by: Leo Famulari --- gnu/packages/statistics.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 482eea9178..9e613cd63a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5902,3 +5902,24 @@ Java package that provides routines for various statistical distributions.") Emacs. It is designed to support editing of scripts and interaction with various statistical analysis programs such as R, Julia, and JAGS.") (license license:gpl2+))) + +(define-public r-boruta + (package + (name "r-boruta") + (version "7.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "Boruta" version)) + (sha256 + (base32 + "0y2w4wb45kfnzrxcrdsiwgal9fsnlr3wad1sqdc70qv8gp921xbg")))) + (properties `((upstream-name . "Boruta"))) + (build-system r-build-system) + (propagated-inputs `(("r-ranger" ,r-ranger))) + (home-page "https://gitlab.com/mbq/Boruta/") + (synopsis + "Wrapper Algorithm for All Relevant Feature Selection") + (description + "An all relevant feature selection wrapper algorithm. It finds relevant features by comparing original attributes' importance with importance achievable at random, estimated using their permuted copies (shadows).") + (license license:gpl2+))) From 8e5b17280cd501ec338476c2cfa0496dbae43fa2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Jun 2020 19:12:04 -0400 Subject: [PATCH 238/241] gnu: linux-libre@4.4: Update to 4.4.228. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.228. (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 3d595cde41..75a82c90c9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -411,10 +411,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.227") +(define-public linux-libre-4.4-version "4.4.228") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "196x57w740firg8zchypq4vq6a83ymmwn9amqrscym9zr0pcgm40"))) + (hash (base32 "0y1xc5lk8j3p5maarksmh18wy921rgcngzsih7q1a82rah1fsjxr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) From f1922ee156f4f348b6c5ff7e151e4ecb9744495b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Jun 2020 19:13:01 -0400 Subject: [PATCH 239/241] gnu: linux-libre@4.9: Update to 4.9.228. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.228. (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 75a82c90c9..f54dc63820 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -403,10 +403,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.227") +(define-public linux-libre-4.9-version "4.9.228") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0pqc0wld4s4zjas95xm54mrkk00l9zkc59b6i9gq4km126s8bi1q"))) + (hash (base32 "0d7w2zzs79ywxzfrh4bmk5lw318qbkcb8mcsyyh3cc25qqlz9gwg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) From 5a9a438146c5df87847240af9dbbc11458de8781 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 21 Jun 2020 19:13:29 -0400 Subject: [PATCH 240/241] gnu: linux-libre@4.14: Update to 4.14.185. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.185. (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 f54dc63820..95847165fd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,10 +395,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.184") +(define-public linux-libre-4.14-version "4.14.185") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0h6r06c1d7amkfglsr66ic89p0zxpmk7jkq1ylcbknmkiwkixx9g"))) + (hash (base32 "1iixxwidp53s2i2br58wbx5s69f2jcllb116z73pv7fmd06b2czk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) From f8a28b6c6d4fe7642b7df35e8518e3c0174ede74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Mon, 22 Jun 2020 02:13:09 +0200 Subject: [PATCH 241/241] gnu: bison-3.6: Don't change the name of the package. This is a follow-up to commit 512d23c65d82bb874ca1fb3c12095b1cec8bbfca. * gnu/packages/bison (bison-3.6)[name]: Remove the overridden value. --- gnu/packages/bison.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 63b14c7059..725f38263f 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -68,7 +68,6 @@ simple tools through complex programming languages.") (define-public bison-3.6 (package (inherit bison) - (name "bison-3.6") (version "3.6.3") (source (origin