From 49de32748ddcbe5026b23ffc5365a3ca524790ec Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 26 May 2020 16:19:40 -0400 Subject: gnu: xaos: Update to 4.0. * gnu/packages/maths.scm (xaos): Update to 4.0. [source]: Use git-fetch. [native-inputs]: Add qtbase and qttools. [arguments]: Remove #:make-flags options; replace 'configure' phase; add 'make-qt-deterministic' and 'install-data' phases. [home-page]: Update URL. --- gnu/packages/maths.scm | 55 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e1c8f8b559..9a24625a52 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4046,30 +4046,69 @@ (define-public wcalc (define-public xaos (package (name "xaos") - (version "3.6") + (version "4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/xaos/XaoS/" version - "/xaos-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/xaos-project/XaoS") + (commit (string-append "release-" version)))) (sha256 (base32 - "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq")))) + "00110p5xscjsmn7avfqgydn656zbmdj3l3y2fpv9b4ihzpid8n7a")))) (build-system gnu-build-system) - (native-inputs `(("gettext" ,gettext-minimal))) + (native-inputs `(("gettext" ,gettext-minimal) + ("qtbase" ,qtbase) + ("qttools" ,qttools))) (inputs `(("libx11" ,libx11) ("zlib" ,zlib) ("libpng" ,libpng) ("gsl" ,gsl))) + ;; The upstream project file ("XaoS.pro") and the Makefile it generates are + ;; not enough for this package to install properly. These phases fix that. (arguments `(#:tests? #f ;no "check" target - #:make-flags '("LOCALEDIR=$DATAROOTDIR/locale"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The DESTDIR is originally set to install the xaos binary to + ;; the "bin" folder inside the build directory. Setting make + ;; flags doesn't seem to change this. + (substitute* "XaoS.pro" + (("DESTDIR.*$") + (string-append "DESTDIR=" out "/bin"))) + (substitute* "src/include/config.h" + (("/usr/share/XaoS") + (string-append out "/share/XaoS"))) + (invoke "qmake")))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (mkdir-p share) + (for-each + (lambda (folder) + (copy-recursively folder + (string-append share "/XaoS/" folder))) + '("catalogs" "examples" "tutorial")) + (install-file "xdg/xaos.png" + (string-append share "/pixmaps")) + (install-file "xdg/xaos.desktop" + (string-append share "/applications"))) + #t))))) (synopsis "Real-time fractal zoomer") (description "GNU XaoS is a graphical program that generates fractal patterns and allows you to zoom in and out of them infinitely in a fluid, continuous manner. It also includes tutorials that help to explain how fractals are built. It can generate many different fractal types such as the Mandelbrot set.") - (home-page "https://www.gnu.org/software/xaos/") + (home-page "https://xaos-project.github.io/") (license license:gpl2+))) (define-public hypre -- cgit v1.2.3 From c08fac0f7d175b9deb182c597cecdae997efce9d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 24 May 2020 15:04:45 -0400 Subject: services: nfs: Expose configuration options for TCP and UDP. * gnu/services/nfs.scm ()[nfsd-tcp?, nfsd-udp?]: New fields. (nfs-shepherd-services)[rpc.nfsd]: Populate the --{no-,}tcp and --{no-,}udp command line options based on the values of the nfsd-tcp? and nfsd-upd? fields. * doc/guix.texi (Network File System): Add doc. --- doc/guix.texi | 6 ++++++ gnu/services/nfs.scm | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index ba5729bd41..beeda34ea2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22858,6 +22858,12 @@ The network port that the @command{nfsd} daemon should use. @item @code{nfsd-threads} (default: @code{8}) The number of threads used by the @command{nfsd} daemon. +@item @code{nfsd-tcp?} (default: @code{#t}) +Whether the @command{nfsd} daemon should listen on a TCP socket. + +@item @code{nfsd-udp?} (default: @code{#f}) +Whether the @command{nfsd} daemon should listen on a UDP socket. + @item @code{pipefs-directory} (default: @code{"/var/lib/nfs/rpc_pipefs"}) The directory where the pipefs file system is mounted. diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 4e358197e2..859097e788 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,6 +262,10 @@ (define-record-type* (default 2049)) (nfsd-threads nfs-configuration-nfsd-threads (default 8)) + (nfsd-tcp? nfs-configuration-nfsd-tcp? + (default #t)) + (nfsd-udp? nfs-configuration-nfsd-udp? + (default #f)) (pipefs-directory nfs-configuration-pipefs-directory (default default-pipefs-directory)) ;; List of modules to debug; any of nfsd, nfs, rpc, idmap, statd, or mountd. @@ -272,6 +277,7 @@ (define (nfs-shepherd-services config) (match-record config (nfs-utils nfs-versions exports rpcmountd-port rpcstatd-port nfsd-port nfsd-threads + nfsd-tcp? nfsd-udp? pipefs-directory debug) (list (shepherd-service (documentation "Mount the nfsd pseudo file system.") @@ -332,7 +338,13 @@ (define (nfs-shepherd-services config) #$@(map (lambda (version) (string-append "--nfs-version=" version)) nfs-versions) - #$(number->string nfsd-threads)))))) + #$(number->string nfsd-threads) + #$(if nfsd-tcp? + "--tcp" + "--no-tcp") + #$(if nfsd-udp? + "--udp" + "--no-udp")))))) (stop #~(lambda _ (zero? -- cgit v1.2.3 From e7b86a0d88760275afefa0c44a3c30602f80aac0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 27 May 2020 22:44:28 -0400 Subject: bootloader: grub: Rename the btrfs-subvolume-file-name parameter. Following discussion in , it seems more appropriate to give the parameter a more generic name that better describes what it does. * gnu/bootloader/grub.scm (normalize-file): Rename the BTRFS-SUBVOLUME-FILE-NAME parameter to STORE-DIRECTORY-PREFIX, and always assume this argument to be a string. (eye-candy): Likewise. Default STORE-DIRECTORY-PREFIX to "". (grub-configuration-file): Likewise. * gnu/system.scm (operating-system-bootcfg): Adapt. --- gnu/bootloader/grub.scm | 47 ++++++++++++++++++++++------------------------- gnu/system.scm | 2 +- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 40918ea307..2d9a39afc3 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -58,8 +58,8 @@ (define-module (gnu bootloader grub) ;;; ;;; Code: -(define* (normalize-file file mount-point btrfs-subvolume-file-name) - "Strip MOUNT-POINT and prepend BTRFS-SUBVOLUME-FILE-NAME to FILE, a +(define* (normalize-file file mount-point store-directory-prefix) + "Strip MOUNT-POINT and prepend STORE-DIRECTORY-PREFIX, if any, to FILE, a G-expression or other lowerable object denoting a file name." (define (strip-mount-point mount-point file) @@ -72,13 +72,13 @@ (define (strip-mount-point mount-point file) file))) file)) - (define (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name file) - (if btrfs-subvolume-file-name - #~(string-append #$btrfs-subvolume-file-name #$file) + (define (prepend-store-directory-prefix store-directory-prefix file) + (if store-directory-prefix + #~(string-append #$store-directory-prefix #$file) file)) - (prepend-btrfs-subvolume-file-name btrfs-subvolume-file-name - (strip-mount-point mount-point file))) + (prepend-store-directory-prefix store-directory-prefix + (strip-mount-point mount-point file))) @@ -135,14 +135,14 @@ (define* (grub-background-image config) (_ #f))))) (define* (eye-candy config store-device store-mount-point - #:key btrfs-store-subvolume-file-name system port) + #:key store-directory-prefix system port) "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part concerned with graphics mode, background images, colors, and all that. STORE-DEVICE designates the device holding the store, and STORE-MOUNT-POINT is its mount point; these are used to determine where the background image and fonts must be searched for. SYSTEM must be the target system string---e.g., -\"x86_64-linux\". BTRFS-STORE-SUBVOLUME-FILE-NAME is the file name of the -Btrfs subvolume, to be prepended to any store path, if any." +\"x86_64-linux\". STORE-DIRECTORY-PREFIX is a directory prefix to prepend to +any store file name." (define setup-gfxterm-body (let ((gfxmode (or (and-let* ((theme (bootloader-configuration-theme config)) @@ -181,12 +181,12 @@ (define (theme-colors type) (define font-file (normalize-file (file-append grub "/share/grub/unicode.pf2") store-mount-point - btrfs-store-subvolume-file-name)) + store-directory-prefix)) (define image (normalize-file (grub-background-image config) store-mount-point - btrfs-store-subvolume-file-name)) + store-directory-prefix)) (and image #~(format #$port " @@ -320,13 +320,13 @@ (define* (grub-configuration-file config entries #:key (system (%current-system)) (old-entries '()) - btrfs-subvolume-file-name) + store-directory-prefix) "Return the GRUB configuration file corresponding to CONFIG, a object, and where the store is available at -STORE-FS, a object. OLD-ENTRIES is taken to be a list -of menu entries corresponding to old generations of the system. -BTRFS-SUBVOLUME-FILE-NAME may be used to specify on which subvolume a -Btrfs root file system resides." +STORE-FS, a object. OLD-ENTRIES is taken to be a list of menu +entries corresponding to old generations of the system. +STORE-DIRECTORY-PREFIX may be used to specify a store prefix, as is required +when booting a root file system on a Btrfs subvolume." (define all-entries (append entries (bootloader-configuration-menu-entries config))) (define (menu-entry->gexp entry) @@ -336,17 +336,14 @@ (define (menu-entry->gexp entry) (arguments (menu-entry-linux-arguments entry)) (kernel (normalize-file (menu-entry-linux entry) device-mount-point - btrfs-subvolume-file-name)) + store-directory-prefix)) (initrd (normalize-file (menu-entry-initrd entry) device-mount-point - btrfs-subvolume-file-name))) + store-directory-prefix))) ;; Here DEVICE is the store and DEVICE-MOUNT-POINT is its mount point. ;; Use the right file names for KERNEL and INITRD in case ;; DEVICE-MOUNT-POINT is not "/", meaning that the store is on a ;; separate partition. - - ;; When BTRFS-SUBVOLUME-FILE-NAME is defined, prepend it the kernel and - ;; initrd paths, to allow booting from a Btrfs subvolume. #~(format port "menuentry ~s { ~a linux ~a ~a @@ -360,7 +357,7 @@ (define sugar (eye-candy config (menu-entry-device (first all-entries)) (menu-entry-device-mount-point (first all-entries)) - #:btrfs-store-subvolume-file-name btrfs-subvolume-file-name + #:store-directory-prefix store-directory-prefix #:system system #:port #~port)) @@ -371,8 +368,8 @@ (define keyboard-layout-config (keymap* (and layout (keyboard-layout-file layout #:grub grub))) (keymap (and keymap* - (if btrfs-subvolume-file-name - #~(string-append #$btrfs-subvolume-file-name + (if store-directory-prefix + #~(string-append #$store-directory-prefix #$keymap*) keymap*)))) #~(when #$keymap diff --git a/gnu/system.scm b/gnu/system.scm index d929187695..ac8bbd1d16 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1118,7 +1118,7 @@ (define generate-config-file (generate-config-file bootloader-conf (list entry) #:old-entries old-entries - #:btrfs-subvolume-file-name + #:store-directory-prefix (btrfs-store-subvolume-file-name file-systems)))) (define* (operating-system-boot-parameters os root-device -- cgit v1.2.3 From 36757e02c62c01186e62de674f9f93a984c72474 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 May 2020 15:54:12 +0200 Subject: gnu: mpfi: Update to 1.5.4. * gnu/packages/multiprecision.scm (mpfi): Update to 1.5.4. [source]: Hard-code project name. [arguments]: Disable tests, utterly broken in this release. Do not build static libraries. [native-inputs]: Add automake, autoreconf, libtool, texinfo. --- gnu/packages/multiprecision.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 2848e63d60..a14b69e9e6 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015, 2018 Andreas Enge -;;; Copyright © 2016 Nicolas Goaziou +;;; Copyright © 2016, 2020 Nicolas Goaziou ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier @@ -29,6 +29,7 @@ (define-module (gnu packages multiprecision) #:use-module (gnu packages autotools) #:use-module (gnu packages m4) #:use-module (gnu packages gcc) + #:use-module (gnu packages texinfo) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) @@ -156,17 +157,27 @@ (define-public mpc (define-public mpfi (package (name "mpfi") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append "https://gforge.inria.fr/frs/download.php" - "/latestfile/181/" name "-" version ".tar.bz2")) + "/latestfile/181/mpfi-" version ".tgz")) (sha256 - (base32 "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3")))) + (base32 "0mismr1ll3wp788dq2n22s5irm0dziy75byyfdwz22kjbmckhf9v")))) (build-system gnu-build-system) - (propagated-inputs `(("gmp" ,gmp) ; refers to both - ("mpfr" ,mpfr))) + (arguments + `(#:tests? #f ;tests are broken in this release + #:configure-flags '("--enable-static=no"))) + (native-inputs + `(("automake" ,automake) + ("autoreconf" ,autoconf) + ("libtool" ,libtool) + ("texinfo" ,texinfo))) + (propagated-inputs + `(("gmp" ,gmp) ; refers to both + ("mpfr" ,mpfr))) + (home-page "https://perso.ens-lyon.fr/nathalie.revol/software.html") (synopsis "C library for arbitrary-precision interval arithmetic") (description "@acronym{MPFI, Multiple Precision Floating-point Interval} is a portable C @@ -178,8 +189,7 @@ (define-public mpfi The purpose of arbitrary-precision interval arithmetic is to get results that are both guaranteed, thanks to interval computation, and accurate, thanks to multiple-precision arithmetic.") - (license lgpl2.1+) - (home-page "https://perso.ens-lyon.fr/nathalie.revol/software.html"))) + (license lgpl2.1+))) (define-public irram (package -- cgit v1.2.3 From 968612b76a157a5270f7b959a09d6e2268f04c4c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 30 May 2020 15:56:40 +0200 Subject: gnu: mpfi: Update home page. * gnu/packages/multiprecision.scm (mpfi): Use more specific home page. --- gnu/packages/multiprecision.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index a14b69e9e6..b3a5ec5894 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -177,7 +177,7 @@ (define-public mpfi (propagated-inputs `(("gmp" ,gmp) ; refers to both ("mpfr" ,mpfr))) - (home-page "https://perso.ens-lyon.fr/nathalie.revol/software.html") + (home-page "https://gforge.inria.fr/projects/mpfi/") (synopsis "C library for arbitrary-precision interval arithmetic") (description "@acronym{MPFI, Multiple Precision Floating-point Interval} is a portable C -- cgit v1.2.3 From ce1cd4340455b7599385dba2248888a72d3e4d4f Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 27 May 2020 01:44:02 +0100 Subject: gnu: Add spectacle-analyzer. * gnu/packages/music.scm (spectacle-analyzer): new variable. Signed-off-by: Marius Bakke --- gnu/packages/music.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 09827c7c93..ac149a804c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -141,6 +141,7 @@ (define-module (gnu packages music) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) + #:use-module (gnu packages vim) ;for 'xxd' #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) @@ -4940,6 +4941,49 @@ (define-public sherlock-lv2 (home-page "https://open-music-kontrollers.ch/lv2/sherlock/") (license license:artistic2.0))) +(define-public spectacle-analyzer + (package + (name "spectacle-analyzer") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jpcima/spectacle.git") + (commit (string-append "v" version)) + ;; Bundles a specific commit of the DISTRHO plugin framework. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xiqa6z8g68lcvnwhws4j7c4py35r9d20cirrili7ycyp3a6149a")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags + (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("xxd" ,xxd))) + (inputs + `(("cairo", cairo) + ("fftw", fftw) + ("fftwf", fftwf) + ("jack", jack-1) + ("lv2", lv2) + ("mesa", mesa))) + (synopsis "Realtime graphical spectrum analyzer") + (description "Spectacle is a real-time spectral analyzer using the +short-time Fourier transform, available as LV2 audio plugin and JACK client.") + (home-page "https://github.com/jpcima/spectacle") + ;; The project is licensed under the ISC license, and files in + ;; sources/plugin carry the Expat license. + (license (list license:isc license:expat)))) + (define-public x42-plugins (package (name "x42-plugins") -- cgit v1.2.3 From cc6653e7a13d42dbbba398e6b4597b2c544274e6 Mon Sep 17 00:00:00 2001 From: TomZ Date: Wed, 27 May 2020 13:21:58 +0200 Subject: gnu: flowee: Really disable black-box test. * gnu/packages/finance.scm (flowee)[arguments]: The test 'api' has some timeouts which fail half the time in a build, so really disable the test. Signed-off-by: Marius Bakke --- gnu/packages/finance.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f182057bb4..28789c02d7 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1546,6 +1546,8 @@ (define-public flowee (lambda _ (substitute* "testing/CMakeLists.txt" (("test_api") "")) + (substitute* "testing/CMakeLists.txt" + (("add_subdirectory\\(api\\)") "")) #t)) (add-after 'configure 'set-build-info ;; Their genbuild.sh to generate a build.h fails in guix (no .git dir) . -- cgit v1.2.3 From c2e19b6291cc4981e39d01aae85af0899614061d Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Thu, 28 May 2020 18:01:34 +0000 Subject: gnu: python-pylint: Udpate to 2.5.2. * gnu/packages/check.scm (python-pylint): Update to 2.5.2. [arguments]: New field. (python2-pylint)[arguments]: Do not inherit #:tests?. Signed-off-by: Marius Bakke --- gnu/packages/check.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7d7fd189bc..8d99e67514 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1887,12 +1887,10 @@ (define-public python2-coverage-test-runner statements in the module it tests.") (license license:gpl3+))) -;; Further releases, up to 2.4.3, have failing unit tests. See: -;; https://github.com/PyCQA/pylint/issues/3198. (define-public python-pylint (package (name "python-pylint") - (version "2.3.1") + (version "2.5.2") (source (origin (method git-fetch) @@ -1902,8 +1900,11 @@ (define-public python-pylint (file-name (git-file-name name version)) (sha256 (base32 - "17vvzbcqmkhr4icq5p3737nbiiyj1y3g1pa08n9mb1bsnvxmqq0z")))) + "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) (build-system python-build-system) + ;; FIXME: Tests are failing since version 2.4.3, see: + ;; https://github.com/PyCQA/pylint/issues/3198. + (arguments '(#:tests? #f)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) @@ -1945,7 +1946,7 @@ (define-public python2-pylint (base32 "02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2")))) (arguments - `(,@(package-arguments pylint) + `(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint)) #:phases (modify-phases %standard-phases (replace 'check -- cgit v1.2.3 From 14491e79a0daec796fe170dc7cc16dbbf28f0ced Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 11:30:22 +0200 Subject: gnu: python-widgetsnbextension: Update to 3.5.1. * gnu/packages/python-xyz.scm (python-widgetsnbextension): Update to 3.5.1. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4cbf20ebcd..3a1f9fb43f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8996,14 +8996,14 @@ (define-public python2-notebook (define-public python-widgetsnbextension (package (name "python-widgetsnbextension") - (version "3.4.2") + (version "3.5.1") (source (origin (method url-fetch) (uri (pypi-uri "widgetsnbextension" version)) (sha256 (base32 - "0rc2nivdy7k4m3vljx7wdh2jh11djapcgwhvzlbs0isl8gl8nqgs")))) + "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs `(("python-ipykernel" ,python-ipykernel) -- cgit v1.2.3 From 2d6972b2a08920906b7d4486f5cd9b1905e1e3bf Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 11:31:13 +0200 Subject: gnu: python-ipywidgets: Update to 7.5.1. * gnu/packages/python-xyz.scm (python-ipywidgets): Update to 7.5.1. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3a1f9fb43f..da19fd9d62 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9023,14 +9023,14 @@ (define-public python2-widgetsnbextension (define-public python-ipywidgets (package (name "python-ipywidgets") - (version "5.2.2") + (version "7.5.1") (source (origin (method url-fetch) (uri (pypi-uri "ipywidgets" version)) (sha256 (base32 - "1lk0qrr5l9a0z7qkkn30hv5832whxwxymf1l576fmmad0n7hkxms")))) + "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs `(("python-ipython" ,python-ipython) -- cgit v1.2.3 From 5b4cb2b993c78fce7536fb897af3c65c431b4cf8 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 11:33:57 +0200 Subject: gnu: python-jupyter-console: Update to 6.1.0. * /gnu/packages/python-xyz.scm (python-jupyter-console): Update to 6.1.0. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index da19fd9d62..b968a6c9a9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9053,14 +9053,14 @@ (define-public python2-ipywidgets (define-public python-jupyter-console (package (name "python-jupyter-console") - (version "6.0.0") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "jupyter_console" version)) (sha256 (base32 - "1xdjw11cppf1fxvwkw2bk13ckkwas3bdah8baingn9296mvfi31h")))) + "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs `(("python-ipykernel" ,python-ipykernel) -- cgit v1.2.3 From bcbd63407e933ce04aef72757387a0bacdb07e77 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 13:21:19 +0200 Subject: gnu: python-iml: Move nose from propagated to native input. * gnu/packages/machine-learning.scm (python-iml)[propagated-inputs]: Move PYTHON-NOSE ... [native-inputs]: ... here. Signed-off-by: Marius Bakke --- gnu/packages/machine-learning.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 1b678d3d20..17d01bc656 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Konrad Hinsen +;;; Copyright © 2020 Edouard Klein ;;; ;;; This file is part of GNU Guix. ;;; @@ -1817,10 +1818,11 @@ (define-public python-iml (build-system python-build-system) (propagated-inputs `(("ipython" ,python-ipython) - ("nose" ,python-nose) ("numpy" ,python-numpy) ("pandas" ,python-pandas) ("scipy" ,python-scipy))) + (native-inputs + `(("nose" ,python-nose))) (home-page "https://github.com/interpretable-ml/iml") (synopsis "Interpretable Machine Learning (iML) package") (description "Interpretable ML (iML) is a set of data type objects, -- cgit v1.2.3 From 32ba87c14fd5e5b54d95211cd9a159d568ce7c67 Mon Sep 17 00:00:00 2001 From: Edouard Klein Date: Tue, 26 May 2020 15:53:49 +0200 Subject: gnu: python-prompt-toolkit: Update to 3.0.5. * gnu/packages/machine-learning.scm (python-iml)[propagated-inputs]: Pin implicit python-prompt-toolkit dependency to version 2. * gnu/packages/python-xyz.scm (python-widgetsnbextension)[propagated-inputs]: Pin implicit python-prompt-toolkit dependency to version 2. (python-ipywidgets)[propagated-inputs]: Pin implicit python-prompt-toolkit dependency to version 2. (python-jupyter-console)[propagated-inputs]: Pin explicit python-prompt-toolkit dependency to version 2. (python-prompt-toolkit): Update to version 3.0.5. [propagated-inputs]: Remove PYTHON-SIX and PYTHON-PYGMENTS. [home-page]: Adjust to current. (python-prompt-toolkit-2): New variable. (prompt-toolkit-2-instead-of-prompt-toolkit): New variable. (python2-prompt-toolkit): Keep at version 2. (python-prompt-toolkit-1): Inherit from version 2. Signed-off-by: Marius Bakke --- gnu/packages/machine-learning.scm | 3 ++- gnu/packages/python-xyz.scm | 48 ++++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 17d01bc656..e26768267b 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1817,7 +1817,8 @@ (define-public python-iml "1k8szlpm19rcwcxdny9qdm3gmaqq8akb4xlvrzyz8c2d679aak6l")))) (build-system python-build-system) (propagated-inputs - `(("ipython" ,python-ipython) + `(("ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + 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 b968a6c9a9..8f1c3bb6ee 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9006,7 +9006,8 @@ (define-public python-widgetsnbextension "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) + `(("python-ipykernel" + ,(prompt-toolkit-2-instead-of-prompt-toolkit python-ipykernel)) ("python-notebook" ,python-notebook))) (native-inputs `(("python-certifi" ,python-certifi) @@ -9033,7 +9034,8 @@ (define-public python-ipywidgets "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) (build-system python-build-system) (propagated-inputs - `(("python-ipython" ,python-ipython) + `(("python-ipython" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipython)) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs @@ -9063,9 +9065,10 @@ (define-public python-jupyter-console "06s3kr5vx0l1y1b7fxb04dmrppscl7q69sl9yyfr0d057d1ssvkg")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) + `(("python-ipykernel" ,(prompt-toolkit-2-instead-of-prompt-toolkit + python-ipykernel)) ("python-jupyter-client" ,python-jupyter-client) - ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) ("python-pygments" ,python-pygments))) (native-inputs `(("python-nose" ,python-nose))) @@ -12131,14 +12134,14 @@ (define-public python2-backpack (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") - (version "2.0.7") + (version "3.0.5") (source (origin (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version ".tar.gz")) + (uri (pypi-uri "prompt_toolkit" version)) (sha256 (base32 - "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) + "1j3x5s4gp4ih73sbcni0a0vffbzvrxbrbnkvb3fzjgxn810ilgan")))) (build-system python-build-system) (arguments `(#:phases @@ -12152,12 +12155,11 @@ (define-public python-prompt-toolkit (add-installed-pythonpath inputs outputs) (invoke "py.test")))))) (propagated-inputs - `(("python-wcwidth" ,python-wcwidth) - ("python-six" ,python-six) - ("python-pygments" ,python-pygments))) + `(("python-wcwidth" ,python-wcwidth))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "https://github.com/jonathanslenders/python-prompt-toolkit") + (home-page + "https://github.com/prompt-toolkit/python-prompt-toolkit") (synopsis "Library for building command line interfaces in Python") (description "Prompt-Toolkit is a library for building interactive command line @@ -12167,11 +12169,31 @@ (define-public python-prompt-toolkit characters, mouse support, and auto suggestions.") (license license:bsd-3))) +(define-public python-prompt-toolkit-2 + (package (inherit python-prompt-toolkit) + (name "python-prompt-toolkit") + (version "2.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prompt_toolkit" version)) + (sha256 + (base32 + "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) + (propagated-inputs + `(("python-wcwidth" ,python-wcwidth) + ("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)) + (package-with-python2 python-prompt-toolkit-2)) (define-public python-prompt-toolkit-1 - (package (inherit python-prompt-toolkit) + (package (inherit python-prompt-toolkit-2) (version "1.0.15") (source (origin -- cgit v1.2.3 From 85c331f7c1c3ec75ad94a4b212d0e69424589a25 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 28 May 2020 22:30:30 -0300 Subject: gnu: Add liferea. * gnu/packages/syndication.scm (liferea): New variable. Signed-off-by: Marius Bakke --- gnu/packages/syndication.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 3d33ee521f..3bb461dca8 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ (define-module (gnu packages syndication) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix packages) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -28,6 +30,10 @@ (define-module (gnu packages syndication) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gstreamer) + #:use-module (gnu packages gtk) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -36,6 +42,7 @@ (define-module (gnu packages syndication) #:use-module (gnu packages python-web) #:use-module (gnu packages sqlite) #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages xml)) (define-public newsboat @@ -89,6 +96,63 @@ (define-public newsboat (license (list license:gpl2+ ; filter/* license:expat)))) ; everything else +(define-public liferea + (package + (name "liferea") + (version "1.12.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/lwindolf/liferea/" + "releases/download/v" version "/liferea-" + version "b.tar.bz2")) + (sha256 + (base32 "03pr1gmiv5y0i92bkhcxr8s311ll91chz19wb96jkixx32xav91d")))) + (build-system glib-or-gtk-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'prepare-build-environment + (lambda* (#:key inputs #:allow-other-keys) + ;; Workaround for https://github.com/lwindolf/liferea/issues/767. + (setenv "WEBKIT_DISABLE_COMPOSITING_MODE" "1"))) + (add-after 'install 'wrap-gi-python + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (python-path (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/liferea") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("PYTHONPATH" ":" prefix (,python-path)))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("glib-networking" ,glib-networking) + ("gnome-keyring" ,gnome-keyring) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gstreamer" ,gstreamer) + ("json-glib" ,json-glib) + ("libnotify" ,libnotify) + ("libpeas" ,libpeas) + ("libsecret" ,libsecret) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("python" ,python) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("webkitgtk" ,webkitgtk))) + (home-page "https://lzone.de/liferea/") + (synopsis "News reader for GTK/GNOME") + (description "Liferea is a desktop feed reader/news aggregator that +brings together all of the content from your favorite subscriptions into +a simple interface that makes it easy to organize and browse feeds.") + (license license:gpl2+))) + (define-public rtv (package (name "rtv") -- cgit v1.2.3 From f5edd85d86f408c219679bee3c835f7a34d554ed Mon Sep 17 00:00:00 2001 From: Hamzeh Nasajpour Date: Fri, 29 May 2020 11:34:28 +0430 Subject: gnu: python-peewee: Update to 3.9.6. * gnu/packages/databases.scm (python-peewee): Update to 3.9.6. Signed-off-by: Marius Bakke --- 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 3b1b9ed366..ba15260c1f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2179,14 +2179,14 @@ (define-public libpqxx (define-public python-peewee (package (name "python-peewee") - (version "2.10.2") + (version "3.9.6") (source (origin (method url-fetch) (uri (pypi-uri "peewee" version)) (sha256 (base32 - "10f2mrd5hw6rjklrzaix2lsxlgc8vx3xak54arcy6yd791zhchi3")))) + "1j4sh946k0736m7pd54z0y6i2hjhgg3kdllx1pwq8xkzzcgrx1xw")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; Fails to import test data -- cgit v1.2.3 From d6f5120d5b0cc7e92d7ba0dccbccac7339ea1479 Mon Sep 17 00:00:00 2001 From: Hamzeh Nasajpour Date: Fri, 29 May 2020 12:02:48 +0430 Subject: gnu: python-orderedmultidict: Update to 1.0. * gnu/packages/python-xyz.scm (python-orderedmultidict): Update to 1.0. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8f1c3bb6ee..baec999247 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5082,14 +5082,14 @@ (define-public python-multidict (define-public python-orderedmultidict (package (name "python-orderedmultidict") - (version "0.7.11") + (version "1.0") (source (origin (method url-fetch) (uri (pypi-uri "orderedmultidict" version)) (sha256 (base32 - "0dls862ibm7qbq4fnvwx0xn1v9hwyzywbff8xjjdr42dd75208yw")))) + "1idjbl933avgaadscrjw1np3xkvnz3phq0l8vw5qs0rqcjx9b65q")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From f55152cec4d200d59bc503c0442b96827dd8c0e2 Mon Sep 17 00:00:00 2001 From: Hamzeh Nasajpour Date: Fri, 29 May 2020 12:10:49 +0430 Subject: gnu: python-furl: Update to 2.0.0. * gnu/packages/python-web.scm (python-furl): Update to 2.0.0. [native-inputs]: Remove PYTHON-PYCODESTYLE. Add PYTHON-FLAKE8. Signed-off-by: Marius Bakke --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cd8ce8a83f..61d21418d4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -324,20 +324,20 @@ (define-public python2-falcon-cors (define-public python-furl (package (name "python-furl") - (version "0.5.6") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "furl" version)) (sha256 (base32 - "0lzpfpm686hvz3sr1mcrnd1b3lgmnw8v59gb43wfi98r3b671pqc")))) + "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) ("python-orderedmultidict" ,python-orderedmultidict))) (native-inputs - `(("python-pycodestyle" ,python-pycodestyle))) + `(("python-flake8" ,python-flake8))) (home-page "https://github.com/gruns/furl") (synopsis "URL manipulation in Python") (description "Furl provides an easy-to-use alternative to the -- cgit v1.2.3 From e552fca96ce249b253f522e51e8f8bd769d166cf Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Fri, 29 May 2020 10:14:39 +0100 Subject: gnu: bemenu: Update to 0.4.1. * gnu/packages/xdisorg.scm (bemenu): Update to 0.4.1. Signed-off-by: Marius Bakke --- gnu/packages/xdisorg.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1325fbc821..3c98836102 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2018 Nam Nguyen ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019 Kyle Andrews -;;; Copyright © 2019 Josh Holland +;;; Copyright © 2019, 2020 Josh Holland ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 David Wilson @@ -215,7 +215,7 @@ (define-public autorandr (define-public bemenu (package (name "bemenu") - (version "0.2.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -224,10 +224,18 @@ (define-public bemenu (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0piax49az5kp96r1g6dcgj87fi6p4jl286wlkxsdvljzpkn8q6gv")))) - (build-system cmake-build-system) + (base32 "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0")))) + (build-system gnu-build-system) (arguments - '(#:configure-flags '("-DBEMENU_WAYLAND_RENDERER=ON"))) + '(#:tests? #f + #:make-flags (list "CC=gcc" + "CFLAGS=-O2 -fPIC" + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) (inputs `(("cairo" ,cairo) ("libx11" ,libx11) @@ -246,7 +254,7 @@ (define-public bemenu "bemenu is a dynamic menu which allows the user to flexibly select from a list of options (usually programs to launch). It renders the menu graphically with X11 or Wayland, or in a text terminal with ncurses.") - (license (list license:gpl3+ ; client program[s] and other sources + (license (list license:gpl3+ ; client program[s] and other sources license:lgpl3+)))) ; library and bindings (define-public copyq -- cgit v1.2.3 From 4ef531cd5dcc7c9c7f97597d7434c528dc0c12e2 Mon Sep 17 00:00:00 2001 From: Simon South Date: Fri, 29 May 2020 09:20:55 -0400 Subject: gnu: emacs-elpher: Update to 2.7.8. * gnu/packages/emacs-xyz.scm (emacs-elpher): Update to 2.7.8. Signed-off-by: Marius Bakke --- 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 4f7b4cf6cc..6d82e1921c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20837,7 +20837,7 @@ (define-public emacs-multi-term (define-public emacs-elpher (package (name "emacs-elpher") - (version "2.7.4") + (version "2.7.8") (source (origin (method git-fetch) @@ -20847,7 +20847,7 @@ (define-public emacs-elpher (file-name (git-file-name name version)) (sha256 (base32 - "13ba72sjfyg1xvam131iapzqdf9pkwpn67zlyydmm6bv9pxlr431")))) + "1x86c2lmqpmi5my356iz7lbygwpmp956dc50ng762ld0savzxff0")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From 8d6ead32a09e31534ac4bab3a9ea8ca81f16e405 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Fri, 29 May 2020 07:20:46 -0700 Subject: gnu: emacsy-minimal: Inputs now use guile version 2.2. * gnu/packages/guile-xyz.scm (emacsy-minimal)[inputs]: Use guile2.2-lib and guile2.2-readline instead of the 3.0 variants. Signed-off-by: Marius Bakke --- 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 6a8bf54bf8..0942e7cf74 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2890,8 +2890,8 @@ (define-public emacsy-minimal (build-system gnu-build-system) (inputs `(("guile" ,guile-2.2) - ("guile-lib" ,guile-lib) - ("guile-readline" ,guile-readline))) + ("guile-lib" ,guile2.2-lib) + ("guile-readline" ,guile2.2-readline))) (propagated-inputs '()) (arguments `(#:configure-flags '("--without-examples") -- cgit v1.2.3 From 839dba3a1f5abd1c71838556aefb84ef6798c659 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 30 May 2020 00:40:05 +0800 Subject: gnu: Add font-sarasa-gothic. * gnu/packages/fonts.scm (font-sarasa-gothic): New variable. Signed-off-by: Marius Bakke --- gnu/packages/fonts.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 14cf5b2dea..3be57eca3f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Julien Lepiller +;;; Copyright © 2020 Zhu Zihao Date: Sat, 30 May 2020 13:17:53 +0200 Subject: gnu: facter: Update to 4.0.25. * gnu/packages/admin.scm (facter): Update to 4.0.25. --- 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 36f063ca96..c331a662a7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -434,7 +434,7 @@ (define-public dfc (define-public facter (package (name "facter") - (version "4.0.24") + (version "4.0.25") (source (origin (method git-fetch) (uri (git-reference @@ -443,7 +443,7 @@ (define-public facter (file-name (git-file-name name version)) (sha256 (base32 - "1n8yd2p7m0jf0wld6q43f2gqxyz8fiamz3p79wbl53q5qih0vba2")))) + "04nbk9rn5lfhbivsx68dggsp05czm7mzfr1i7yv6168bl92d233y")))) (build-system ruby-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From bbad1f972777f6a66a05ab1bcfbd886fc50ca2d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 13:18:07 +0200 Subject: gnu: doctest: Update to 2.3.8. * gnu/packages/check.scm (doctest): Update to 2.3.8. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8d99e67514..adc872764e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -396,7 +396,7 @@ (define-public cxxtest (define-public doctest (package (name "doctest") - (version "2.3.7") + (version "2.3.8") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -404,7 +404,7 @@ (define-public doctest (file-name (git-file-name name version)) (sha256 (base32 - "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq")))) + "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description -- cgit v1.2.3 From 369114bef074de5e5595ada35d4335f9b75c4009 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 13:18:18 +0200 Subject: gnu: electron-cash: Update to 4.0.15. * gnu/packages/finance.scm (electron-cash): Update to 4.0.15. --- gnu/packages/finance.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 28789c02d7..78dc412340 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Vasile Dumitrascu -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Adriano Peluso ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou @@ -475,7 +475,7 @@ (define-public electrum (define-public electron-cash (package (name "electron-cash") - (version "4.0.14") + (version "4.0.15") (source (origin (method git-fetch) @@ -484,7 +484,7 @@ (define-public electron-cash (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6")))) + (base32 "0bvj64fdxpi0dbivhgv509kqq503zjp7r7xckl8q5c48j5h1zik2")))) (build-system python-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From eaf98d92e7319094b49f8eb701612221d77c3aab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 13:31:05 +0200 Subject: gnu: font-tamzen: Update to 1.11.5. * gnu/packages/fonts.scm (font-tamzen): Update to 1.11.5. --- gnu/packages/fonts.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3be57eca3f..58fba69802 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1068,7 +1068,7 @@ (define-public font-awesome (define-public font-tamzen (package (name "font-tamzen") - (version "1.11.4") + (version "1.11.5") (source (origin (method git-fetch) @@ -1077,8 +1077,7 @@ (define-public font-tamzen (commit (string-append "Tamzen-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "17kgmvg6q32mqhx9g44hjvzv0si0mnpprga4z7na930g2zdd8846")))) + (base32 "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 4d1cb5f9e562866681cb794170ccb7033f03ffd4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 16:05:57 +0200 Subject: gnu: lilv: Update to 0.24.8. * gnu/packages/audio.scm (lilv): Update to 0.24.8. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 358eddb22e..70746b8dfe 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1961,14 +1961,14 @@ (define-public python2-pyliblo (define-public lilv (package (name "lilv") - (version "0.24.6") + (version "0.24.8") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/lilv-" version ".tar.bz2")) (sha256 (base32 - "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z")))) + "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From d9a7102c9874d6d0d57cf254526ff4b5d352adab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 00:17:43 +0200 Subject: gnu: libhx: Update to 3.25. * gnu/packages/c.scm (libhx): Update to 3.25. --- gnu/packages/c.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 5c0209f42d..3e227decc9 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -236,15 +236,14 @@ (define-public libfixposix (define-public libhx (package (name "libhx") - (version "3.24") + (version "3.25") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libhx/libHX/" "libHX-" version ".tar.xz")) (sha256 - (base32 - "0i8v2464p830c15myknvvs6bhxaf663lrqgga95l94ygfynkw6x5")))) + (base32 "12avn16f8aqb0cq6jplz0sv7rh6f07m85dwc8dasnnwsvijwbpbj")))) (build-system gnu-build-system) (home-page "http://libhx.sourceforge.net") (synopsis "C library with common data structures and functions") -- cgit v1.2.3 From c2b27220e5bc7bbd2298d5f3db4291de7787b3ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 02:00:38 +0200 Subject: gnu: fio: Update to 3.20. * gnu/packages/benchmark.scm (fio): Update to 3.20. --- gnu/packages/benchmark.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 4e6c416518..0ac1833487 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -46,14 +46,14 @@ (define-module (gnu packages benchmark) (define-public fio (package (name "fio") - (version "3.19") + (version "3.20") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "01nc7igmcc6hda32d1y8vidd9x9pdlxvf3i1pwrzvmi6xvmbfvab")))) + "1mwqafn81a9pxy2kw9rl4p3r2brhg2ckwrcwzy0q4gffxgn3k9c7")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From a29a8a91fda99c5bba996b80707b8d42f2aa5080 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 02:00:54 +0200 Subject: gnu: ccache: Update to 3.7.9. * gnu/packages/ccache.scm (ccache): Update to 3.7.9. --- gnu/packages/ccache.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 529742403e..fc915965b4 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2016, 2017 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,14 +30,14 @@ (define-module (gnu packages ccache) (define-public ccache (package (name "ccache") - (version "3.7.7") + (version "3.7.9") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "1kcqii3hr1008gj6jgfsjibwh2ryhsplc9z99m18xwa2zvbddhdp")))) + (base32 "0jzl9idnjd9jq64qd8kny7gfd0ydvz5kyq2yslmigfdz8dsxm4zq")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) -- cgit v1.2.3 From ec8dc2157ae26025ab8f54fb53d818afed5f3ff6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 02:03:44 +0200 Subject: gnu: cloc: Update to 1.86. * gnu/packages/code.scm (cloc): Update to 1.86. --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 2285b519a0..a50ac3506a 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -222,7 +222,7 @@ (define ref (define-public cloc (package (name "cloc") - (version "1.84") + (version "1.86") (source (origin (method git-fetch) @@ -231,7 +231,7 @@ (define-public cloc (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "14xikdwcr6pcnkk2i43zrsj88z8b3mrv0svbnbvxvarw1id83pnn")))) + (base32 "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From 6dcc17105e1fa86513dc29395a79d789216990b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 02:24:34 +0200 Subject: gnu: abseil-cpp: Update to 20200225.2. * gnu/packages/cpp.scm (abseil-cpp): Update to 20200225.2. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index b32f4201c0..a1d82ccbc1 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -458,7 +458,7 @@ (define-public tweeny (define-public abseil-cpp (package (name "abseil-cpp") - (version "20200225.1") + (version "20200225.2") (source (origin (method git-fetch) (uri (git-reference @@ -467,7 +467,7 @@ (define-public abseil-cpp (file-name (git-file-name name version)) (sha256 (base32 - "035bffayslawc19q2gmlkr6n6r7k7mvriaq7352rv6gyzaplr98w")))) + "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" -- cgit v1.2.3 From 8e3a1a62ae496a6d32c8b0d4f89bc3e220d5d6e9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 30 May 2020 20:12:57 +0200 Subject: gnu: emacs-helm-fish-completion: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-helm-fish-completion): Update to 0.4. --- 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 6d82e1921c..e516d96fc4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21711,7 +21711,7 @@ (define-public emacs-flycheck-cpplint (define-public emacs-helm-fish-completion (package (name "emacs-helm-fish-completion") - (version "0.3") + (version "0.4") (home-page "https://github.com/emacs-helm/helm-fish-completion") (source (origin @@ -21721,7 +21721,7 @@ (define-public emacs-helm-fish-completion (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1iv0hwr74hzgrvrr31nlnswvi87lvpg24rd1rhkr5kjicr2295fq")))) + (base32 "0mh10qq3r16hjrayrbns51gmjpjnmpzy4i05rwn14rf2icvhs6x8")))) (build-system emacs-build-system) (propagated-inputs `(("helm" ,emacs-helm) -- cgit v1.2.3 From fb872fdf63cc8a8b9d15d5a2a1c2fc584371feef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 30 May 2020 23:03:47 +0300 Subject: gnu: rust-xml-rs-0.8: Update to 0.8.3. * gnu/packages/crates-io.scm (rust-mlx-rs-0.8): Update to 0.8.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2c4c6d4bb6..20f0567c51 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27434,7 +27434,7 @@ (define-public rust-xdg-2.2 (define-public rust-xml-rs-0.8 (package (name "rust-xml-rs") - (version "0.8.1") + (version "0.8.3") (source (origin (method url-fetch) @@ -27443,7 +27443,7 @@ (define-public rust-xml-rs-0.8 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c905wsmk995xypxljpxzq6vv660r1pzgyrpsfiz13kw3hf0dzcs")))) + "12ndxyhzxw2zdr76ql8nfdwb2vwhvdkrxwk4pbjafqfglmjv0zdh")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit v1.2.3 From 29334165ff01b1957dae5f2bac15ac7dfa021b6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 May 2020 23:09:29 +0200 Subject: Revert "gnu: python-pylint: Udpate to 2.5.2." This update broke 'Totem', see . This reverts commit c2e19b6291cc4981e39d01aae85af0899614061d. --- gnu/packages/check.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index adc872764e..0c4ab0b2db 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1887,10 +1887,12 @@ (define-public python2-coverage-test-runner statements in the module it tests.") (license license:gpl3+))) +;; Further releases, up to 2.4.3, have failing unit tests. See: +;; https://github.com/PyCQA/pylint/issues/3198. (define-public python-pylint (package (name "python-pylint") - (version "2.5.2") + (version "2.3.1") (source (origin (method git-fetch) @@ -1900,11 +1902,8 @@ (define-public python-pylint (file-name (git-file-name name version)) (sha256 (base32 - "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) + "17vvzbcqmkhr4icq5p3737nbiiyj1y3g1pa08n9mb1bsnvxmqq0z")))) (build-system python-build-system) - ;; FIXME: Tests are failing since version 2.4.3, see: - ;; https://github.com/PyCQA/pylint/issues/3198. - (arguments '(#:tests? #f)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) @@ -1946,7 +1945,7 @@ (define-public python2-pylint (base32 "02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2")))) (arguments - `(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint)) + `(,@(package-arguments pylint) #:phases (modify-phases %standard-phases (replace 'check -- cgit v1.2.3 From a8c7d4b0c326905b71680783ced6b68d25fb3bfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 May 2020 23:11:37 +0200 Subject: gnu: fonts.scm: Add missing '>' in copyright header. * gnu/packages/fonts.scm: Add missing > in email address. --- gnu/packages/fonts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 58fba69802..5964294202 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Julien Lepiller -;;; Copyright © 2020 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From aba53e7013aff6c978fafffbd7223365b56963c7 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 30 May 2020 21:27:49 +0200 Subject: gnu: python-astroid: Update to 2.4.1. * gnu/packages/python-xyz.scm (python-astroid): Update to 2.4.1. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index baec999247..79816ddc2f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -80,6 +80,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Yuval Kogman +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -13905,13 +13906,13 @@ (define-public python2-larch (define-public python-astroid (package (name "python-astroid") - (version "2.3.3") + (version "2.4.1") (source (origin (method url-fetch) (uri (pypi-uri "astroid" version)) (sha256 - (base32 "0fnibsl2cb5mvzbfm7sycj85smx48f8w8m7ks1sqlmpr9ps0gski")))) + (base32 "1h99jal7ax07xna1djw5z7hpgb8vjrl3hrrg49p1phljwniww5sc")))) (build-system python-build-system) (propagated-inputs `(("python-lazy-object-proxy" ,python-lazy-object-proxy) @@ -13923,19 +13924,6 @@ (define-public python-astroid ("python-nose" ,python-nose) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-spurious-test - (lambda _ - ;; This can be removed after upgrading from python-3.7 - ;; https://github.com/PyCQA/astroid/issues/593 - ;; https://bugs.python.org/issue34056 - (delete-file "astroid/tests/unittest_modutils.py") - #t)) - (replace 'check - (lambda _ - (invoke "pytest" "astroid")))))) (home-page "https://github.com/PyCQA/astroid") (synopsis "Common base representation of python source code for pylint and other projects") -- cgit v1.2.3 From f008bb0b2456c8c940a4ae0bd7bb1c4a3570d1da Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 May 2020 23:12:04 +0200 Subject: gnu: python-astroid: Remove unused inputs. * gnu/packages/python-xyz.scm (python-astroid)[propagated-inputs]: Remove PYTHON-TYPED-AST. [native-inputs]: Remove PYTHON-NOSE. --- gnu/packages/python-xyz.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 79816ddc2f..0caa271fca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13917,11 +13917,9 @@ (define-public python-astroid (propagated-inputs `(("python-lazy-object-proxy" ,python-lazy-object-proxy) ("python-six" ,python-six) - ("python-typed-ast" ,python-typed-ast) ("python-wrapt" ,python-wrapt))) (native-inputs `(("python-dateutil" ,python-dateutil) - ("python-nose" ,python-nose) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://github.com/PyCQA/astroid") -- cgit v1.2.3 From 42f48c664b3868d3f15d9f130004fb647267e25d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 30 May 2020 23:12:54 +0200 Subject: gnu: python-toml: Update to 0.10.1. * gnu/packages/python-xyz.scm (python-toml): Update to 0.10.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0caa271fca..6aa666430a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3727,14 +3727,14 @@ (define-public python2-feedgenerator (define-public python-toml (package (name "python-toml") - (version "0.9.4") + (version "0.10.1") (source (origin (method url-fetch) (uri (pypi-uri "toml" version)) (sha256 (base32 - "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf")))) + "03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no tests suite in release -- cgit v1.2.3 From 20dadf4e5d391a88254ef8769fd489a60a8d4991 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 30 May 2020 19:50:02 +0200 Subject: gnu: Add emacs-bm. * gnu/packages/emacs-xyz.scm (emacs-bm): New variable. Signed-off-by: Marius Bakke --- gnu/packages/emacs-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e516d96fc4..2a76e534cb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1918,6 +1918,26 @@ (define-public emacs-howm searches. Unlike code@{emacs-wiki.el}, it can be combined with any format.") (license license:gpl1+))) +(define-public emacs-bm + (package + (name "emacs-bm") + (version "201905") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joodland/bm.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "180b3rc13asrmsdh7v405d54jkrininvaj52xhp71vw91ng51dkn")))) + (build-system emacs-build-system) + (home-page "https://github.com/joodland/bm") + (synopsis "Visual bookmarks for Emacs") + (description "This package provides visible, buffer local bookmarks and +the ability to jump forward and backward to the next bookmark.") + (license license:gpl2+))) + (define-public emacs-calfw (package (name "emacs-calfw") -- cgit v1.2.3 From 11f1001c37a865ab3e43de1c354d90e2f1ff8d3c Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sat, 30 May 2020 16:33:52 -0400 Subject: gnu: Add mspdebug. * gnu/packages/debug.scm (mspdebug): New variable. Signed-off-by: Marius Bakke --- gnu/packages/debug.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 4a264427c2..cceebb00c8 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (gnu packages debug) #:use-module (gnu packages gtk) #:use-module (gnu packages golang) #:use-module (gnu packages image) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages ncurses) @@ -596,3 +598,37 @@ (define-public rr GDB/x86 features like hardware data watchpoints, makes debugging much more fun.") (license license:expat))) + +(define-public mspdebug + (package + (name "mspdebug") + (version "0.25") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlbeer/mspdebug.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + "INSTALL=install" + (string-append "PREFIX=" %output)))) + (inputs + `(("libusb-compat" ,libusb-compat) + ("readline" ,readline))) + (synopsis "Debugging tool for MSP430 MCUs") + (description "MspDebug supports FET430UIF, eZ430, RF2500 and Olimex +MSP430-JTAG-TINY programmers, as well as many other compatible +devices. It can be used as a proxy for gdb or as an independent +debugger with support for programming, disassembly and reverse +engineering.") + (home-page "https://github.com/dlbeer/mspdebug") + (license license:gpl2+))) -- cgit v1.2.3 From ceac05b8ebb2f81a2a36c596231a515ea2558b1d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 00:00:29 +0200 Subject: Revert "Revert "gnu: python-pylint: Udpate to 2.5.2."" This reverts commit 29334165ff01b1957dae5f2bac15ac7dfa021b6e. --- gnu/packages/check.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0c4ab0b2db..adc872764e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1887,12 +1887,10 @@ (define-public python2-coverage-test-runner statements in the module it tests.") (license license:gpl3+))) -;; Further releases, up to 2.4.3, have failing unit tests. See: -;; https://github.com/PyCQA/pylint/issues/3198. (define-public python-pylint (package (name "python-pylint") - (version "2.3.1") + (version "2.5.2") (source (origin (method git-fetch) @@ -1902,8 +1900,11 @@ (define-public python-pylint (file-name (git-file-name name version)) (sha256 (base32 - "17vvzbcqmkhr4icq5p3737nbiiyj1y3g1pa08n9mb1bsnvxmqq0z")))) + "150x679mrlgm1s4ym7irf9mnsjilqyaakss4spc4pbrzkl11agnh")))) (build-system python-build-system) + ;; FIXME: Tests are failing since version 2.4.3, see: + ;; https://github.com/PyCQA/pylint/issues/3198. + (arguments '(#:tests? #f)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner) @@ -1945,7 +1946,7 @@ (define-public python2-pylint (base32 "02a89d8a47s7nfiv1ady3j0sg2sbyja3np145brarfp5x9qxz9x2")))) (arguments - `(,@(package-arguments pylint) + `(,@(strip-keyword-arguments '(#:tests?) (package-arguments pylint)) #:phases (modify-phases %standard-phases (replace 'check -- cgit v1.2.3 From 9c12c277b1400b896f547465907b8f09eb90953f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 May 2020 22:22:47 +0200 Subject: gnu: python-pylint: Add missing propagated input. This follows up on commit c2e19b6291cc4981e39d01aae85af0899614061d. * gnu/packages/check.scm (python-pylint)[propagated-inputs]: Add python-toml. --- gnu/packages/check.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index adc872764e..9837ea9756 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1913,7 +1913,8 @@ (define-public python-pylint `(("python-astroid" ,python-astroid) ("python-isort" ,python-isort) ("python-mccabe" ,python-mccabe) - ("python-six" ,python-six))) + ("python-six" ,python-six) + ("python-toml" ,python-toml))) (home-page "https://github.com/PyCQA/pylint") (synopsis "Python source code analyzer which looks for coding standard errors") -- cgit v1.2.3 From 2a9761b13b44032f8d902e0fcfecd0659cbfa8c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 00:00:46 +0200 Subject: gnu: totem: Don't use NAME in source URI. * gnu/packages/gnome.scm (totem)[source]: Hard-code NAME. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1745bf7906..03de03559d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4889,9 +4889,9 @@ (define-public totem (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/totem/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "totem-" version ".tar.xz")) (sha256 (base32 "028sc6xbyi7rs884862d8f3di6zhcm0lhvlpc3r69ifzjsq9my3b")))) -- cgit v1.2.3 From 187d02cd437ae9e6d2a67e56c82502c6feea73cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 00:14:37 +0200 Subject: gnu: totem: Remove python-pylint native input. It's optional & runs a pointless lint check that fails with pylint 2.5. * gnu/packages/gnome.scm (totem)[native-inputs]: Remove python-pylint. --- gnu/packages/gnome.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 03de03559d..fe71e316f3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4904,7 +4904,6 @@ (define-public totem ("intltool" ,intltool) ("itstool" ,itstool) ("xmllint" ,libxml2) - ("python-pylint" ,python-pylint) ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("dconf" ,dconf))) -- cgit v1.2.3 From d818256e467af8fba9e80454ff29eccde3fae9ba Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 00:20:27 +0200 Subject: gnu: csound: Update to 6.14.0. * gnu/packages/audio.scm (csound): Update to 6.14.0. [inputs]: move gettext-minimal... [native-inputs]: ... there. Also re-order inputs alphabetically. --- gnu/packages/audio.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 70746b8dfe..2d22dfc85a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -851,30 +851,30 @@ (define-public swh-plugins-lv2 (define-public csound (package (name "csound") - (version "6.13.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/csound/csound.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14822ybqyp31z18gky2y9zadr9dkbhabg97y139py73w7v3af1bh")))) + (version "6.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/csound/csound.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sr9knfhbm2m0wpkjq2l5n471vnl51wy4p6j4m95zqybimzb4s2j")))) (build-system cmake-build-system) - (inputs - `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) - ("pulseaudio" ,pulseaudio) - ("libsndfile" ,libsndfile) - ("liblo" ,liblo) - ("ladspa" ,ladspa) - ("jack" ,jack-1) - ("gettext" ,gettext-minimal))) (native-inputs `(("bison" ,bison) ("flex" ,flex) + ("gettext" ,gettext-minimal) ("zlib" ,zlib))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("jack" ,jack-1) + ("ladspa" ,ladspa) + ("liblo" ,liblo) + ("libsndfile" ,libsndfile) + ("pulseaudio" ,pulseaudio))) (home-page "https://csound.com/") (synopsis "Sound and music computing system") (description -- cgit v1.2.3 From 248af68449e33c621afbff9d05bcb77d1097c1d6 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 28 May 2020 11:35:07 -0400 Subject: gnu: Add opendoas. * gnu/packages/admin.scm (opendoas): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/admin.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c331a662a7..0bc1d160fb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -1456,6 +1457,53 @@ (define-public sudo ;; See . (license license:x11))) +(define-public opendoas + (package + (name "opendoas") + (version "6.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Duncaen/OpenDoas.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + ;; The configure script doesn't accept most of the default flags. + (lambda* (#:key configure-flags #:allow-other-keys) + ;; The configure script can only be told which compiler to use + ;; through environment variables. + (setenv "CC" ,(cc-for-target)) + (apply invoke "./configure" configure-flags))) + (add-before 'install 'fix-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "bsd.prog.mk" + (("^\tchown.*$") "")) + #t))) + #:configure-flags + (list (string-append "--prefix=" (assoc-ref %outputs "out")) + (string-append "--target=" (or ,(%current-target-system) "")) + "--with-timestamp") + ;; Compiler choice is not carried over from the configure script. + #:make-flags + (list (string-append "CC=" ,(cc-for-target))) + #:tests? #f)) ; no test suite + (native-inputs + `(("bison" ,bison))) + (home-page "https://github.com/Duncaen/OpenDoas") + (synopsis "Portable version of OpenBSD's doas command") + (description "Doas is a minimal replacement for the venerable sudo. It was +initially written by Ted Unangst of the OpenBSD project to provide 95% of the +features of sudo with a fraction of the codebase.") + (license (list license:bsd-3 ; libbsd/* + license:isc)))) ; everything else + (define-public wpa-supplicant-minimal (package (name "wpa-supplicant-minimal") -- cgit v1.2.3 From b40ba288f139787a447707aff16b8f06f1e05f04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 01:30:08 +0200 Subject: gnu: mu: Update to 1.4.8. * gnu/packages/mail.scm (mu): Update to 1.4.8. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8fb2a3c39e..1a81389d18 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -711,15 +711,15 @@ (define-public emacs-mew (define-public mu (package (name "mu") - (version "1.4.7") + (version "1.4.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" - "download/1,4.7/" ; sic + "download/" version "/" "mu-" version ".tar.xz")) (sha256 (base32 - "19qmz9fgnjpj0cxb8y9nb2dfk7pc0a9kwfiysa0f13ps3d5k4mhm")))) + "0vww8n7r6pfl4jyijhzas3fpdl6v1ndhc99zr1fsamjldxqpxk5m")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From b378297798ce207a47d348788785266b0047db68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 01:53:33 +0200 Subject: gnu: opendoas: Don't pass unused target to ./configure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (opendoas)[arguments]: Remove ‘--target=…’ from the #:configure-flags for now. --- gnu/packages/admin.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 0bc1d160fb..2bd1922fea 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1488,7 +1488,8 @@ (define-public opendoas #t))) #:configure-flags (list (string-append "--prefix=" (assoc-ref %outputs "out")) - (string-append "--target=" (or ,(%current-target-system) "")) + ;; Nothing is done with this value (yet?) but it's supported. + ;; (string-append "--target=" (or ,(%current-target-system) "")) "--with-timestamp") ;; Compiler choice is not carried over from the configure script. #:make-flags -- cgit v1.2.3 From 47c2db84b81344865969c64b1aac889c4f989d51 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 01:57:20 +0200 Subject: gnu: eternalterminal: Update to 6.0.7. * gnu/packages/terminals.scm (eternalterminal): Update to 6.0.7. [arguments]: Remove unnecessary phases. The removed directories no longer exist. --- gnu/packages/terminals.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 226f3ee05a..335b8d3ae1 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1036,7 +1036,7 @@ (define-public kitty (define-public eternalterminal (package (name "eternalterminal") - (version "5.1.10") + (version "6.0.7") (source (origin (method git-fetch) @@ -1045,7 +1045,7 @@ (define-public eternalterminal (commit (string-append "et-v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0jh89229bd9s82h3aj6faaybwr5xvnk8w2kgz47gq263pz021zpl")))) + (base32 "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_TEST=ON") @@ -1055,12 +1055,6 @@ (define-public eternalterminal (lambda* (#:key inputs #:allow-other-keys) (let ((tests (assoc-ref inputs "googletest"))) (copy-recursively tests "external/googletest")) - #t)) - (add-after 'install 'dont-provide-gtest-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/include")) - (delete-file-recursively (string-append out "/lib"))) #t))))) (inputs `(("gflags" ,gflags) -- cgit v1.2.3 From 776ecaaa0fb7201ae34653aa4c33e240b6d7b901 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:15:08 +0200 Subject: gnu: emacs-bbdb: Update to 3.2. * gnu/packages/emacs-xyz.scm (emacs-bbdb): Update to 3.2. [source]: Use GNU ELPA. [build-system]: Use emacs-build-system. [arguments]: Ignore "bbdb-vm.el". Remove unnecessary phases. [home-page]: Switch to GNU ELPA URI. --- gnu/packages/emacs-xyz.scm | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a76e534cb..3b08ff5393 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1605,36 +1605,21 @@ (define-public emacs-auto-sudoedit (define-public emacs-bbdb (package (name "emacs-bbdb") - (version "3.1.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah/bbdb/bbdb-" - version ".tar.gz")) - (sha256 - (base32 - "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05")) - (modules '((guix build utils))) - (snippet - ;; We don't want to build and install the PDF. - '(begin - (substitute* "doc/Makefile.in" - (("^doc_DATA = .*$") - "doc_DATA =\n")) - #t)))) - (build-system gnu-build-system) + (version "3.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "bbdb-" version ".tar")) + (sha256 + (base32 "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx")))) + (build-system emacs-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Add an autoloads file with the right name for guix.el. - (let* ((out (assoc-ref outputs "out")) - (site (string-append out "/share/emacs/site-lisp"))) - (with-directory-excursion site - (symlink "bbdb-loaddefs.el" "bbdb-autoloads.el"))) - #t))))) - (native-inputs `(("emacs" ,emacs-minimal))) - (home-page "https://savannah.nongnu.org/projects/bbdb/") + ;; XXX: The following file cannot be byte-compiled, because et requires + ;; `vm-autoloads', from the VM package, with is neither in Emacs nor + ;; packaged in Guix. So, don't bother for now. + `(#:exclude '("bbdb-vm\\.el"))) + (home-page "http://elpa.gnu.org/packages/bbdb.html") (synopsis "Contact management utility for Emacs") (description "BBDB is the Insidious Big Brother Database for GNU Emacs. It provides -- cgit v1.2.3 From 19a651cbffcf8602a6a1d5c4669f85f72406dc9a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:19:37 +0200 Subject: gnu: emacs-bongo: Update to 1.1. * gnu/packages/emacs-xyz.scm (emacs-bongo): Update to 1.1. --- 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 3b08ff5393..f3ce3be2b6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12224,7 +12224,7 @@ (define-public emacs-evil-quickscope (define-public emacs-bongo (package (name "emacs-bongo") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -12233,7 +12233,7 @@ (define-public emacs-bongo (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr")))) + (base32 "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv")))) (build-system emacs-build-system) (home-page "https://github.com/dbrock/bongo") (synopsis "Media player for Emacs") -- cgit v1.2.3 From bb78d75c58b313481792aba26f128e50b65a38cc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:22:53 +0200 Subject: gnu: emacs-csv-mode: Update to 1.12. * gnu/packages/emacs-xyz.scm (emacs-csv-mode): Update to 1.12. --- 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 f3ce3be2b6..d00cf5d885 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11967,14 +11967,14 @@ (define-public emacs-easy-kill (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.10") + (version "1.12") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/csv-mode-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "csv-mode-" version ".tar")) (sha256 - (base32 "0q7j2cmj7vs6hz8cnf7j7lmlcjmig3jn2p6az345z96agl8a5xsq")))) + (base32 "0bya12smlrzwv4cbcmch4kg1fazp4k0ndrh1z17ix9p8c14d0v1j")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") -- cgit v1.2.3 From fc1a9df2b73e852721758582cf18f6c5ac0b4df1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:24:34 +0200 Subject: gnu: emacs-adaptive-wrap: Update to 0.7. * gnu/packages/emacs-xyz.scm (emacs-adaptive-wrap): Update to 0.7. --- gnu/packages/emacs-xyz.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d00cf5d885..a51f844324 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9911,15 +9911,14 @@ (define-public emacspeak (define-public emacs-adaptive-wrap (package (name "emacs-adaptive-wrap") - (version "0.5.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/adaptive-wrap-" - version ".el")) - (sha256 - (base32 - "0qi7gjprcpywk2daivnlavwsx53hl5wcqvpxbwinvigg42vxh3ll")))) + (version "0.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "adaptive-wrap-" version ".el")) + (sha256 + (base32 "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/adaptive-wrap.html") (synopsis "Smart line-wrapping with wrap-prefix") -- cgit v1.2.3 From 018cffc9c9e5a5855733f5f45a1c4d396bb6a321 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 May 2020 02:26:34 +0200 Subject: gnu: emacs-tramp: Update to 2.4.3.5. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.4.3.5. --- 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 a51f844324..08730fc574 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20349,14 +20349,14 @@ (define-public emacs-counsel-tramp (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.4.3.4") + (version "2.4.3.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "01il42xb6s38qnb7bhn9d7gscc5p5y4da5a4dp1i1cyi823sfp8f")))) + (base32 "14djizi4ivwv4ad4nymday86jbh45w14wdhlm96743ffwr45dd2m")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit v1.2.3 From bf6438f46583003cfd851c9f8ff4104aa3107c4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 31 May 2020 14:56:57 +0200 Subject: gnu: ccl: Prevent creating invalid derivation on unsupported platforms. * gnu/packages/lisp.scm (ccl)[inputs]: For the "ccl-bootstrap" input, use the x86 origin as the fallback entry. [arguments]: Add (ice-9 match) in #:modules. Rewrite phases to use the scoped SYSTEM variable instead of splicing in a match on %CURRENT-SYSTEM. --- gnu/packages/lisp.scm | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 21e1a0449b..97b8f0d80d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -592,25 +592,24 @@ (define-public ccl (uri (string-append "https://github.com/Clozure/ccl/releases/download/v" version "/" (match (%current-system) - ((or "i686-linux" "x86_64-linux") "linuxx86") ("armhf-linux" "linuxarm") - ;; Prevent errors when querying this package on unsupported - ;; platforms, e.g. when running "guix package --search=" - (_ "UNSUPPORTED")) + ;; XXX: This source only works on x86, but provide it as a + ;; catch-all to prevent errors when querying this package + ;; on unsupported platforms. + (_ "linuxx86")) ".tar.gz")) (sha256 (base32 (match (%current-system) - ((or "i686-linux" "x86_64-linux") - "15l7cfa4a7jkfwdzsfm4q3n22jnb57imxahpql3h77xin57v1gbz") ("armhf-linux" "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c") - (_ "")))))))) + (_ "15l7cfa4a7jkfwdzsfm4q3n22jnb57imxahpql3h77xin57v1gbz")))))))) (native-inputs `(("m4" ,m4))) (arguments `(#:tests? #f ;no 'check' target - #:modules ((srfi srfi-26) + #:modules ((ice-9 match) + (srfi srfi-26) (guix build utils) (guix build gnu-build-system)) #:phases @@ -622,19 +621,16 @@ (define-public ccl (add-before 'build 'pre-build ;; Enter the source directory for the current platform's lisp ;; kernel, and run 'make clean' to remove the precompiled one. - (lambda _ + (lambda* (#:key system #:allow-other-keys) (substitute* "lisp-kernel/m4macros.m4" (("/bin/pwd") (which "pwd"))) (chdir (string-append "lisp-kernel/" - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "linuxx8632") - ("x86_64-linux" "linuxx8664") - ("armhf-linux" "linuxarm") - ;; Prevent errors when querying this package - ;; on unsupported platforms, e.g. when running - ;; "guix package --search=" - (_ "UNSUPPORTED")))) + (match system + ("i686-linux" "linuxx8632") + ("x86_64-linux" "linuxx8664") + ("armhf-linux" "linuxarm") + (_ (string-append "unknown system: " system))))) (substitute* '("Makefile") (("/bin/rm") "rm")) (setenv "CC" "gcc") @@ -642,7 +638,7 @@ (define-public ccl ;; XXX Do we need to recompile the heap image as well for Guix? ;; For now just use the one we already got in the tarball. (replace 'install - (lambda* (#:key outputs inputs #:allow-other-keys) + (lambda* (#:key outputs inputs system #:allow-other-keys) ;; The lisp kernel built by running 'make' in lisp-kernel/$system ;; is put back into the original directory, so go back. The heap ;; image is there as well. @@ -653,20 +649,18 @@ (define-public ccl (wrapper (string-append bindir "ccl")) (bash (assoc-ref inputs "bash")) (kernel - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "lx86cl") - ("x86_64-linux" "lx86cl64") - ("armhf-linux" "armcl") - ;; Prevent errors when querying this package - ;; on unsupported platforms, e.g. when running - ;; "guix package --search=" - (_ "UNSUPPORTED"))) + (match system + ("i686-linux" "lx86cl") + ("x86_64-linux" "lx86cl64") + ("armhf-linux" "armcl") + ;; Unlikely to work, but try it anyway... + (_ system))) (heap (string-append kernel ".image"))) (install-file kernel libdir) (install-file heap libdir) - (let ((dirs '("lib" "library" "examples" "tools" "objc-bridge" - ,@(match (%current-system) + (let ((dirs `("lib" "library" "examples" "tools" "objc-bridge" + ,@(match system ("x86_64-linux" '("x86-headers64")) ("i686-linux" -- cgit v1.2.3 From 9f6efa117cd309cb9b467b96dd2d6bb472df7abb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 31 May 2020 19:16:35 +0300 Subject: gnu: chess: Update to 6.2.7. * gnu/packages/games.scm (chess): Update to 6.2.7. --- 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 210cf8ab58..bf68c34f5a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2053,7 +2053,7 @@ (define-public cmatrix (define-public chess (package (name "chess") - (version "6.2.6") + (version "6.2.7") (source (origin (method url-fetch) @@ -2061,7 +2061,7 @@ (define-public chess ".tar.gz")) (sha256 (base32 - "0kxhdv01ia91v2y0cmzbll391ns2vbmn65jjrv37h4s1srszh5yn")))) + "0ilq4bfl0lwyzf11q7n2skydjhalfn3bgxhrp5hjxs5bc5d6fdp5")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/chess/") (synopsis "Full chess implementation") -- cgit v1.2.3 From 620daa6b342d4d72fef2d9ce1ba2fbd11a65266b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 31 May 2020 21:15:38 +0200 Subject: gnu: sbcl: Update to 2.0.5. * gnu/packages/lisp.scm (sbcl): Update to 2.0.5. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 97b8f0d80d..498eee9526 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -372,14 +372,14 @@ (define-public clisp (define-public sbcl (package (name "sbcl") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1lc2i4qq1kfdybmxnj2zq2hn3hfx0vvlqim4gvlgvs3bfr0lcaqj")))) + (base32 "1jz26w1i3riv032aa35vww4cv7cjk2ww7dp70c7wk4r8s66zhl00")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit v1.2.3 From 3b00a6b008be168cf378edef4543858439d212ae Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 28 May 2020 20:49:24 -0300 Subject: gnu: Add emacs-dracula-theme. * gnu/packages/emacs-xyz.scm (emacs-dracula-theme): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 08730fc574..4a2452577c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9080,6 +9080,27 @@ (define-public emacs-dream-theme by zenburn, sinburn and similar themes, but slowly diverging from them.") (license license:gpl3+)))) +(define-public emacs-dracula-theme + (package + (name "emacs-dracula-theme") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dracula/emacs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15y2djc5jljlvls1x9kp50m1kp0dcksmyixafsyimj66xpq9ngh0")))) + (build-system emacs-build-system) + (home-page "https://draculatheme.com/") + (synopsis "Dark theme for Emacs") + (description + "Dracula is a dark color theme for many editors, shells and more. This +package provides the Emacs theme.") + (license license:expat))) + (define-public emacs-auto-complete (package (name "emacs-auto-complete") -- cgit v1.2.3 From c7210b9613372dffa7b1926832b1ec1ff97d4bbf Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 31 May 2020 13:03:23 -0300 Subject: gnu: homebank: Add libofx dependency. * gnu/packages/finance.scm (homebank)[inputs]: Add libofx. Signed-off-by: Nicolas Goaziou --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 78dc412340..dba7db8680 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Christopher Lemmer Webber ;;; Copyright © 2020 Tom Zander ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,9 +187,8 @@ (define-public homebank ("intltool" ,intltool))) (inputs `(("gtk+" ,gtk+) + ("libofx" ,libofx) ("libsoup" ,libsoup))) - (arguments - `(#:configure-flags (list "-without-ofx"))) ; libofx is not available yet (home-page "http://homebank.free.fr/") (synopsis "Graphical personal accounting application") (description "HomeBank allows you to manage your personal accounts at -- cgit v1.2.3 From 115a1ed2b84006a409811605ba818ce599082401 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 31 May 2020 13:03:24 -0300 Subject: gnu: homebank: Update to 5.4.2. * gnu/packages/finance.scm (homebank): Update to 5.4.2. Signed-off-by: Nicolas Goaziou --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index dba7db8680..552c2abed3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -173,14 +173,14 @@ (define-public bitcoin-core (define-public homebank (package (name "homebank") - (version "5.2.8") + (version "5.4.2") (source (origin (method url-fetch) (uri (string-append "http://homebank.free.fr/public/homebank-" version ".tar.gz")) (sha256 (base32 - "13ampiv68y30kc0p2560g3yz8whqpwnidfcnb9lndv93b9ca767y")))) + "0bkjvd819kw9cwmr3macggbg8yil3yc8v2za8pjrl6g746s89kn6")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 6c3d3f2949278055124f5070112b4149b8105503 Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Fri, 29 May 2020 18:35:55 -0700 Subject: gnu: Add emacs-buffer-move. * gnu/packages/emacs-xyz.scm (emacs-buffer-move): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4a2452577c..7c014cfd4c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Marcin Karpezo +;;; Copyright © 2020 Fredrik Salomonsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -22457,6 +22458,29 @@ (define-public emacs-boxquote example code.") (license license:gpl3+)))) +(define-public emacs-buffer-move + (package + (name "emacs-buffer-move") + (version "0.6.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lukhas/buffer-move.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c")))) + (build-system emacs-build-system) + (home-page "https://github.com/lukhas/buffer-move") + (synopsis "Functions for moving Emacs' buffers around") + (description + "This package define functions for swapping buffers between windows +contained in the same frame. An alternate behavior is to have the current +window switch to the previous buffer instead of swapping with the other +window.") + (license license:gpl3+))) + (define-public emacs-company-ebdb (package (name "emacs-company-ebdb") -- cgit v1.2.3 From 14c79f171f037b62385caeaa75a4bb2904ad8a13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 May 2020 23:51:21 +0200 Subject: gnu: youtube-dl: Update to 2020.05.29. * gnu/packages/video.scm (youtube-dl): Update to 2020.05.29. --- 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 e541016010..ccefb0c4f4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1611,7 +1611,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2020.05.08") + (version "2020.05.29") (source (origin (method url-fetch) (uri (string-append "https://github.com/ytdl-org/youtube-dl/" @@ -1619,7 +1619,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6")))) + "111ganbfi76ipfq5gjgamjbqd7m8l4lim9wwmfnc04bzvwqqzfi3")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From c727df6f5475481156609628bb9b3341964d79b1 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 31 May 2020 23:54:27 +0200 Subject: gnu: sameboy: Update to 0.13. * gnu/packages/emulators.scm (sameboy): Update to 0.13. --- 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 7fad8a775b..14c438337c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -470,7 +470,7 @@ (define-public mgba (define-public sameboy (package (name "sameboy") - (version "0.12.3") + (version "0.13") (source (origin (method git-fetch) @@ -479,7 +479,7 @@ (define-public sameboy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m5rv2x8qck1kr43xq186pp4kaiay7gd1x775n9qrljcd7z4x6fs")))) + (base32 "0cp126sd76h1c6pj7cmsgzn5kd471524ikhyspv7flcm8nmz9mq0")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) -- cgit v1.2.3 From 6f6758c45d3913dbf98bb8e50f21f7bfb25b40ea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 30 May 2020 16:36:59 +0200 Subject: maint: Adjust comment in 'pre-push' hook. * etc/git/pre-push: Adjust comment. --- etc/git/pre-push | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/git/pre-push b/etc/git/pre-push index 59294f0ffb..415345fc75 100755 --- a/etc/git/pre-push +++ b/etc/git/pre-push @@ -1,6 +1,8 @@ #!/bin/sh -# A hook script that prevents the user from pushing unsigned commits. +# This hook script prevents the user from pushing to Savannah if any of the new +# commits' OpenPGP signatures cannot be verified, or if a commit is signed +# with an unauthorized key. # Called by "git push" after it has checked the remote status, but before # anything has been pushed. If this script exits with a non-zero status nothing -- cgit v1.2.3 From 912be8ec342a04bd4f50c353f2776408fbcfea74 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 31 May 2020 18:55:51 +0200 Subject: gnu: biber: Update to 2.12. Fixes . Reported by Mikhail Tsykalov . This essentially reverts 40fd909e3ddee2c46a27a4fe92ed49d3e7ffb413. This is a followup to the TeX Live 2019 update in 85892948bd9fb5fcc3409a60204cc8b14a4eb030. * gnu/packages/tex.scm (biber): Update to 2.12. --- gnu/packages/patches/biber-sortinithash.patch | 9 +++++++++ gnu/packages/tex.scm | 7 +++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/patches/biber-sortinithash.patch b/gnu/packages/patches/biber-sortinithash.patch index 1f054d25e4..5a626705e6 100644 --- a/gnu/packages/patches/biber-sortinithash.patch +++ b/gnu/packages/patches/biber-sortinithash.patch @@ -17,6 +17,15 @@ index b4f641e..c6f86c7 100644 \field{extraname}{1} \field{sortinit}{L} - \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f} ++ \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c} + \field{labelnamesource}{author} + \field{labeltitlesource}{title} + \field{title}{The Title} +@@ -116,7 +116,7 @@ my $ann2 = q| \entry{ann2}{misc}{} + \strng{authorfullhash}{90ae96c82de92e36949bc64254bbde0c} + \field{extraname}{2} + \field{sortinit}{L} +- \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f} + \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c} \field{labelnamesource}{author} \field{labeltitlesource}{title} diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 683f9d7283..137e000bc5 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -5916,8 +5916,11 @@ (define-public perl-text-bibtex (define-public biber (package + ;; Note: When updating Biber, make sure it matches our BibLaTeX version by + ;; checking the Biber/BibLaTeX compatibility matrix in the BibLaTeX manual + ;; at . (name "biber") - (version "2.11") + (version "2.12") (source (origin (method git-fetch) (uri (git-reference @@ -5930,7 +5933,7 @@ (define-public biber "biber-sortinithash.patch")) (sha256 (base32 - "0qgkc1k9n36yfmndwz879pak6mjphld0p85lzn9g2ng0vhxsifzz")))) + "1g1hi6zvf2hmrjly1sidjaxy5440gfqm4p7p3n7kayshnjsmlskx")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 625cdb05d71fd60eecad5f4673fa94af3472061b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 22 May 2020 16:02:26 +0200 Subject: gnu: Add pypy3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (pypy3): New public variable. * gnu/packages/patches/pypy3-7.3.1-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/patches/pypy3-7.3.1-fix-tests.patch | 278 +++++++++++++++++++++++ gnu/packages/python.scm | 171 ++++++++++++++ 3 files changed, 450 insertions(+) create mode 100644 gnu/packages/patches/pypy3-7.3.1-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 768943a67a..fd787299d2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1439,6 +1439,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ + %D%/packages/patches/pypy3-7.3.1-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ diff --git a/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch b/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch new file mode 100644 index 0000000000..464aad967f --- /dev/null +++ b/gnu/packages/patches/pypy3-7.3.1-fix-tests.patch @@ -0,0 +1,278 @@ +Fix a few testcases. Adapted from python-3-fix-tests.patch. + +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_callbacks.py pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_callbacks.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_callbacks.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_callbacks.py 2020-05-21 14:19:14.827288853 +0200 +@@ -4,6 +4,7 @@ + from ctypes import * + from ctypes.test import need_symbol + import _ctypes_test ++import platform + + class Callbacks(unittest.TestCase): + functype = CFUNCTYPE +@@ -178,6 +179,8 @@ + + self.assertLess(diff, 0.01, "%s not less than 0.01" % diff) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_issue_8959_a(self): + from ctypes.util import find_library + libc_path = find_library("c") +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_libc.py pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_libc.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/ctypes/test/test_libc.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/ctypes/test/test_libc.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2,6 +2,7 @@ + + from ctypes import * + import _ctypes_test ++import platform + + lib = CDLL(_ctypes_test.__file__) + +@@ -17,6 +18,8 @@ + import math + self.assertEqual(lib.my_sqrt(2.0), math.sqrt(2.0)) + ++ @unittest.skipIf(platform.machine() in ['mips64'], ++ "This test fails on this platform") + def test_qsort(self): + comparefunc = CFUNCTYPE(c_int, POINTER(c_char), POINTER(c_char)) + lib.my_qsort.argtypes = c_void_p, c_size_t, c_size_t, comparefunc +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_archive_util.py pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_archive_util.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_archive_util.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_archive_util.py 2020-05-21 14:19:14.827288853 +0200 +@@ -333,6 +333,7 @@ + self.assertEqual(os.path.basename(res), 'archive.tar.xz') + self.assertEqual(self._tarinfo(res), self._created_files) + ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -362,6 +363,7 @@ + + @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_tarfile_root_owner(self): + tmpdir = self._create_files() + base_name = os.path.join(self.mkdtemp(), 'archive') +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_sdist.py pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_sdist.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/distutils/tests/test_sdist.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/distutils/tests/test_sdist.py 2020-05-21 14:19:14.827288853 +0200 +@@ -443,6 +443,7 @@ + "The tar command is not found") + @unittest.skipIf(find_executable('gzip') is None, + "The gzip command is not found") ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_distribution_owner_group(self): + # now building a sdist + dist, cmd = self.get_cmd() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_asyncio/test_base_events.py pypy3.6-v7.3.1-src/lib-python/3/test/test_asyncio/test_base_events.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_asyncio/test_base_events.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_asyncio/test_base_events.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1296,6 +1296,8 @@ + self._test_create_connection_ip_addr(m_socket, False) + + @patch_socket ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_generators.py pypy3.6-v7.3.1-src/lib-python/3/test/test_generators.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_generators.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_generators.py 2020-05-21 14:19:14.827288853 +0200 +@@ -35,6 +35,7 @@ + else: + return "FAILED" + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment') + def test_raise_and_yield_from(self): + gen = self.generator1() + gen.send(None) +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/_test_multiprocessing.py pypy3.6-v7.3.1-src/lib-python/3/test/_test_multiprocessing.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/_test_multiprocessing.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/_test_multiprocessing.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1212,6 +1212,7 @@ + if pid is not None: + os.kill(pid, signal.SIGINT) + ++ @unittest.skipIf(True, "This fails for unknown reasons on Guix") + def test_wait_result(self): + if isinstance(self, ProcessesMixin) and sys.platform != 'win32': + pid = os.getpid() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_normalization.py pypy3.6-v7.3.1-src/lib-python/3/test/test_normalization.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_normalization.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_normalization.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2,6 +2,7 @@ + import unittest + + from http.client import HTTPException ++from urllib.error import URLError + import sys + from unicodedata import normalize, unidata_version + +@@ -43,6 +44,8 @@ + except PermissionError: + self.skipTest(f"Permission error when downloading {TESTDATAURL} " + f"into the test data directory") ++ except URLError: ++ self.skipTest("DNS lookups are not enabled.") + except (OSError, HTTPException): + self.fail(f"Could not retrieve {TESTDATAURL}") + +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pathlib.py pypy3.6-v7.3.1-src/lib-python/3/test/test_pathlib.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pathlib.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_pathlib.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2130,8 +2130,7 @@ + self.assertEqual(given, expect) + self.assertEqual(set(p.rglob("FILEd*")), set()) + +- @unittest.skipUnless(hasattr(pwd, 'getpwall'), +- 'pwd module does not expose getpwall()') ++ @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests") + def test_expanduser(self): + P = self.cls + support.import_module('pwd') +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pdb.py pypy3.6-v7.3.1-src/lib-python/3/test/test_pdb.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_pdb.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_pdb.py 2020-05-21 14:20:24.377203281 +0200 +@@ -1136,11 +1136,11 @@ + > (6)test_function() + -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + (Pdb) continue +- pdb 1: ++ pdb 1: Handlers.SIG_IGN + > (6)test_function() + -> print('pdb %d: %s' % (i, sess._previous_sigint_handler)) + (Pdb) continue +- pdb 2: ++ pdb 2: Handlers.SIG_IGN + """ + + class PdbTestCase(unittest.TestCase): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_regrtest.py pypy3.6-v7.3.1-src/lib-python/3/test/test_regrtest.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_regrtest.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_regrtest.py 2020-05-21 14:19:14.827288853 +0200 +@@ -766,6 +766,7 @@ + output = self.run_tests('--fromfile', filename) + self.check_executed_tests(output, tests) + ++ @unittest.skipIf(True, 'Keyboard interrupts do not work in the Guix build environment.') + def test_interrupted(self): + code = TEST_INTERRUPTED + test = self.create_test('sigint', code=code) +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_resource.py pypy3.6-v7.3.1-src/lib-python/3/test/test_resource.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_resource.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_resource.py 2020-05-21 14:19:14.827288853 +0200 +@@ -146,6 +146,7 @@ + + @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit') + @support.requires_linux_version(2, 6, 36) ++ @unittest.skipIf(True, "Bug: the PermissionError is not raised") + def test_prlimit(self): + self.assertRaises(TypeError, resource.prlimit) + self.assertRaises(ProcessLookupError, resource.prlimit, +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_shutil.py pypy3.6-v7.3.1-src/lib-python/3/test/test_shutil.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_shutil.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_shutil.py 2020-05-21 14:19:14.827288853 +0200 +@@ -1138,6 +1138,7 @@ + self.assertRaises(ValueError, make_archive, base_name, 'xxx') + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + def test_make_archive_owner_group(self): + # testing make_archive with owner and group, with various combinations + # this works even if there's not gid/uid support +@@ -1166,6 +1167,7 @@ + + + @support.requires_zlib ++ @unittest.skipIf(True, "getgrgid(0)[0] raises a KeyError on Guix") + @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support") + def test_tarfile_root_owner(self): + root_dir, base_dir = self._create_files() +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_socket.py pypy3.6-v7.3.1-src/lib-python/3/test/test_socket.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_socket.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_socket.py 2020-05-21 14:19:14.827288853 +0200 +@@ -815,6 +815,8 @@ + if not fqhn in all_host_names: + self.fail("Error testing host resolution mechanisms. (fqdn: %s, all: %s)" % (fqhn, repr(all_host_names))) + ++ @unittest.skipUnless(support.is_resource_enabled('network'), ++ 'network is not enabled') + def test_host_resolution(self): + for addr in [support.HOST, '10.0.0.1', '255.255.255.255']: + self.assertEqual(socket.gethostbyname(addr), addr) +@@ -934,6 +936,8 @@ + self.assertRaises(OverflowError, socket.htonl, k) + self.assertRaises(OverflowError, socket.htons, k) + ++ @unittest.skipUnless(os.path.exists("/etc/services"), ++ "getservbyname uses /etc/services, which is not in the chroot") + def testGetServBy(self): + eq = self.assertEqual + # Find one service that exists, then check all the related interfaces. +@@ -1278,6 +1282,8 @@ + raise + self.assertRaises(TypeError, s.ioctl, socket.SIO_LOOPBACK_FAST_PATH, None) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + def testGetaddrinfo(self): + try: + socket.getaddrinfo('localhost', 80) +@@ -1357,6 +1363,8 @@ + # only IP addresses are allowed + self.assertRaises(OSError, socket.getnameinfo, ('mail.python.org',0), 0) + ++ @unittest.skipUnless(os.path.exists("/etc/gai.conf"), ++ "getaddrinfo() will fail") + @unittest.skipUnless(support.is_resource_enabled('network'), + 'network is not enabled') + def test_idna(self): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_spwd.py pypy3.6-v7.3.1-src/lib-python/3/test/test_spwd.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_spwd.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_spwd.py 2020-05-21 14:19:14.827288853 +0200 +@@ -5,8 +5,7 @@ + spwd = support.import_module('spwd') + + +-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() == 0, +- 'root privileges required') ++@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') + class TestSpwdRoot(unittest.TestCase): + + def test_getspall(self): +@@ -56,8 +55,7 @@ + self.assertRaises(TypeError, spwd.getspnam, bytes_name) + + +-@unittest.skipUnless(hasattr(os, 'geteuid') and os.geteuid() != 0, +- 'non-root user required') ++@unittest.skipUnless(os.path.exists("/etc/shadow"), 'spwd tests require /etc/shadow') + class TestSpwdNonRoot(unittest.TestCase): + + def test_getspnam_exception(self): +diff -Naur pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_tarfile.py pypy3.6-v7.3.1-src/lib-python/3/test/test_tarfile.py +--- pypy3.6-v7.3.1-src.orig/lib-python/3/test/test_tarfile.py 1970-01-01 01:00:01.000000000 +0100 ++++ pypy3.6-v7.3.1-src/lib-python/3/test/test_tarfile.py 2020-05-21 14:19:14.827288853 +0200 +@@ -2491,9 +2491,12 @@ + import pwd, grp + except ImportError: + return False +- if pwd.getpwuid(0)[0] != 'root': +- return False +- if grp.getgrgid(0)[0] != 'root': ++ try: ++ if pwd.getpwuid(0)[0] != 'root': ++ return False ++ if grp.getgrgid(0)[0] != 'root': ++ return False ++ except KeyError: + return False + return True + diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1ec002df73..9469f89bcf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -80,12 +80,17 @@ (define-module (gnu packages python) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages certs) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages dbm) #:use-module (gnu packages hurd) #:use-module (gnu packages libffi) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages shells) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) @@ -631,3 +636,169 @@ (define-public micropython compatible with normal Python as possible to allow you to transfer code with ease from the desktop to a microcontroller or embedded system.") (license license:expat))) + +(define-public pypy3 + (package + (name "pypy3") + (version "7.3.1") + (source (origin + (method url-fetch) + (uri (string-append "https://bitbucket.org/pypy/pypy/downloads/" ; + "pypy3.6-v" version "-src.tar.bz2")) + (sha256 + (base32 + "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c")) + (patches (search-patches "pypy3-7.3.1-fix-tests.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("python-2" ,python-2) + ("pkg-config" ,pkg-config) + ("tar" ,tar) ; Required for package.py + ("python2-pycparser" ,python2-pycparser) + ("python2-hypothesis" ,python2-hypothesis) + ("nss-certs" ,nss-certs) ; For ssl tests + ("gzip" ,gzip))) + (inputs + `(("libffi" ,libffi) + ("zlib" ,zlib) + ("ncurses" ,ncurses) + ("openssl" ,openssl) + ("expat" ,expat) + ("bzip2" ,bzip2) + ("sqlite" ,sqlite) + ("gdbm" ,gdbm) + ("tcl" ,tcl) + ("tk" ,tk) + ("glibc" ,glibc) + ("bash-minimal" ,bash-minimal) ; Used as /bin/sh + ("xz" ,xz))) ; liblzma + (arguments + `(#:tests? #f ;FIXME: Disabled for now, there are many tests failing. + #:modules ((ice-9 ftw) (ice-9 match) + (guix build utils) (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-source + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("rpython/rlib/clibffi.py") + ;; find_library does not work for libc + (("ctypes\\.util\\.find_library\\('c'\\)") "'libc.so'")) + (substitute* '("lib_pypy/cffi/_pycparser/ply/cpp.py") + ;; Make reproducible (XXX: unused?) + (("time\\.localtime\\(\\)") "time.gmtime(0)")) + (substitute* '("pypy/module/sys/version.py") + ;; Make reproducible + (("t\\.gmtime\\(\\)") "t.gmtime(0)")) + (substitute* '("lib_pypy/_tkinter/tklib_build.py") + ;; Link to versioned libtcl and libtk + (("linklibs = \\['tcl', 'tk'\\]") + "linklibs = ['tcl8.6', 'tk8.6']") + (("incdirs = \\[\\]") + (string-append "incdirs = ['" + (assoc-ref inputs "tcl") + "/include', '" + (assoc-ref inputs "tk") + "/include']"))) + (substitute* '("lib_pypy/_curses_build.py") + ;; Find curses + (("/usr/local") (assoc-ref inputs "ncurses"))) + (substitute* '("lib_pypy/_sqlite3_build.py") + ;; Always use search paths + (("sys\\.platform\\.startswith\\('freebsd'\\)") "True") + ;; Find sqlite3 + (("/usr/local") (assoc-ref inputs "sqlite")) + (("libname = 'sqlite3'") + (string-append "libname = '" + (assoc-ref inputs "sqlite") + "/lib/libsqlite3.so.0'"))) + (substitute* '("lib-python/3/subprocess.py") + ;; Fix shell path + (("/bin/sh") + (string-append (assoc-ref inputs "bash-minimal") "/bin/sh"))) + (substitute* '("lib-python/3/distutils/unixccompiler.py") + ;; gcc-toolchain does not provide symlink cc -> gcc + (("\"cc\"") "\"gcc\"")) + #t)) + (add-after + 'unpack 'set-source-file-times-to-1980 + ;; copied from python package, required by zip testcase + (lambda _ + (let ((circa-1980 (* 10 366 24 60 60))) + (ftw "." (lambda (file stat flag) + (utime file circa-1980 circa-1980) + #t)) + #t))) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "pypy/goal" + ;; Build with jit optimization. + (invoke "python2" + "../../rpython/bin/rpython" + (string-append "--make-jobs=" + (number->string (parallel-job-count))) + "-Ojit" + "targetpypystandalone")) + ;; Build c modules and package everything, so tests work. + (with-directory-excursion "pypy/tool/release" + (unsetenv "PYTHONPATH") ; Do not use the system’s python libs: + ; AttributeError: module 'enum' has no + ; attribute 'IntFlag' + (invoke "python2" "package.py" + "--archive-name" "pypy-dist" + "--builddir" (getcwd))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "HOME" "/tmp") ; test_with_pip tries to + ; access ~/.cache/pip + ;; Run library tests only (no interpreter unit + ;; tests). This is what Gentoo does. + (invoke + "python2" + "pypy/test_all.py" + "--pypy=pypy/tool/release/pypy-dist/bin/pypy3" + "lib-python")) + (format #t "test suite not run~%")) + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (with-directory-excursion "pypy/tool/release" + ;; Delete test data. + (for-each + (lambda (x) + (delete-file-recursively (string-append + "pypy-dist/lib-python/3/" x))) + '("tkinter/test" + "test" + "sqlite3/test" + "lib2to3/tests" + "idlelib/idle_test" + "distutils/tests" + "ctypes/test" + "unittest/test")) + ;; Patch shebang referencing python2 + (substitute* '("pypy-dist/lib-python/3/cgi.py" + "pypy-dist/lib-python/3/encodings/rot_13.py") + (("#!.+/bin/python") + (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3"))) + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (substitute* '("pypy-dist/lib_pypy/_md5.py" + "pypy-dist/lib_pypy/_sha1.py") + (("#!.+/bin/python") + (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3")))) + (copy-recursively "pypy-dist" (assoc-ref outputs "out"))) + #t))))) + (home-page "https://www.pypy.org/") + (synopsis "Python implementation with just-in-time compilation") + (description "PyPy is a faster, alternative implementation of the Python +programming language employing a just-in-time compiler. It supports most +Python code natively, including C extensions.") + (license (list license:expat ; pypy itself; _pytest/ + license:psfl ; python standard library in lib-python/ + license:asl2.0 ; dotviewer/font/ and some of lib-python/ + license:gpl3+ ; ./rpython/rlib/rvmprof/src/shared/libbacktrace/dwarf2.* + license:bsd-3 ; lib_pypy/cffi/_pycparser/ply/ + (license:non-copyleft + "http://www.unicode.org/copyright.html"))))) + -- cgit v1.2.3 From 53c41e958ffe2d7f8f58d70ab8f5ef6518484b3e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 21:56:33 -0500 Subject: gnu: libsoup: Add the missing PHP dependency. * gnu/packages/gnome.scm (libsoup)[native-inputs]: Add php. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe71e316f3..fa9a8fc168 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -145,6 +145,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) + #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages popt) @@ -3718,8 +3719,7 @@ (define-public libsoup ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("vala" ,vala) - ;; These are needed for the tests. - ;; FIXME: Add PHP once available. + ("php" ,php) ("curl" ,curl) ("gnutls" ,gnutls) ;for 'certtool' ("httpd" ,httpd))) -- cgit v1.2.3 From 43b6b45e7be8cc25eba9f606015bee9653730b43 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 21:57:33 -0500 Subject: gnu: Add libsoup-minimal. * gnu/packages/gnome.scm (libsoup-minimal): New variable. --- gnu/packages/gnome.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fa9a8fc168..6d0f7fe2a4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -183,6 +183,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu artwork) + #:use-module ((guix build utils) #:select (modify-phases)) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -3741,6 +3742,22 @@ (define-public libsoup and the GLib main loop, to integrate well with GNOME applications.") (license license:lgpl2.0+))) + +;;; A minimal version of libsoup used to prevent a cycle with Inkscape. +(define-public libsoup-minimal + (package + (inherit libsoup) + (name "libsoup-minimal") + (outputs (delete "doc" (package-outputs libsoup))) + (arguments + (substitute-keyword-arguments (package-arguments libsoup) + ((#:configure-flags configure-flags) + `(delete "-Dgtk_doc=true" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'move-doc))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs libsoup))))) + (define-public libsecret (package (name "libsecret") -- cgit v1.2.3 From 0e3897187c6e3fc821b59153b6b632896a1a380e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 8 Jan 2020 23:18:17 -0500 Subject: gnu: Add at-spi2-atk-minimal. * gnu/packages/gtk.scm (at-spi2-atk-minimal): New variable. --- gnu/packages/gtk.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 385e4e97e4..f6a50f0058 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2020 Guillaume Le Vaillant +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -649,6 +650,24 @@ (define-public at-spi2-core (license license:lgpl2.0+) (home-page "https://projects.gnome.org/accessibility/"))) +;;; A minimal variant used to prevent a cycle with Inkscape. +(define at-spi2-core-minimal + (package + (inherit at-spi2-core) + (name "at-spi2-core-minimal") + (outputs (delete "doc" (package-outputs at-spi2-core))) + (arguments + (substitute-keyword-arguments (package-arguments at-spi2-core) + ((#:configure-flags configure-flags) + `(delete "-Ddocs=true" ,configure-flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'set-documentation-path) + (delete 'prepare-doc-directory) + (delete 'move-documentation))))) + (native-inputs + (alist-delete "gtk-doc" (package-native-inputs at-spi2-core))))) + (define-public at-spi2-atk (package (name "at-spi2-atk") -- cgit v1.2.3 From 88e61bd4a4e14061f194b4e883ee6af8850ecb1f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jan 2020 23:01:24 -0500 Subject: gnu: Add gdl. * gnu/packages/gnome.scm (gdl): New variable. --- gnu/packages/gnome.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6d0f7fe2a4..c5e0959b23 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1501,6 +1501,53 @@ (define-public gcr GNOME Desktop.") (license license:lgpl2.1+))) +(define-public gdl + (package + (name "gdl") + (version "3.34.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/gdl.git") + (commit (string-append "GDL_" (string-map (match-lambda + (#\. #\_) + (c c)) + version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + ;; The autogen.sh script in gnome-common will run ./configure + ;; by default, which is problematic because source shebangs + ;; have not yet been patched. + (setenv "NOCONFIGURE" "t") + (invoke "sh" "autogen.sh")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("gnome-common" ,gnome-common) + ("gtk-doc" ,gtk-doc) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool) + ("which" ,which))) + (inputs + `(("libxml2" ,libxml2))) + (propagated-inputs + ;; The gdl-3.0.pc file 'Requires' GTK+. + `(("gtk+" ,gtk+))) + (home-page "https://gitlab.gnome.org/GNOME/gdl/") + (synopsis "GNOME docking library") + (description "This library provides docking features for gtk+.") + (license license:lgpl2.1+))) + (define-public libgnome-keyring (package (name "libgnome-keyring") -- cgit v1.2.3 From ca3adf26072c759b198042ced866efc423dd4b97 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 9 Jan 2020 23:01:59 -0500 Subject: gnu: Add gdl-minimal. * gnu/packages/gnome.scm (gdl-minimal): New variable. --- gnu/packages/gnome.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c5e0959b23..da69f1bdeb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1548,6 +1548,27 @@ (define-public gdl (description "This library provides docking features for gtk+.") (license license:lgpl2.1+))) +;;; A minimal variant used to break a cycle with Inkscape. +(define-public gdl-minimal + (package + (inherit gdl) + (name "gdl-minimal") + (arguments + (substitute-keyword-arguments (package-arguments gdl) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'disable-doc-generation + ;; XXX: There is no easy way to disable generating the + ;; documentation. + (lambda _ + (substitute* "configure.in" + (("GTK_DOC_CHECK.*") "") + (("docs/.*") "")) + (substitute* "Makefile.am" + (("gdl docs po") "gdl po")) + #t)))))) + (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) + (define-public libgnome-keyring (package (name "libgnome-keyring") -- cgit v1.2.3 From 89c34f5e48431de070c057cf4162a4519afbb0ba Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Jan 2020 23:20:31 -0500 Subject: gnu: Add lib2geom. * gnu/packages/graphics.scm (lib2geom): New variable. * gnu/packages/patches/lib2geom-enable-assertions.patch, lib2geom-link-tests-against-glib.patch, lib2geom-use-system-googletest.patch: New files. * gnu/local.mk (dist_patch_DATA): Register new patches. --- gnu/local.mk | 3 + gnu/packages/graphics.scm | 77 ++++++++++++++++++ .../patches/lib2geom-enable-assertions.patch | 36 +++++++++ .../patches/lib2geom-link-tests-against-glib.patch | 34 ++++++++ .../patches/lib2geom-use-system-googletest.patch | 94 ++++++++++++++++++++++ 5 files changed, 244 insertions(+) create mode 100644 gnu/packages/patches/lib2geom-enable-assertions.patch create mode 100644 gnu/packages/patches/lib2geom-link-tests-against-glib.patch create mode 100644 gnu/packages/patches/lib2geom-use-system-googletest.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd787299d2..befe89ff3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1159,6 +1159,9 @@ dist_patch_DATA = \ %D%/packages/patches/ldc-disable-phobos-tests.patch \ %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/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 664e3fab45..75e6d48196 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -328,6 +330,81 @@ (define-public ilmbase exception-handling library.") (license license:bsd-3))) +(define-public lib2geom + ;; Use the latest master commit, as the 1.0 release suffer build problems. + (let ((revision "1") + (commit "42e119d94934a9514c61571cfb6b4af503ece082")) + (package + (name "lib2geom") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/inkscape/lib2geom.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "195rs0kdbs8w62irha1nwy83bccz04wglmk578qrj1mky7fc4rjv")) + (patches + ;; Patch submitted to upstream (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/17). + (search-patches "lib2geom-enable-assertions.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix py2geom module initialization (see: + ;; https://gitlab.com/inkscape/lib2geom/merge_requests/18). + (substitute* "src/py2geom/__init__.py" + (("_py2geom") "py2geom._py2geom")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:imported-modules ((guix build python-build-system) + ,@%cmake-build-system-modules) + #:configure-flags '("-D2GEOM_BUILD_SHARED=ON" + "-D2GEOM_BOOST_PYTHON=ON" + ;; Compiling the Cython bindings fail (see: + ;; https://gitlab.com/inkscape/lib2geom/issues/21). + "-D2GEOM_CYTHON_BINDINGS=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-python-lib-install-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((python-version (@ (guix build python-build-system) + python-version)) + (python-maj-min-version (python-version + (assoc-ref inputs "python"))) + (site-package (string-append + (assoc-ref outputs "out") + "/lib/python" python-maj-min-version + "/site-packages"))) + (substitute* '("src/cython/CMakeLists.txt" + "src/py2geom/CMakeLists.txt") + (("PYTHON_LIB_INSTALL \"[^\"]*\"") + (format #f "PYTHON_LIB_INSTALL ~s" site-package)))) + #t))))) + (native-inputs `(("python" ,python-wrapper) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config))) + (inputs `(("cairo" ,cairo) + ("pycairo" ,python-pycairo) + ("double-conversion" ,double-conversion) + ("glib" ,glib) + ("gsl" ,gsl))) + (propagated-inputs + `(("boost" ,boost))) ;referred to in 2geom/pathvector.h. + (home-page "https://gitlab.com/inkscape/lib2geom/") + (synopsis "C++ 2D graphics library") + (description "2geom is a C++ library of mathematics for paths, curves, +and other geometric calculations. Designed for vector graphics, it tackles +Bézier curves, conic sections, paths, intersections, transformations, and +basic geometries.") + ;; Because the library is linked with the GNU Scientific Library + ;; (GPLv3+), the combined work must be licensed as GPLv3+ (see: + ;; https://gitlab.com/inkscape/inkscape/issues/784). + (license license:gpl3+)))) + (define-public ogre (package (name "ogre") diff --git a/gnu/packages/patches/lib2geom-enable-assertions.patch b/gnu/packages/patches/lib2geom-enable-assertions.patch new file mode 100644 index 0000000000..8feb44acbf --- /dev/null +++ b/gnu/packages/patches/lib2geom-enable-assertions.patch @@ -0,0 +1,36 @@ +From 4aa78f52232682b353eb15c219171e466987bac7 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Thu, 16 Jan 2020 00:19:29 -0500 +Subject: [PATCH] build: Enable assertions for the RelWithDebugInfo build type. + +This fixes issue #5 (see: +https://gitlab.com/inkscape/lib2geom/issues/5). + +* CMakeLists.txt: Remove the "-DNDEBUG" CXX flag from the default +configuration for the RelWithDebugInfo build type. +--- + CMakeLists.txt | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bfeb8f03..a663a1b0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,14 @@ enable_testing() + + include(CheckCXXSourceCompiles) + ++# Enable assertions for the RelWithDebugInfo build type. This is ++# useful as some tests make use of it (see: ++# https://gitlab.com/inkscape/lib2geom/issues/5). ++if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") ++ string(REPLACE "-DNDEBUG" "" ++ CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") ++endif() ++ + # Find dependencies + find_package(Boost 1.40 REQUIRED) + find_package(DoubleConversion REQUIRED) +-- +2.24.1 + diff --git a/gnu/packages/patches/lib2geom-link-tests-against-glib.patch b/gnu/packages/patches/lib2geom-link-tests-against-glib.patch new file mode 100644 index 0000000000..2b4f7ca6bf --- /dev/null +++ b/gnu/packages/patches/lib2geom-link-tests-against-glib.patch @@ -0,0 +1,34 @@ +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 new file mode 100644 index 0000000000..16cce1799f --- /dev/null +++ b/gnu/packages/patches/lib2geom-use-system-googletest.patch @@ -0,0 +1,94 @@ +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 + -- cgit v1.2.3 From f977fe92c4456c3a051832a96c5338e646771c05 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Jan 2020 23:13:46 -0500 Subject: gnu: plotutils: Build libplotter. * gnu/packages/plotutils.scm (plotutils)[origin]: Port the patch to a snippet, which catches all the problematic occurrences. [configure-flags]: Pass "--enable-libplotter". [description]: Mention the newly added C++ libplotter library. --- gnu/local.mk | 1 - gnu/packages/patches/plotutils-libpng-jmpbuf.patch | 23 --------------------- gnu/packages/plotutils.scm | 24 ++++++++++++++-------- 3 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/plotutils-libpng-jmpbuf.patch diff --git a/gnu/local.mk b/gnu/local.mk index befe89ff3e..6d775828e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1377,7 +1377,6 @@ dist_patch_DATA = \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \ - %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ %D%/packages/patches/podofo-cmake-3.12.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ diff --git a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch b/gnu/packages/patches/plotutils-libpng-jmpbuf.patch deleted file mode 100644 index 07ef60996c..0000000000 --- a/gnu/packages/patches/plotutils-libpng-jmpbuf.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use the `png_jmpbuf' accessor, as recommended since libpng 1.4.0: -http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt . - ---- plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:12.000000000 +0200 -+++ plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:07.000000000 +0200 -@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter * - } - - /* cleanup after libpng errors (error handler does a longjmp) */ -- if (setjmp (png_ptr->jmpbuf)) -+ if (setjmp (png_jmpbuf (png_ptr))) - { - png_destroy_write_struct (&png_ptr, (png_info **)NULL); - return -1; -@@ -444,7 +444,7 @@ _our_error_fn_stdio (png_struct *png_ptr - #endif - } - -- longjmp (png_ptr->jmpbuf, 1); -+ longjmp (png_jmpbuf (png_ptr), 1); - } - - static void diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index edd492c711..f6881f6776 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016, 2017, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,6 @@ (define-public plotutils (sha256 (base32 "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg")) - (patches (search-patches "plotutils-libpng-jmpbuf.patch")) (modules '((guix build utils))) (snippet ;; Force the use of libXaw7 instead of libXaw. When not doing @@ -67,22 +67,28 @@ (define-public plotutils (substitute* "configure" (("-lXaw") "-lXaw7")) + ;; Use the `png_jmpbuf' accessor, as recommended since libpng + ;; 1.4.0 (see: + ;; http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt). + (substitute* "libplot/z_write.c" + (("png_ptr->jmpbuf") + "png_jmpbuf (png_ptr)")) #t)))) (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--enable-libplotter"))) (inputs `(("libpng" ,libpng) ("libx11" ,libx11) ("libxt" ,libxt) ("libxaw" ,libxaw))) - - (home-page - "https://www.gnu.org/software/plotutils/") + (home-page "https://www.gnu.org/software/plotutils/") (synopsis "Plotting utilities and library") (description - "GNU Plotutils is a package for plotting and working with 2D graphics. -It includes a library, \"libplot\", for C and C++ for exporting 2D vector -graphics in many file formats. It also has support for 2D vector graphics -animations. The package also contains command-line programs for plotting -scientific data.") + "GNU Plotutils is a package for plotting and working with 2D graphics. +It includes the C library @code{libplot} and the C++ @code{libplotter} library +for exporting 2D vector graphics in many file formats. It also has support +for 2D vector graphics animations. The package also contains command-line +programs for plotting scientific data.") (license license:gpl2+))) (define-public guile-charting -- cgit v1.2.3 From 2f6d51ef9ae904aa857bed635750b857873408d1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 24 Jan 2020 23:40:38 -0500 Subject: gnu: Add pstoedit. * gnu/packages/graphics.scm (pstoedit): New variable. --- gnu/packages/graphics.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 75e6d48196..16ffda835e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -68,6 +68,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages plotutils) #:use-module (gnu packages pth) #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) @@ -405,6 +406,45 @@ (define-public lib2geom ;; https://gitlab.com/inkscape/inkscape/issues/784). (license license:gpl3+)))) +(define-public pstoedit + (package + (name "pstoedit") + (version "3.75") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/" + version "/pstoedit-" version ".tar.gz")) + (sha256 + (base32 + "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("ghostscript" ,ghostscript) + ("imagemagick" ,imagemagick) + ("libplot" ,plotutils) + ("libjpeg" ,libjpeg-turbo) + ("zlib" ,zlib))) ;else libp2edrvmagick++.so fails to link + (home-page "http://www.pstoedit.net/") + (synopsis "Converter for PostScript and PDF graphics") + (description "The @code{pstoedit} utility allows translating graphics +in the PostScript or PDF (Portable Document Format) formats to various +other vector formats such as: +@itemize +@item Tgif (.obj) +@item gnuplot +@item xfig (.fig) +@item Flattened PostScript +@item DXF, a CAD (Computed-Aided Design) exchange format +@item PIC (for troff/groff) +@item MetaPost (for usage with TeX/LaTeX) +@item LaTeX2e picture +@item GNU Metafile (for use with plotutils/libplot) +@item Any format supported by ImageMagick +@end itemize") + (license license:gpl2+))) + (define-public ogre (package (name "ogre") -- cgit v1.2.3 From 5ee8c1411dbbb752c1da1fcb4be4bf14dc87c72e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 25 Jan 2020 00:33:14 -0500 Subject: gnu: Add autotrace. * gnu/packages/graphics.scm (autotrace): New variable. --- gnu/packages/graphics.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 16ffda835e..b2bc63b9d0 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -43,6 +43,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -52,6 +53,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -146,6 +148,61 @@ (define-public fox (home-page "http://www.fox-toolkit.org") (license license:lgpl2.1+))) +(define-public autotrace + (let ((commit "travis-20190624.59") + (version-base "0.40.0")) + (package + (name "autotrace") + (version (string-append version-base "-" + (if (string-prefix? "travis-" commit) + (string-drop commit 7) + commit))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/autotrace/autotrace.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mk4yavy42dj0pszr1ggnggpvmzs4ds46caa9wr55cqsypn7bq6s")))) + (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; See: https://github.com/autotrace/autotrace/issues/27. + (add-after 'unpack 'include-spline.h-header + (lambda _ + (substitute* "Makefile.am" + ((".*src/types.h.*" all) + (string-append all "\t\tsrc/spline.h \\\n"))) + #t)) + ;; See: https://github.com/autotrace/autotrace/issues/26. + (replace 'check + (lambda _ + (invoke "sh" "tests/runtests.sh")))))) + (native-inputs + `(("which" ,which) + ("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) + ("libtool" ,libtool) + ("gettext" ,gettext-minimal))) + (inputs + `(("glib" ,glib) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("imagemagick" ,imagemagick) + ("pstoedit" ,pstoedit))) + (home-page "https://github.com/autotrace/autotrace") + (synopsis "Bitmap to vector graphics converter") + (description "AutoTrace is a utility for converting bitmap into vector +graphics. It can trace outlines and midlines, effect color reduction or +despeckling and has support for many input and output formats. It can be used +with the @command{autotrace} utility or as a C library, @code{libautotrace}.") + (license (list license:gpl2+ ;for the utility itself + license:lgpl2.1+))))) ;for use as a library + (define-public blender (package (name "blender") -- cgit v1.2.3 From 7f05493da3521ce4c470935d9b82fbde8e0836c6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 28 Jan 2020 00:15:29 -0500 Subject: gnu: Add drm-tools. * gnu/packages/textutils.scm (drm-tools): New variable. --- gnu/packages/textutils.scm | 106 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 6fdcfd227e..b6732dbae1 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019 Yoshinori Arai ;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; Copyright © 2019 Wiktor Żelazny +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ (define-module (gnu packages textutils) #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -725,6 +727,110 @@ (define-public dotconf (license (list license:lgpl2.1 ; Main distribution. license:asl1.1)))) ; src/readdir.{c,h} +(define-public drm-tools + (package + (name "drm-tools") + (version "1.1.33") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/drmtools/drm_tools-" + version ".tar.gz")) + (sha256 + (base32 + "187zbxw21zcg8gpyc13gxlycfw0n05a6rmqq6im5wr9zk1v1wj80")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;the test suite fails + #:phases (modify-phases %standard-phases + (add-after 'unpack 'set-install-prefixes + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* "CMakeLists.txt" + (("tmp/testinstall") + (string-drop out 1)) + (("/man/man1") + "/share/man/man1")) + #t))) + (add-after 'unpack 'adjust-test-paths + (lambda _ + (substitute* '("test_extract_increment.sh" + "test_extract_features.sh" + "test_extract_features2.sh" + "test_dmath.sh") + (("\\./extract") "extract") + (("\\./dmath") "dmath") + (("/usr/local/bin/") "") + (("/bin/rm") "rm") + (("/bin/cp") "cp")) + #t)) + (delete 'check) + ;; The produced binaries are written directly to %output/bin. + (delete 'install) + (add-after 'build 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (when tests? + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (setenv "PATH" (string-append bin ":" + (getenv "PATH"))) + (with-directory-excursion + (format #f "../drm_tools-~a" ,version) + (invoke "sh" "test_all.sh"))))))))) + (native-inputs `(("which" ,which))) ;for tests + (inputs `(("pcre" ,pcre))) + (home-page "http://drmtools.sourceforge.net/") + (synopsis "Utilities to manipulate text and binary files") + (description "The drm_tools package contains the following commands: +@table @command +@item accudate +An extended version of the \"date\" program that has sub-second accuracy. +@item binformat +Format complex binary data into text. +@item binload +Load data into a binary file using simple commands from the input. +@item binorder +Sort, merge, search, retrieve or generate test data consisting of fixed size +binary records. +@item binreplace +Find or find/replace in binary files. +@item binsplit +Split test data consisting of fixed size binary records into one or more +output streams. +@item chardiff +Find changes between two files at the character level. Unlike \"diff\", it +lists just the characters that differ, so if the 40,000th character is +different only that one character will be shown, not the entire line. +@item columnadd +Add columns of integers, decimals, and/or times. +@item datasniffer +A utility for formatting binary data dumps. +@item dmath +Double precision interactive command line math calculator. +@item extract +Extract and emit data from text files based on character or token position. +@item execinput +A utility that reads from STDIN and executes each line as a command in a +sub-process. +@item indexed_text +A utility for rapid retrieval of text by line numbers, in any order, from a +text file. +@item mdump +Format binary data. +@item msgqueue +Create message queues and send/receive messages. +@item mbin +@itemx mbout +Multiple buffer in and out. Used for buffering a lot of data between a slow +device and a fast device. Mostly for buffering streaming tape drives for use +with slower network connections, so that streaming is maintained as much as +possible to minimize wear on the tape device. +@item pockmark +Corrupt data streams - useful for testing error correction and data recovery. +@item tarsieve +Filter, list, or split a tar file. +@end table") + (license license:gpl2+))) + (define-public java-rsyntaxtextarea (package (name "java-rsyntaxtextarea") -- cgit v1.2.3 From 3f1f98d9d8c4e7f5dfca921fe1957e4d53783e35 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 28 Jan 2020 01:21:24 -0500 Subject: gnu: Add libuemf. * gnu/packages/image.scm (libuemf): New variable. --- gnu/packages/image.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 24f1b1570c..05b64dd716 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 R Veera Kumar +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ (define-module (gnu packages image) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) + #:use-module (gnu packages textutils) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -856,6 +858,55 @@ (define-public giflib (home-page "http://giflib.sourceforge.net/") (license license:x11))) +(define-public libuemf + (package + (name "libuemf") + (version "0.2.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libuemf/libUEMF-" + version ".tar.gz")) + (sha256 + (base32 + "05djs99vqf067x81xfpskh7a66y5x7b4mmjavybcy7swnm0swg7v")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Overriding CMAKE_INSTALL_PREFIX is not a good idea. + (add-after 'unpack 'fix-CMakeLists.txt + (lambda _ + (substitute* "CMakeLists.txt" + ((".*SET\\(CMAKE_INSTALL_PREFIX.*") "")) + #t)) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (sources (string-append "../libUEMF-" ,version)) + (drm-tools (assoc-ref inputs "drm-tools")) + (extract (string-append drm-tools "/bin/extract")) + (execinput (string-append drm-tools "/bin/execinput"))) + (with-directory-excursion sources + (substitute* "testit.sh" + (("^EPATH=.*") + (format #f "EPATH=~a~%" bin)) + (("`which diff`") + "diff") + (("^EXTRACT=.*") + (format #f "EXTRACT=~a~%" extract)) + (("^EXECINPUT=.*") + (format #f "EXECINPUT=~a~%" execinput))) + (invoke "sh" "testit.sh")))))))) + (native-inputs `(("drm-tools" ,drm-tools))) ;for tests + (home-page "http://libuemf.sourceforge.net/") + (synopsis "Library for working with WFM, EMF and EMF+ images") + (description "The libUEMF library is a portable C99 implementation for +reading and writing @abbr{WFM, Windows Metafile}, @abbr{EMF, Enhanced +Metafile}, and @abbr{EMF+, Enhanced Metafile Plus} files.") + (license license:gpl2+))) + (define-public libungif (package (name "libungif") -- cgit v1.2.3 From ff8a1a88d934bb31339ad1c9aaa201ec837cb743 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jan 2020 16:37:44 -0500 Subject: gnu: inkscape: Add inkscape-1.0. * gnu/packages/inkscape.scm (inkscape-1.0): New variable. * gnu/packages/gtk.scm (at-spi2-atk): Add a TODO comment. --- gnu/packages/gtk.scm | 2 + gnu/packages/inkscape.scm | 173 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f6a50f0058..24089668d2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -690,6 +690,8 @@ (define-public at-spi2-atk (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "meson" "test")))))) (propagated-inputs + ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or + ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc (inputs `(("atk" ,atk))) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 26d4642547..b0707d6eff 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,8 +31,13 @@ (define-module (gnu packages inkscape) #:use-module (gnu packages aspell) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages pdf) @@ -107,3 +113,170 @@ (define-public inkscape apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, as the native format.") (license license:gpl2+))) + +(define-public inkscape-1.0 + (package + (name "inkscape") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://media.inkscape.org/dl/" + "resources/file/" + "inkscape-" version ".tar.xz")) + (sha256 + (base32 + "1fwl7yjkykqb86555k4fm24inhc40mrvxqwgl2v2vi9alv8j7hc9")) + (modules '((guix build utils) + (ice-9 format))) + (snippet + '(begin + (let-syntax + ;; XXX: The build system doesn't currently support using + ;; system libraries over bundled ones (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876). + ((unbundle + (syntax-rules () + ((_ (name source-dir use-pkg-config?) ...) + (begin + ;; Delete bundled source directories. + (delete-file-recursively source-dir) ... + (substitute* '("src/CMakeLists.txt" + "src/3rdparty/CMakeLists.txt") + (((string-append ".*add_subdirectory\\(" + (basename source-dir) "\\).*")) + "") ...) + ;; Remove bundled entries from INKSCAPE_TARGET_LIBS. + (substitute* "src/CMakeLists.txt" + (((string-append name "_LIB.*")) "") ...) + ;; Register the external libraries, so that their + ;; headers are added to INKSCAPE_INCS_SYS and their + ;; shared libraries added to INKSCAPE_LIBS. + (if use-pkg-config? + (let* ((width (string-length "pkg_check_modules(")) + (indent (string-join (make-list width " ") ""))) + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + (("^pkg_check_modules\\(INKSCAPE_DEP REQUIRED.*" start) + (string-append start + (format #f "~a~a~%" indent name))))) + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + (("^find_package\\(Iconv REQUIRED\\).*" start) + (string-append (format #f " +find_path(~a_INCLUDE_DIR NAMES ~:*~a/~:*~a.h ~:*~a.h) +if(NOT ~:*~a_INCLUDE_DIR) + message(FATAL_ERROR \"~:*~a headers not found\") +else() + list(APPEND INKSCAPE_INCS_SYS ${~:*~a_INCLUDE_DIR}) +endif() + +find_library(~:*~a_LIB NAMES ~:*~a) +if(NOT ~:*~a_LIB) + message(FATAL_ERROR \"~:*~a library not found\") +else() + list(APPEND INKSCAPE_LIBS ~:*~a_LIB) +endif()~%~%" + name) + start)))) ... + ;; Fix the references to the headers of the + ;; unbundled libraries. + (substitute* (find-files "." "\\.h$|\\.cpp$") + (((string-append "#include (\"|<)3rdparty/" + (basename source-dir)) _ quote) + (string-append "#include " quote + (basename source-dir))) + ...)))))) + (unbundle ("2geom" "src/2geom" #t) + ;; libcroco cannot be unbundled as it is heavily + ;; modified (see: + ;; https://gitlab.com/inkscape/inkscape/issues/876#note_276114904). + ;; ("croco" "src/3rdparty/libcroco" #t) + ;; FIXME: Unbundle the following libraries once they + ;; have been packaged. + ;; ("cola" "src/3rdparty/adaptagrams/libcola") + ;; ("avoid" "src/3rdparty/adaptagrams/libavoid") + ;; ("vpsc" "src/3rdparty/adaptagrams/libvpsc") + ;; libuemf cannot be unbundled as it slightly modified + ;; from upstream (see: + ;; https://gitlab.com/inkscape/inkscape/issues/973). + ;; ("uemf" "src/3rdparty/libuemf" #f) + ;; FIXME: libdepixelize upstream is ancient and doesn't + ;; build with a recent lib2geom + ;; (see: https://bugs.launchpad.net/libdepixelize/+bug/1862458). + ;;("depixelize" "src/3rdparty/libdepixelize") + ("autotrace" "src/3rdparty/autotrace" #t))) + ;; Lift the requirement on the double-conversion library, as + ;; it is only needed by lib2geom, which is now unbundled. + (substitute* "CMakeScripts/DefineDependsandFlags.cmake" + ((".*find_package\\(DoubleConversion.*") "")) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #t + #:test-target "check" ;otherwise some test binaries are missing + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-icon-cache-generator + (lambda _ + (substitute* "share/icons/application/CMakeLists.txt" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'unpack 'disable-latex-export-tests + ;; FIXME: For some reason the test.pdf_tex file generated by the + ;; "--export-latex" lacks "some text" in its content when run in + ;; the build environment. Skip the related tests. + (lambda _ + (substitute* "testfiles/cli_tests/CMakeLists.txt" + (("add_cli_test\\(export-latex") + "message(TEST_DISABLED: export-latex")) + #t)) + (add-after 'unpack 'set-home + ;; Mute Inkscape warnings during tests. + (lambda _ + (setenv "HOME" (getcwd)) + (format #t "ARGS is set to: ~a" (getenv "ARGS")) + #t)) + ;; Move the check phase after the install phase, as when run in the + ;; tests, Inkscape relies on files that are not yet installed, such + ;; as the "share/inkscape/ui/units.xml" file. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))))) + (inputs + `(("aspell" ,aspell) + ("autotrace" ,autotrace) + ("gdl" ,gdl-minimal) + ("gtkmm" ,gtkmm) + ("gtk" ,gtk+) + ("gtkspell3" ,gtkspell3) + ("gsl" ,gsl) + ("poppler" ,poppler) + ("lib2geom" ,lib2geom) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) + ("libgc" ,libgc) + ("libsoup" ,libsoup-minimal) + ("libcdr" ,libcdr) + ("libvisio" ,libvisio) + ("libwpd" ,libwpd) + ("libwpg" ,libwpg) + ("freetype" ,freetype) + ("popt" ,popt) + ("potrace" ,potrace) + ("lcms" ,lcms) + ("boost" ,boost))) + (native-inputs + `(("imagemagick" ,imagemagick) ;for tests + ("intltool" ,intltool) + ("glib" ,glib "bin") + ("googletest" ,googletest) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (home-page "https://inkscape.org/") + (synopsis "Vector graphics editor") + (description "Inkscape is a vector graphics editor. What sets Inkscape +apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, +as the native format.") + (license license:gpl3+))) ;see the file COPYING -- cgit v1.2.3 From 70cf011390d92e44877502bc5765a3c87834dac2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Jun 2020 08:44:21 +0300 Subject: gnu: gdl: Don't use custom bootstrap phase. * gnu/packages/gnome.scm (gdl)[arguments]: Remove custom boostrap phase. (gdl-minimal)[arguments]: Don't inherit arguments from gdl. --- gnu/packages/gnome.scm | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da69f1bdeb..2be117d21b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1518,16 +1518,6 @@ (define-public gdl (base32 "154qcr0x6f68f4q526y87imv0rscmp34n47nk1pp82rsq52h2zna")))) (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - ;; The autogen.sh script in gnome-common will run ./configure - ;; by default, which is problematic because source shebangs - ;; have not yet been patched. - (setenv "NOCONFIGURE" "t") - (invoke "sh" "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -1554,19 +1544,18 @@ (define-public gdl-minimal (inherit gdl) (name "gdl-minimal") (arguments - (substitute-keyword-arguments (package-arguments gdl) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'disable-doc-generation - ;; XXX: There is no easy way to disable generating the - ;; documentation. - (lambda _ - (substitute* "configure.in" - (("GTK_DOC_CHECK.*") "") - (("docs/.*") "")) - (substitute* "Makefile.am" - (("gdl docs po") "gdl po")) - #t)))))) + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-doc-generation + ;; XXX: There is no easy way to disable generating the + ;; documentation. + (lambda _ + (substitute* "configure.in" + (("GTK_DOC_CHECK.*") "") + (("docs/.*") "")) + (substitute* "Makefile.am" + (("gdl docs po") "gdl po")) + #t))))) (native-inputs (alist-delete "gtk-doc" (package-native-inputs gdl))))) (define-public libgnome-keyring -- cgit v1.2.3 From 48fd0de9629b707815fd490aa5a0c3410721ae3a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Jun 2020 09:16:54 +0300 Subject: gnu: enlightenment: Update to 0.24.1. * gnu/packages/enlightenment.scm (enlightenment): Update to 0.24.1. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 4d8c12ed3b..d852cbb275 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -292,7 +292,7 @@ (define-public rage (define-public enlightenment (package (name "enlightenment") - (version "0.24.0") + (version "0.24.1") (source (origin (method url-fetch) (uri @@ -300,7 +300,7 @@ (define-public enlightenment "enlightenment/enlightenment-" version ".tar.xz")) (sha256 (base32 - "01053hxdmyjfb6gmz1pqmw0llrgc4356np515h5vsqcn59mhvfz7")) + "02aadl5fqvpmpjnisrc4aw7ffwyp1109y4k1wvmp33ciihbvdqmf")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From fabfe0b99c4500e3e381933ab769e462c95555e1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 10:54:22 +0200 Subject: gnu: emacspeak: Update to 52.0. * gnu/packages/emacs-xyz.scm (emacspeak): Update to 52.0. [arguments]: Add phase to remove a non-existing file. Change executable. [inputs]: Use espeak-ng instead of espeak. [description]: Typographic fix. --- gnu/packages/emacs-xyz.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7c014cfd4c..c1f7f1fe06 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9853,7 +9853,7 @@ (define-public emacs-highlight-stages (define-public emacspeak (package (name "emacspeak") - (version "50.0") + (version "52.0") (source (origin (method url-fetch) @@ -9861,14 +9861,17 @@ (define-public emacspeak "https://github.com/tvraman/emacspeak/releases/download/" version "/emacspeak-" version ".tar.bz2")) (sha256 - (base32 - "0rsj7rzfyqmyidfsjrhjnxi2d43axx6r3gac1fhv5xkkbiiqzqkb")))) + (base32 "0x5b0s38r5ih2lk7f5hasi9arrgxlmmq5jaddadbxi8in2gw2jzl")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-broken-symlink + (lambda _ + (delete-file "lisp/sudoku.el") + #t)) (replace 'configure (lambda _ (setenv "SHELL" (which "sh")) @@ -9893,12 +9896,12 @@ (define-public emacspeak '("etc" "info" "js" "lisp" "media" "servers" "sounds" "stumpwm" "xsl")) ;; Make sure emacspeak is loaded from the correct directory. - (substitute* "etc/emacspeak.sh" - (("/lisp/emacspeak-setup.el") + (substitute* "run" + (("\\./lisp/emacspeak-setup.el") (string-append lisp "/lisp/emacspeak-setup.el"))) ;; Install the convenient startup script. (mkdir-p bin) - (copy-file "etc/emacspeak.sh" (string-append bin "/emacspeak"))) + (copy-file "run" (string-append bin "/emacspeak"))) #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) @@ -9911,10 +9914,10 @@ (define-public emacspeak (wrap-program emacspeak `("DTK_PROGRAM" ":" prefix (,espeak))) #t)))) - #:tests? #f)) ; no check target + #:tests? #f)) ; no check target (inputs `(("emacs" ,emacs) - ("espeak" ,espeak) + ("espeak" ,espeak-ng) ("perl" ,perl) ("tcl" ,tcl) ("tclx" ,tclx))) @@ -9922,12 +9925,12 @@ (define-public emacspeak (synopsis "Audio desktop interface for Emacs") (description "Emacspeak is a speech interface that allows visually impaired users to -interact independently and efficiently with the computer. Audio formatting ---a technique pioneered by AsTeR-- and full support for W3C's Aural CSS (ACSS) -allows Emacspeak to produce rich aural presentations of electronic information. -By seamlessly blending all aspects of the Internet such as Web-surfing and -messaging, Emacspeak speech-enables local and remote information via a -consistent and well-integrated user interface.") +interact independently and efficiently with the computer. Audio +formatting---a technique pioneered by AsTeR---and full support for W3C's Aural +CSS (ACSS) allows Emacspeak to produce rich aural presentations of electronic +information. By seamlessly blending all aspects of the Internet such as +Web-surfing and messaging, Emacspeak speech-enables local and remote +information via a consistent and well-integrated user interface.") (license license:gpl2+))) (define-public emacs-adaptive-wrap -- cgit v1.2.3 From 7a99c58c4597a550703f32018efafb0fe84d5c72 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 1 Jun 2020 05:41:13 +0530 Subject: combinators: Recurse fold2 to named let loop. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/combinators.scm (fold2): Recurse to named let loop, not fold2 itself. Signed-off-by: Jakub Kądziołka --- guix/combinators.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/combinators.scm b/guix/combinators.scm index 11cad62ccf..4707b59363 100644 --- a/guix/combinators.scm +++ b/guix/combinators.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014 Eric Bavier +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,7 @@ (define fold2 (call-with-values (lambda () (proc (car lst1) (car lst2) result1 result2)) (lambda (result1 result2) - (fold2 proc result1 result2 (cdr lst1) (cdr lst2))))))))) + (loop result1 result2 (cdr lst1) (cdr lst2))))))))) (define (fold-tree proc init children roots) "Call (PROC NODE RESULT) for each node in the tree that is reachable from -- cgit v1.2.3 From 1a5706df6fea263d8319217334ee92329ff544f2 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Jun 2020 14:29:38 +0200 Subject: gnu: emacs-perspective: Update to 2.8. * gnu/packages/emacs-xyz.scm (emacs-perspective): Update to 2.8. Signed-off-by: Nicolas Goaziou --- 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 c1f7f1fe06..5f0a0184f9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5897,7 +5897,7 @@ (define-public emacs-hl-todo (define-public emacs-perspective (package (name "emacs-perspective") - (version "2.2") + (version "2.8") (source (origin (method git-fetch) @@ -5907,7 +5907,7 @@ (define-public emacs-perspective (file-name (git-file-name name version)) (sha256 (base32 - "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h")))) + "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g")))) (build-system emacs-build-system) (home-page "https://github.com/nex3/perspective-el") (synopsis "Switch between named \"perspectives\"") -- cgit v1.2.3 From 5b588f2c9ba9c40dc32aed7c3cdaa45e8f920509 Mon Sep 17 00:00:00 2001 From: tsmish Date: Sat, 9 May 2020 15:51:53 +0000 Subject: gnu: vis: Fix configuration load order. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (vis)[native-search-paths]: Remove. There is no need to set $VIS_PATH to $prefix/share/vis as VIS_PATH (#define), which is also in search path (https://github.com/martanne/vis/blob/7648280a95954304e5e935e2cead16d836b86eda/vis-lua.c#L2662), is already set by Makefile to $prefix/share/vis (https://github.com/martanne/vis/blob/7648280a95954304e5e935e2cead16d836b86eda/Makefile#L37). This fixes issue https://issues.guix.gnu.org/39394 Signed-off-by: Jakub Kądziołka --- gnu/packages/text-editors.scm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index d6c0aa7acb..9e73959dd8 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -102,10 +102,6 @@ (define-public vis `("LUA_PATH" ":" prefix (,LUA_PATH)) `("LUA_CPATH" ":" prefix (,LUA_CPATH))) #t)))))) - (native-search-paths - (list (search-path-specification - (variable "VIS_PATH") - (files '("share/vis"))))) (inputs `(("lua" ,lua) ("ncurses" ,ncurses) ("libtermkey" ,libtermkey) -- cgit v1.2.3 From 27b9fe86b1baabb6520647633baa137df49c68b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 17:38:14 +0200 Subject: gnu: dash: Update to 0.5.11. * gnu/packages/shells.scm (dash): Update to 0.5.11. --- gnu/packages/shells.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a82f1c8b26..74d08e02bc 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -64,15 +64,14 @@ (define-module (gnu packages shells) (define-public dash (package (name "dash") - (version "0.5.10.2") + (version "0.5.11") (source (origin (method url-fetch) (uri (string-append "http://gondor.apana.org.au/~herbert/dash/files/" "dash-" version ".tar.gz")) (sha256 - (base32 - "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw")) + (base32 "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From eeaeac23549597cec0d445bafc4e9f94f79910c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 17:38:23 +0200 Subject: gnu: wireguard-tools: Update to 1.0.20200513. * gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20200513. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index dbfd11626a..0f0157806c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -551,7 +551,7 @@ (define-public wireguard-linux-compat (define-public wireguard-tools (package (name "wireguard-tools") - (version "1.0.20200206") + (version "1.0.20200513") (source (origin (method git-fetch) @@ -560,7 +560,7 @@ (define-public wireguard-tools (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7")))) + (base32 "1yk8hng0qw2rf76hnawjbdpjssmah88bd5fk20h1c0j1yazlx0a9")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 125aacaa095e8933c1a73909647a15e1ea1f3174 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 17:49:14 +0200 Subject: gnu: exim: Update to 4.94. * gnu/packages/mail.scm (exim): Update to 4.94. --- 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 1a81389d18..5ed7197b40 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1259,7 +1259,7 @@ (define-public msmtp (define-public exim (package (name "exim") - (version "4.93.0.4") + (version "4.94") (source (origin (method url-fetch) @@ -1273,7 +1273,7 @@ (define-public exim (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "01g4sfycv13glnmfrapwhjbdw6z1z7w5bwjldxjmglwfw5p3czak")))) + (base32 "1nsb2i5mqxfz1sl1bmbxmpb2qiaf3wffhfiw4j9vfpagy3xfhzpp")))) (build-system gnu-build-system) (inputs `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ -- cgit v1.2.3 From 2ad9ac0cf0341c62fad0e0858459bf9795716d9e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 1 Jun 2020 20:24:24 +0200 Subject: gnu: emacs-cyberpunk-theme: Update to 1.22. * gnu/packages/emacs-xyz.scm (emacs-cyberpunk-theme): Update to 1.22. --- 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 5f0a0184f9..60469f93fa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9009,7 +9009,7 @@ (define-public emacs-flx (define-public emacs-cyberpunk-theme (package (name "emacs-cyberpunk-theme") - (version "1.21") + (version "1.22") (source (origin (method git-fetch) @@ -9018,7 +9018,7 @@ (define-public emacs-cyberpunk-theme (commit version))) (sha256 (base32 - "05mfgr9aj7knn7niadv9p6z3qrfpq2lbbi2wxxx62xywim9maw2y")) + "06nff38pcy5rgz13svkajsg0jjk73qy4a8m7p9f76yxcywxlgxlc")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://github.com/n3mo/cyberpunk-theme.el") -- cgit v1.2.3 From 8159ce1970d91567468cf1bacac313099a009d2a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 21 May 2019 05:00:30 +0000 Subject: gnu: bootstrap: Add powerpc64-linux dynamic linker. This makes it possible to build bootstrap binaries for powerpc64-linux: guix build --target=powerpc64-linux-gnu bootstrap-tarballs * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Add an entry for powerpc64-linux. Signed-off-by: Chris Marusich --- gnu/packages/bootstrap.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a3ecb6e692..c39e60ec8b 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2020 Efraim Flashner ;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong +;;; Copyright © 2019 Léo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -285,6 +286,7 @@ (define* (glibc-dynamic-linker ((string=? system "i686-gnu") "/lib/ld.so.1") ((string=? system "aarch64-linux") "/lib/ld-linux-aarch64.so.1") ((string=? system "powerpc-linux") "/lib/ld.so.1") + ((string=? system "powerpc64-linux") "/lib/ld64.so.1") ((string=? system "powerpc64le-linux") "/lib/ld64.so.2") ((string=? system "alpha-linux") "/lib/ld-linux.so.2") ((string=? system "s390x-linux") "/lib/ld64.so.1") -- cgit v1.2.3 From f8072794e4b3cc4e812bd8f52551ab34be206f0e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 00:11:36 +0530 Subject: gnu: swaks: Update to 20190914.0. * gnu/packages/mail.scm (swaks): Update to 20190914.0. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5ed7197b40..a408c84dfb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016, 2017 Troy Sankey ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Clément Lassieur -;;; Copyright © 2016, 2017, 2018, 2019 Arun Isaac +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2018 Marius Bakke ;;; Copyright © 2017 Thomas Danckaert @@ -2622,7 +2622,7 @@ (define-public blists (define-public swaks (package (name "swaks") - (version "20181104.0") + (version "20190914.0") (source (origin (method url-fetch) @@ -2631,7 +2631,7 @@ (define-public swaks version ".tar.gz")) (sha256 (base32 - "0n1yd27xcyb1ylp5gln3yv5gzi9r377hjy1j32367kgb3247ygq2")))) + "12awq5z4sdd54cxprj834zajxhkpy4jwhzf1fhigcx1zbhdaacsp")))) (build-system perl-build-system) (inputs `(("perl-net-dns" ,perl-net-dns) -- cgit v1.2.3 From a0362fdea9369b7927704e48cfc6c578213019ce Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 28 May 2020 10:34:40 +0100 Subject: gnu: ikiwiki: Revert to standard wrapper. * gnu/packages/web.scm (ikiwiki)[arguments]: Remove unnecessary 'include-PERL5LIB-in-wrapper' phase. The PERL5LIB environment variable may be set in the user's setup file instead. --- gnu/packages/web.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 64671842a7..b020a6f16a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4850,15 +4850,6 @@ (define-public ikiwiki (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'include-PERL5LIB-in-wrapper - (lambda _ - (substitute* "IkiWiki/Wrapper.pm" - (("^@wrapper\\_hooks") - (string-append - "@wrapper_hooks\n" - " addenv(\"PERL5LIB\", \"" - (getenv "PERL5LIB") - "\");"))))) (add-after 'patch-source-shebangs 'patch-Makefiles (lambda _ (substitute* "Makefile.PL" -- cgit v1.2.3 From db144a52a3edae6374a81632f9c10281d80cba8c Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 28 May 2020 15:53:43 +0100 Subject: gnu: ikiwiki: Propagate some inputs. * gnu/packages/web.scm (ikiwiki)[inputs]: Move perl-cgi-formbuilder, perl-cgi-session, perl-mail-sendmail, perl-timedate and perl-xml-simple to... [propagated-inputs]: ...here. --- gnu/packages/web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b020a6f16a..44fe403489 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4894,28 +4894,28 @@ (define-public ikiwiki (inputs `(("python" ,python-wrapper) ("perl-authen-passphrase" ,perl-authen-passphrase) - ("perl-cgi-formbuilder" ,perl-cgi-formbuilder) - ("perl-cgi-session" ,perl-cgi-session) ("perl-cgi-simple" ,perl-cgi-simple) ("perl-db-file" ,perl-db-file) ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) - ("perl-mail-sendmail" ,perl-mail-sendmail) - ("perl-timedate" ,perl-timedate) ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) - ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-twig" ,perl-xml-twig) ("po4a" ,po4a))) (propagated-inputs - `(("perl-html-parser" ,perl-html-parser) + `(("perl-cgi-formbuilder" ,perl-cgi-formbuilder) + ("perl-cgi-session" ,perl-cgi-session) + ("perl-html-parser" ,perl-html-parser) ("perl-html-scrubber" ,perl-html-scrubber) ("perl-html-template" ,perl-html-template) ("perl-json" ,perl-json) + ("perl-mail-sendmail" ,perl-mail-sendmail) ("perl-text-markdown-discount" ,perl-text-markdown-discount) + ("perl-timedate" ,perl-timedate) ("perl-uri" ,perl-uri) + ("perl-xml-simple" ,perl-xml-simple) ("perl-yaml-libyaml" ,perl-yaml-libyaml))) (home-page "https://ikiwiki.info/") (synopsis "Wiki compiler, capable of generating HTML") -- cgit v1.2.3 From e642f78f2eaf1d53d656ff3cd86d4dd186e8eb52 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 1 Jun 2020 13:12:44 +0100 Subject: gnu: ikiwiki: Add missing input. * gnu/packages/web.scm (ikiwiki)[inputs]: Add perl-ipc-run. [arguments]: Set PERL5LIB and CC for IPC::Run in 'pre-check' phase. --- gnu/packages/web.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 44fe403489..6e5bc81660 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4867,11 +4867,31 @@ (define-public ikiwiki "touch" "{}" "+") #t)) (add-before 'check 'pre-check - ;; XDG_DATA_DIRS is needed by the podcast.t test. (lambda* (#:key inputs #:allow-other-keys) + ;; Six tests use IPC::Run. For these tests the PERL5LIB + ;; variable is needed in the runtime environment and also + ;; in the search path list in the setup file. + (substitute* + '("t/aggregate-file.t" "t/git-cgi.t" "t/git-untrusted.t" + "t/passwordauth.t" "t/relativity.t" "t/wrapper-environ.t") + (("(.*)\"perl\"(.*)$" _ prefix suffix) + (string-append prefix "qw(env), 'PERL5LIB='.$ENV{PERL5LIB}" + ", qw(perl)" suffix)) + (("(.*) PERL5LIB=(.*) perl(.*)$" _ prefix middle suffix) + (string-append prefix "), 'PERL5LIB='.$ENV{PERL5LIB}.':" + middle "', qw(perl" suffix)) + (("(.*)setup(.* )getcwd(.*)$" _ prefix middle suffix) + (string-append prefix "setup" middle + "$ENV{PERL5LIB}.':'.getcwd" suffix)) + (("^ENV(.*): '(.*)$" _ middle suffix) + (string-append "ENV" middle + ": '$ENV{PERL5LIB}:" suffix))) + ;; XDG_DATA_DIRS is needed by the podcast.t test. (setenv "XDG_DATA_DIRS" (string-append (assoc-ref inputs "shared-mime-info") "/share")) + ;; CC is needed by IkiWiki/Wrapper.pm. + (setenv "CC" "gcc") #t)) (add-after 'install 'wrap-programs (lambda* (#:key outputs #:allow-other-keys) @@ -4899,6 +4919,7 @@ (define-public ikiwiki ("perl-file-mimeinfo" ,perl-file-mimeinfo) ("perl-html-tagset" ,perl-html-tagset) ("perl-image-magick" ,perl-image-magick) + ("perl-ipc-run" ,perl-ipc-run) ("perl-lwpx-paranoidagent" ,perl-lwpx-paranoidagent) ("perl-xml-feed" ,perl-xml-feed) ("perl-xml-sax" ,perl-xml-sax) -- cgit v1.2.3 From f3ed5297392fd7fe9cb6fc003824ce34130e80bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:31:22 +0200 Subject: gnu: geany: Fix crash when displaying file selection * gnu/packages/text-editors.scm (geany)[arguments]: Wrap GTK to prevent errors when opening file selection menu. --- gnu/packages/text-editors.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 9e73959dd8..0095fcd839 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -821,7 +821,12 @@ (define-public geany `(("gtk+" ,gtk+) ("scintilla" ,scintilla))) (arguments - `(#:phases + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%gnu-build-system-modules) + #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build gnu-build-system) + (guix build utils)) + #:phases (modify-phases %standard-phases (add-after 'unpack 'use-scintilla-shared-library (lambda* (#:key inputs #:allow-other-keys) @@ -838,7 +843,9 @@ (define-public geany (substitute* "tests/Makefile.am" (("AM_LDFLAGS =" all) (string-append all " -lscintilla"))) (for-each delete-file (list "autogen.sh" "configure" "Makefile.in")) - #t))))) + #t)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (home-page "https://www.geany.org") (synopsis "Fast and lightweight IDE") (description "Geany is a small and fast Integrated Development -- cgit v1.2.3 From 9e03ddc5175a09f408bdca91ea5ccecdfd8fb9af Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:35:26 +0200 Subject: gnu: geany: Un-unbundle scintilla * gnu/packages/text-editors.scm (geany)[source]: Do not un-bundle scintilla. [arguments]: Remove phase using our shared library. Use bundled one instead. --- gnu/packages/text-editors.scm | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0095fcd839..e80e9dcbe5 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -796,17 +796,13 @@ (define-public geany (package (name "geany") (version "1.36") - (source (origin - (method url-fetch) - (uri (string-append "https://download.geany.org/" - "geany-" version ".tar.bz2")) - (sha256 - (base32 - "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i")) - (modules '((guix build utils))) - (snippet '(begin - (delete-file-recursively "scintilla") - #t)))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.geany.org/" + "geany-" version ".tar.bz2")) + (sha256 + (base32 "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -819,7 +815,10 @@ (define-public geany ("python-docutils" ,python-docutils))) ;for rst2html (inputs `(("gtk+" ,gtk+) - ("scintilla" ,scintilla))) + ;; FIXME: Geany bundles a 3.X release of Scintilla. It is not + ;; currently possible to replace it with our Scintilla package. + ;; ("scintilla" ,scintilla) + )) (arguments `(#:imported-modules ((guix build glib-or-gtk-build-system) ,@%gnu-build-system-modules) @@ -828,22 +827,6 @@ (define-public geany (guix build utils)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'use-scintilla-shared-library - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure.ac" - (("scintilla/Makefile") "") - (("scintilla/include/Makefile") "")) - (substitute* "Makefile.am" - (("scintilla ") "")) - (substitute* "src/Makefile.am" - (("\\$\\(top_builddir\\)/scintilla/libscintilla.la") "") - (("geany_LDFLAGS =" all) (string-append all " -lscintilla"))) - (substitute* "doc/Makefile.am" - (("\\$\\(INSTALL_DATA\\) \\$\\(top_srcdir\\)/scintilla/License.txt \\$\\(DOCDIR\\)/ScintillaLicense.txt") "")) - (substitute* "tests/Makefile.am" - (("AM_LDFLAGS =" all) (string-append all " -lscintilla"))) - (for-each delete-file (list "autogen.sh" "configure" "Makefile.in")) - #t)) (add-after 'install 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (home-page "https://www.geany.org") -- cgit v1.2.3 From b2dbc53ec2806f05d6c98287f79ee162d335050d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:40:46 +0200 Subject: gnu: scintilla: Update to 4.4.0. * gnu/packages/text-editors.scm (scintilla): Update to 4.4.0. [arguments]: Remove phase building shared library. This is now done out of the box. --- gnu/packages/text-editors.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index e80e9dcbe5..8e4e49112d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -743,14 +743,14 @@ (define-public texmacs (define-public scintilla (package (name "scintilla") - (version "4.3.3") + (version "4.4.0") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "0zh8c19r1zd4kr9jg2ws0n2n5ic2siz5zbns6cvylyfbpf69ghy2")))) + (base32 "10qnab10gfkzdfyqpmsl4c3mhh7533l4q6jrdfy5ssvj4da6hawd")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") @@ -758,20 +758,14 @@ (define-public scintilla #:phases (modify-phases %standard-phases (delete 'configure) ;no configure script - (add-after 'unpack 'build-shared-library - (lambda _ - (substitute* "gtk/makefile" - (("scintilla\\.a") "libscintilla.so") - (("\\$\\(AR\\) \\$\\(ARFLAGS\\) \\$@ \\$\\^") - "$(CC) -shared $^ -o $@") - (("\\$\\(RANLIB\\) \\$@") "")) - #t)) (replace 'install + ;; Upstream provides no install script. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib")) (include (string-append out "/include"))) - (install-file "bin/libscintilla.so" lib) + (for-each (lambda (f) (install-file f lib)) + (find-files "bin/" "\\.so$")) (for-each (lambda (f) (install-file f include)) (find-files "include/" ".")) #t)))))) -- cgit v1.2.3 From 7e80c8e827e1a7694e5bedceab03a7af8e8d90a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Jun 2020 23:56:58 +0200 Subject: gnu: fet: Update to 5.44.8. * gnu/packages/education.scm (fet): Update to 5.44.8. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f8e77f07ad..550925d638 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -606,14 +606,14 @@ (define-public omnitux (define-public fet (package (name "fet") - (version "5.44.7") + (version "5.44.8") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "19b22brpb2mpvg14c2a0xmv8ipq5jg7yjmly8y3gfy8gmc3wqg5m")))) + (base32 "1i59xpkdnrd3qzgqs11vsws57g33zvkad5q3an56vd94aw7z3kpw")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From d4ad8fd39864db09e7fac40b8156fce298e16a4c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jun 2020 00:07:12 +0200 Subject: gnu: rclone: Update to 1.52.0. * gnu/packages/sync.scm (rclone): Update to 1.52.0. --- gnu/packages/sync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 89dbe4578b..abaf0f7cbc 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -360,14 +360,14 @@ (define-public casync (define-public rclone (package (name "rclone") - (version "1.51.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/rclone/rclone/releases/download/" "v" version "/rclone-v" version ".tar.gz")) (sha256 - (base32 "1vi7sbdr5irlgxn080nwzs9lr893cxk59y4vnannzr8prvzvgd9y")))) + (base32 "06zkxnz0ggv8k4ayv3a8jx6ch0hclgs613wagskklqm15zv0dkdq")))) ;; FIXME: Rclone bundles some libraries Guix already provides. Need to ;; un-bundle them. (build-system go-build-system) -- cgit v1.2.3 From 8fc6059b024a42f73cc0203ce62a7baf0d64763c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 00:28:09 +0200 Subject: gnu: lmdb: Update to 0.9.25. * gnu/packages/databases.scm (lmdb): Update to 0.9.25. [source]: Fetch from OpenLDAP repository. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ba15260c1f..a73ac80637 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2078,16 +2078,16 @@ (define-public perl-db-file (define-public lmdb (package (name "lmdb") - (version "0.9.24") + (version "0.9.25") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/LMDB/lmdb.git") + (url "https://git.openldap.org/openldap/openldap.git") (commit (string-append "LMDB_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm")))) + (base32 "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From ddde8a079c89d5301b06007f9922f648daf6622b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:03:02 +0200 Subject: gnu: xarchiver: Update to 0.5.4.15. * gnu/packages/compression.scm (xarchiver): Update to 0.5.4.15. --- gnu/packages/compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index cdab7408ed..568de1cfb2 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2101,7 +2101,7 @@ (define-public ncompress (define-public xarchiver (package (name "xarchiver") - (version "0.5.4.14") + (version "0.5.4.15") (source (origin (method git-fetch) @@ -2110,7 +2110,7 @@ (define-public xarchiver (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px")))) + (base32 "0a3y54r5zp2c0cqm77r07qrl1vh200wvqmbhm35diy22fvkq5mwc")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -2118,7 +2118,7 @@ (define-public xarchiver ("libxslt" ,libxslt) ("pkg-config" ,pkg-config))) (inputs - `(("adwaita-icon-theme" ,adwaita-icon-theme) ; Hard-coded theme + `(("adwaita-icon-theme" ,adwaita-icon-theme) ; hard-coded theme ("gtk+" ,gtk+))) (home-page "https://github.com/ib/xarchiver") (synopsis "Graphical front-end for archive operations") -- cgit v1.2.3 From 8db562d7302006a6d2e825c4d0859cf426f7efb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:03:13 +0200 Subject: gnu: fasm: Update to 1.73.24. * gnu/packages/assembly.scm (fasm): Update to 1.73.24. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index c775603445..19be69ae9f 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -149,14 +149,14 @@ (define-public lightning (define-public fasm (package (name "fasm") - (version "1.73.22") + (version "1.73.24") (source (origin (method url-fetch) (uri (string-append "https://flatassembler.net/fasm-" version ".tgz")) (sha256 - (base32 "1pb0rcfdsb0h89khjjrbikz5wjdllavj3ajim0rcyh7x12xr1hw5")))) + (base32 "142vxhs8mh8isvlzq7ir0asmqda410phzxmk9gk9b43dldskkj7k")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests exist -- cgit v1.2.3 From 669fde534a3b8d4862e3cbf82f7e6b1bc87076a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:14:30 +0200 Subject: gnu: lmdb: Update home page. * gnu/packages/databases.scm (lmdb)[home-page]: Update. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a73ac80637..ae74e3c019 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2099,7 +2099,7 @@ (define-public lmdb (substitute* "Makefile" (("/usr/local") (assoc-ref outputs "out"))) #t))))) - (home-page "https://symas.com/products/lightning-memory-mapped-database") + (home-page "https://symas.com/lmdb/") (synopsis "Lightning Memory-Mapped Database library") (description "The @dfn{Lightning Memory-Mapped Database} (LMDB) is a high-performance -- cgit v1.2.3 From 870788719d35ac631847b12b05906663e5d1b406 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:24:29 +0200 Subject: gnu: mariadb-connector-c: Update to 3.1.8. * gnu/packages/databases.scm (mariadb-connector-c): Update to 3.1.8. --- gnu/packages/databases.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ae74e3c019..c8cbac5a07 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -933,7 +933,7 @@ (define-public mariadb (define-public mariadb-connector-c (package (name "mariadb-connector-c") - (version "3.1.6") + (version "3.1.8") (source (origin (method url-fetch) (uri (string-append @@ -942,13 +942,12 @@ (define-public mariadb-connector-c version "-src.tar.gz")) (sha256 (base32 - "083724f5daaqyzdcx508caz6fk2hs89jff85zg28ih43vxkvnrnj")))) + "0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523")))) (inputs `(("openssl" ,openssl))) (build-system cmake-build-system) (arguments - ;; No tests. - '(#:tests? #f)) + '(#:tests? #f)) ; no tests (home-page "https://mariadb.com/kb/en/mariadb-connector-c/") (synopsis "Client library to connect to MySQL or MariaDB") (description "The MariaDB Connector/C is used to connect applications -- cgit v1.2.3 From d038100ef08a03b9294e03e19f76d187fe5f9abe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 1 Jun 2020 21:29:00 +0200 Subject: gnu: ropgadget: Update to 6.3. * gnu/packages/cybersecurity.scm (ropgadget): Update to 6.3. --- gnu/packages/cybersecurity.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm index aedac03b8a..8ded081c50 100644 --- a/gnu/packages/cybersecurity.scm +++ b/gnu/packages/cybersecurity.scm @@ -26,14 +26,13 @@ (define-module (gnu packages cybersecurity) (define-public ropgadget (package (name "ropgadget") - (version "6.2") + (version "6.3") (source (origin (method url-fetch) (uri (pypi-uri "ROPGadget" version)) (sha256 - (base32 - "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh")))) + (base32 "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9")))) (build-system python-build-system) (propagated-inputs `(("python-capstone" ,python-capstone))) -- cgit v1.2.3 From 22da777040876b9faf4af93689d093315f2e0b04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 00:27:16 +0200 Subject: gnu: xa: Update to 2.3.11. * gnu/packages/assembly.scm (xa): Update to 2.3.11. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 19be69ae9f..c9582bc596 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -347,14 +347,14 @@ (define-public wla-dx (define-public xa (package (name "xa") - (version "2.3.10") + (version "2.3.11") (source (origin (method url-fetch) (uri (string-append "https://www.floodgap.com/retrotech/xa" "/dists/xa-" version ".tar.gz")) (sha256 (base32 - "0y5sd247g11jfk5msxy91hz2nhpy7smj125dzfyfhjsjnqk5nyw6")))) + "0b81r7mvzqxgnbbmhixcnrf9nc72v1nqaw19k67221g3k561dwij")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; TODO: custom test harness, not sure how it works -- cgit v1.2.3 From e7da8055892510fcb5cf4b51479a0897e18a205e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 00:27:33 +0200 Subject: gnu: hplip: Update to 3.20.5. * gnu/packages/cups.scm (hplip): Update to 3.20.5. --- 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 0250f16db3..86281b9320 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -435,14 +435,14 @@ (define-public cups-pk-helper (define-public hplip (package (name "hplip") - (version "3.20.3") + (version "3.20.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1")) + "0nj79r61fzddwwzf8kcc0qkp4y9qx46v15iarz6h6y3v91wbsjq0")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet -- cgit v1.2.3 From cef87bfea8a842d7dcf9a44c2305478fa6cca9b2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 04:35:25 +0530 Subject: gnu: emacs-evil-surround: Update to 1.1.0. * gnu/packages/emacs-xyz.scm (emacs-evil-surround): Update to 1.1.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 60469f93fa..b64a964916 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10735,7 +10735,7 @@ (define-public emacs-key-chord (define-public emacs-evil-surround (package (name "emacs-evil-surround") - (version "1.0.4") + (version "1.1.0") (source (origin (method git-fetch) @@ -10744,7 +10744,7 @@ (define-public emacs-evil-surround (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ajsi6xn8mliwzl24h6pp9rd91z7f20yvkphr9q7k6zpjrd7fb9q")))) + (base32 "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From 61aa30df3254fb094dc5da715763f6dcfd6435d2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:07:26 +0530 Subject: gnu: go-github-com-robfig-cron: Update to 3.0.1. * gnu/packages/golang.scm (go-github-com-robfig-cron): Update to 3.0.1. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 8dd276562a..ae0b7c6779 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -15,7 +15,7 @@ ;;; Copyright @ 2018, 2019 Katherine Cox-Buday ;;; Copyright @ 2019 Giovanni Biscuolo ;;; Copyright @ 2019, 2020 Alex Griffin -;;; Copyright © 2019 Arun Isaac +;;; Copyright © 2019, 2020 Arun Isaac ;;; Copyright © 2020 Jack Hill ;;; ;;; This file is part of GNU Guix. @@ -3214,7 +3214,7 @@ (define-public go-github-com-maruel-panicparse (define-public go-github-com-robfig-cron (package (name "go-github-com-robfig-cron") - (version "3.0.0") + (version "3.0.1") (source (origin (method git-fetch) @@ -3224,7 +3224,7 @@ (define-public go-github-com-robfig-cron (file-name (git-file-name name version)) (sha256 (base32 - "0bvq5gxkhyj21lq32nma23i4dpwp7bswnp2yks6372ilkcyisx2z")))) + "1agzbw2dfk2d1mpmddr85s5vh6ygm8kqrvfg87i9d2wqnlsnliqm")))) (build-system go-build-system) (arguments `(#:import-path "github.com/robfig/cron")) -- cgit v1.2.3 From 74f017587031dc59a02de966fc09d886f1e9b1eb Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:31:56 +0530 Subject: gnu: python-axolotl-curve25519: Update to 0.4.1.post2. * gnu/packages/python-crypto.scm (python-axolotl-curve25519): Update to 0.4.1.post2. [source]: Use PyPI URI. [arguments]: Remove --root=/ configure flag. --- gnu/packages/python-crypto.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index fc451e83ef..59beacf6e0 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017 Arun Isaac +;;; Copyright © 2016, 2017, 2020 Arun Isaac ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Nicolas Goaziou @@ -611,22 +611,15 @@ (define-public python2-ed25519 (define-public python-axolotl-curve25519 (package (name "python-axolotl-curve25519") - (version "0.1") + (version "0.4.1.post2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tgalal/python-axolotl-curve25519") - (commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2"))) - (file-name (string-append name "-" version "-checkout")) + (method url-fetch) + (uri (pypi-uri "python-axolotl-curve25519" version)) (sha256 (base32 - "0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra")))) + "18v3rfyv7xi26fb97nw1xc0l6x8wi0i4xj8dlq4gblpbjxiac187")))) (build-system python-build-system) - (arguments - `(;; Prevent creation of the egg. This works around - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 - #:configure-flags '("--root=/"))) (home-page "https://github.com/tgalal/python-axolotl-curve25519") (synopsis "Python wrapper for curve25519 library") (description "This is a python wrapper for the curve25519 library -- cgit v1.2.3 From b578168f439d030097d03ecf7449261c0954ddfc Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:33:29 +0530 Subject: gnu: python-axolotl: Update to 0.2.3. * gnu/packages/python-crypto.scm (python-axolotl): Update to 0.2.3. [source]: Use PyPI URI. [propagated-inputs]: Remove python-dateutil and python-pycrypto. Add python-cryptography. --- gnu/packages/python-crypto.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 59beacf6e0..b30a887429 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -635,17 +635,14 @@ (define-public python2-axolotl-curve25519 (define-public python-axolotl (package (name "python-axolotl") - (version "0.1.39") + (version "0.2.3") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tgalal/python-axolotl") - (commit version))) - (file-name (git-file-name name version)) - (patches (search-patches "python-axolotl-AES-fix.patch")) + (method url-fetch) + (uri (pypi-uri "python-axolotl" version)) (sha256 - (base32 "0xm9qgcwf6fq7rhzfcviwhbzcbj4i7wkxkab2z55fy1x82lya9g6")))) + (base32 + "1bwdp24fmriffwx91aigs9k162albb51iskp23nc939z893q23py")))) (build-system python-build-system) (arguments `(#:phases @@ -658,9 +655,8 @@ (define-public python-axolotl #t))))) (propagated-inputs `(("python-axolotl-curve25519" ,python-axolotl-curve25519) - ("python-dateutil" ,python-dateutil) - ("python-protobuf" ,python-protobuf) - ("python-pycrypto" ,python-pycrypto))) + ("python-cryptography" ,python-cryptography) + ("python-protobuf" ,python-protobuf))) (home-page "https://github.com/tgalal/python-axolotl") (synopsis "Python port of libaxolotl-android") (description "This is a python port of libaxolotl-android. This -- cgit v1.2.3 From b86dcc297a255c4138d282a3e16b6517f279488d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:34:55 +0530 Subject: gnu: gajim-omemo: Update to 2.7.4. * gnu/packages/messaging.scm (gajim-omemo): Update to 2.7.4. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ce542ad4f4..1ef1cbc3e1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -755,7 +755,7 @@ (define-public gajim (define-public gajim-omemo (package (name "gajim-omemo") - (version "2.6.29") + (version "2.7.4") (source (origin (method url-fetch/zipbomb) (uri (string-append @@ -763,7 +763,7 @@ (define-public gajim-omemo version ".zip")) (sha256 (base32 - "1mif5qkrvxclqbqmq6njini4laznbs5nn82w2f1hkl8c1284dvgi")))) + "00zrj57n86c2m99n0swmmaws4f8zccbgbi8fknv6f9b1vif9jc8p")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 657b60725c4affd213ac907bb01ac0f08ee122d8 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 2 Jun 2020 07:36:16 +0530 Subject: gnu: gajim-omemo: Update home page. * gnu/packages/messaging.scm (gajim-omemo)[home-page]: Update. --- 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 1ef1cbc3e1..12b0cd4782 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -779,7 +779,7 @@ (define-public gajim-omemo (propagated-inputs `(("python-axolotl" ,python-axolotl))) (home-page - "https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin") + "https://dev.gajim.org/gajim/gajim-plugins/-/wikis/OmemoGajimPlugin") (synopsis "Gajim OMEMO plugin") (description "This package provides the Gajim OMEMO plugin. OMEMO is an XMPP -- cgit v1.2.3 From a7dff9553cb56ed92f7b564223e20eb60cdf29dd Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 25 May 2020 11:57:51 +0200 Subject: gnu: slurm-drmaa: Update to 1.1.1. * gnu/packages/parallel.scm (slurm-drmaa): Update to 1.1.1. --- gnu/packages/parallel.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 575f87930f..30b3c1ddda 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Roel Janssen ;;; ;;; This file is part of GNU Guix. ;;; @@ -192,20 +193,22 @@ (define-public slurm (define-public slurm-drmaa (package (name "slurm-drmaa") - (version "1.0.7") + (version "1.1.1") (source (origin (method url-fetch) - (uri "http://apps.man.poznan.pl/trac/slurm-drmaa/downloads/9") - (file-name (string-append name "-" version ".tar.gz")) + (uri (string-append + "https://github.com/natefoo/slurm-drmaa/releases/download/" + version "/slurm-drmaa-" version ".tar.gz")) (sha256 (base32 - "0grw55hmny2mc4nc0y1arnvxd2k0dcdfn476kzs180fibjxgfw14")))) + "19r4cm88pcpm3wli4cc61zq7354pg67cg866f3a430p15hm1knrn")))) (build-system gnu-build-system) + (arguments `(#:tests? #f)) ; The tests require "bats". (inputs `(("slurm" ,slurm))) (native-inputs `(("which" ,which))) - (home-page "http://apps.man.poznan.pl/trac/slurm-drmaa") + (home-page "https://github.com/natefoo/slurm-drmaa") (synopsis "Distributed resource management application API for SLURM") (description "PSNC DRMAA for Simple Linux Utility for Resource Management (SLURM) is -- cgit v1.2.3 From cb21c14b0ae1f4c9fcad4927e3b2eb0c06d7b018 Mon Sep 17 00:00:00 2001 From: Simon South Date: Fri, 29 May 2020 13:53:46 -0400 Subject: tests: Allow passing on systems without support for swap devices. * tests/syscalls.scm ("swapon", "swapoff"): Accept ENOSYS as a valid result. Signed-off-by: Mathieu Othacehe --- tests/syscalls.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 3823de7c1e..6098a09437 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 David Thompson +;;; Copyright © 2020 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -73,21 +74,21 @@ (define temp-file ;; Note: 'utimensat' does not change 'ctime'. (list (stat:mtime st) (stat:atime st))))) -(test-assert "swapon, ENOENT/EPERM" +(test-assert "swapon, ENOSYS/ENOENT/EPERM" (catch 'system-error (lambda () (swapon "/does-not-exist") #f) (lambda args - (memv (system-error-errno args) (list EPERM ENOENT))))) + (memv (system-error-errno args) (list EPERM ENOENT ENOSYS))))) -(test-assert "swapoff, ENOENT/EINVAL/EPERM" +(test-assert "swapoff, ENOSYS/ENOENT/EINVAL/EPERM" (catch 'system-error (lambda () (swapoff "/does-not-exist") #f) (lambda args - (memv (system-error-errno args) (list EPERM EINVAL ENOENT))))) + (memv (system-error-errno args) (list EPERM EINVAL ENOENT ENOSYS))))) (test-assert "mkdtemp!" (let* ((tmp (or (getenv "TMPDIR") "/tmp")) -- cgit v1.2.3 From 5c3e94cdf8e3966d70be7cd7eff25c2575e25272 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Mon, 1 Jun 2020 23:06:57 +0200 Subject: doc: cookbook: Add entry about Wireguard VPN. Co-authored-by: Brice Waegeneire * doc/guix-cookbook.texi (Connect to Wireguard VPN): New section. --- doc/guix-cookbook.texi | 80 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 8651bc4429..5574a60857 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -327,7 +327,7 @@ package definitions. @item Inheritance makes it easy to customize a package by inheriting from it and modifying only what is needed. - + @item Batch processing: the whole package collection can be parsed, filtered and processed. Building a headless server with all graphical interfaces stripped @@ -1323,6 +1323,7 @@ reference. @menu * Customizing the Kernel:: Creating and using a custom Linux kernel on Guix System. +* Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Setting up a bind mount:: Setting up a bind mount in the file-systems definition. @end menu @@ -1567,6 +1568,83 @@ likely that you'll need to modify the initrd on a machine using a custom kernel, since certain modules which are expected to be built may not be available for inclusion into the initrd. +@node Connecting to Wireguard VPN +@section Connecting to Wireguard VPN + +To connect to a Wireguard VPN server you need the kernel module to be +loaded in memory and a package providing networking tools that support +it (e.g. @code{wireguard-tools} or @code{network-manager}). + +Here is a configuration example for Linux-Libre < 5.6, where the module +is out of tree and need to be loaded manually---following revisions of +the kernel have it built-in and so don't need such configuration: + +@lisp +(use-modules (gnu)) +(use-service-modules desktop) +(use-package-modules vpn) + +(operating-system + ;; … + (services (cons (simple-service 'wireguard-module + kernel-module-loader-service-type + '("wireguard")) + %desktop-services)) + (packages (cons wireguard-tools %base-packages)) + (kernel-loadable-modules (list wireguard-linux-compat))) +@end lisp + +After reconfiguring and restarting your system you can either use +Wireguard tools or NetworkManager to connect to a VPN server. + +@subsection Using Wireguard tools + +To test your Wireguard setup it is convenient to use @command{wg-quick}. +Just give it a configuration file @command{wg-quick up ./wg0.conf}; or +put that file in @file{/etc/wireguard} and run @command{wg-quick up wg0} +instead. + +@quotation Note +Be warned that the author described this command as a: “[…] very quick +and dirty bash script […]”. +@end quotation + +@subsection Using NetworkManager + +Thanks to NetworkManager support for Wireguard we can connect to our VPN +using @command{nmcli} command. Up to this point this guide assumes that +you're using Network Manager service provided by +@code{%desktop-services}. Ortherwise you need to adjust your services +list to load @code{network-manager-service-type} and reconfigure your +Guix system. + +To import your VPN configuration execute nmcli import command: + +@example shell +# nmcli connection import type wireguard file wg0.conf +Connection 'wg0' (edbee261-aa5a-42db-b032-6c7757c60fde) successfully added +@end example + +This will create a configuration file in +@file{/etc/NetworkManager/wg0.nmconnection}. Next connect to the +Wireguard server: + +@example shell +$ nmcli connection up wg0 +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/6) +@end example + +By default NetworkManager will connect automatically on system boot. To +change that behaviour you need to edit your config: + +@example shell +# nmcli connection modify wg0 connection.autoconnect no +@end example + +For more specific information about NetworkManager and wireguard +@uref{https://blogs.gnome.org/thaller/2019/03/15/wireguard-in-networkmanager/,see +this post by thaller}. + @node Customizing a Window Manager @section Customizing a Window Manager @cindex wm -- cgit v1.2.3 From b41068edcee8ab396feb6657784cb7bb00d08c42 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Jun 2020 12:39:54 +0200 Subject: gnu: emacs-ts: Update to 0.2. * gnu/packages/emacs-xyz.scm (emacs-ts): Update to 0.2. --- gnu/packages/emacs-xyz.scm | 114 ++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b64a964916..ccb6614c74 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13379,67 +13379,67 @@ (define-public emacs-org-make-toc (license license:gpl3+))) (define-public emacs-ts - (let ((commit "395649a2f2ba79028331bb1fa9ec08b218950ff6") - (revision "2")) - (package - (name "emacs-ts") - (version (git-version "0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alphapapa/ts.el") - (commit commit))) - (sha256 - (base32 - "02603wv66fplsigxd87jy23hrb5g9vigszcpdqrdv0ypaqaxlr3a")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-s" ,emacs-s) - ("emacs-dash" ,emacs-dash))) - (arguments - ;; XXX: Three tests are failing because of a timezone-related issue - ;; with how they're written. On my machine, all the failing test - ;; results are 18000 seconds (5 hours) off. + (package + (name "emacs-ts") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/ts.el") + (commit version))) + (sha256 + (base32 "0hmzc1ppnkkr0lfq5fhzqr6icv6iqz824a6bnns7zr466hhqp3qb")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-s" ,emacs-s) + ("emacs-dash" ,emacs-dash))) + (arguments + ;; XXX: Three tests are failing because of a timezone-related issue + ;; with how they're written. On my machine, all the failing test + ;; results are 18000 seconds (5 hours) off. - ;; The ts-parse-org function accepts a string without any timezone - ;; info, not assumed to be in Unix time, and converts it to a so-called - ;; ts struct. The ts-unix function (accessor) accepts a ts struct, - ;; then seems to assume the struct's corresponding time is in terms of - ;; the user's current time zone, before returning a Unix time in - ;; seconds. + ;; The ts-parse-org function accepts a string without any timezone + ;; info, not assumed to be in Unix time, and converts it to a so-called + ;; ts struct. The ts-unix function (accessor) accepts a ts struct, + ;; then seems to assume the struct's corresponding time is in terms of + ;; the user's current time zone, before returning a Unix time in + ;; seconds. - ;; The failing tests all have similar problems, but nothing else about - ;; the library seems particularly off. + ;; The failing tests all have similar problems, but nothing else about + ;; the library seems particularly off. - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "test/test.el" - "-f" "ert-run-tests-batch-and-exit") - #:phases - (modify-phases %standard-phases - (add-before 'check 'make-tests-writable - (lambda _ - (make-file-writable "test/test.el") - #t)) - (add-before 'check 'delete-failing-tests - (lambda _ - (emacs-batch-edit-file "test/test.el" - `(progn (progn - (goto-char (point-min)) - (dolist (test-regexp '("ert-deftest ts-format" - "ert-deftest ts-parse-org\\_>" - "ert-deftest ts-parse-org-element")) - (re-search-forward test-regexp) - (beginning-of-line) - (kill-sexp))) - (basic-save-buffer))) - #t))))) - (home-page "https://github.com/alphapapa/ts.el") - (synopsis "Timestamp and date/time library") - (description "This package facilitates manipulating dates, times, and + `(#:tests? #t + #:test-command '("emacs" "--batch" + "-l" "test/test.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + (modify-phases %standard-phases + (add-before 'check 'make-tests-writable + (lambda _ + (make-file-writable "test/test.el") + #t)) + (add-before 'check 'delete-failing-tests + (lambda _ + (emacs-batch-edit-file "test/test.el" + `(progn (progn + (goto-char (point-min)) + (dolist (test-regexp + '("ert-deftest ts-format" + "ert-deftest ts-parse-org\\_>" + "ert-deftest ts-parse-org-element" + "ert-deftest ts-update")) + (re-search-forward test-regexp) + (beginning-of-line) + (kill-sexp))) + (basic-save-buffer))) + #t))))) + (home-page "https://github.com/alphapapa/ts.el") + (synopsis "Timestamp and date/time library") + (description "This package facilitates manipulating dates, times, and timestamps by providing a @code{ts} struct.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-peg (package -- cgit v1.2.3 From f51fd97ec54a98668d63c52d8a6bd75d8dc3292e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 1 Jun 2020 14:59:10 +0200 Subject: build-system: linux-module: Allow passing #:make-flags argument. * guix/build-system/linux-module.scm (linux-module-build): Add #:make-flags. (linux-module-build-cross): Add #:make-flags. * guix/build/linux-module-build-system.scm (install): Pass make-flags. Signed-off-by: Danny Milosavljevic --- guix/build-system/linux-module.scm | 4 ++++ guix/build/linux-module-build-system.scm | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/guix/build-system/linux-module.scm b/guix/build-system/linux-module.scm index ca104f7c75..1077215671 100644 --- a/guix/build-system/linux-module.scm +++ b/guix/build-system/linux-module.scm @@ -129,6 +129,7 @@ (define* (linux-module-build store name inputs (phases '(@ (guix build linux-module-build-system) %standard-phases)) (outputs '("out")) + (make-flags ''()) (system (%current-system)) (guile #f) (substitutable? #t) @@ -156,6 +157,7 @@ (define builder #:arch ,(system->arch (or target system)) #:tests? ,tests? #:outputs %outputs + #:make-flags ,make-flags #:inputs %build-inputs))) (define guile-for-build @@ -181,6 +183,7 @@ (define* (linux-module-build-cross target native-drvs target-drvs (guile #f) (outputs '("out")) + (make-flags ''()) (search-paths '()) (native-search-paths '()) (tests? #f) @@ -228,6 +231,7 @@ (define %build-target-inputs #:target ,target #:arch ,(system->arch (or target system)) #:outputs %outputs + #:make-flags ,make-flags #:inputs %build-target-inputs #:native-inputs %build-host-inputs #:search-paths diff --git a/guix/build/linux-module-build-system.scm b/guix/build/linux-module-build-system.scm index 73d6b101f6..d51d76f94b 100644 --- a/guix/build/linux-module-build-system.scm +++ b/guix/build/linux-module-build-system.scm @@ -58,12 +58,13 @@ (define* (build #:key inputs make-flags #:allow-other-keys) ;; This block was copied from make-linux-libre--only took the "modules_install" ;; part. -(define* (install #:key inputs native-inputs outputs #:allow-other-keys) +(define* (install #:key make-flags inputs native-inputs outputs + #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (moddir (string-append out "/lib/modules"))) ;; Install kernel modules (mkdir-p moddir) - (invoke "make" "-C" + (apply invoke "make" "-C" (string-append (assoc-ref inputs "linux-module-builder") "/lib/modules/build") (string-append "M=" (getcwd)) @@ -76,7 +77,8 @@ (define* (install #:key inputs native-inputs outputs #:allow-other-keys) (string-append "INSTALL_PATH=" out) (string-append "INSTALL_MOD_PATH=" out) "INSTALL_MOD_STRIP=1" - "modules_install"))) + "modules_install" + (or make-flags '())))) (define %standard-phases (modify-phases gnu:%standard-phases @@ -84,7 +86,8 @@ (define %standard-phases (replace 'build build) (replace 'install install))) -(define* (linux-module-build #:key inputs (phases %standard-phases) +(define* (linux-module-build #:key inputs + (phases %standard-phases) #:allow-other-keys #:rest args) "Build the given package, applying all of PHASES in order, with a Linux kernel in attendance." -- cgit v1.2.3 From 507278f7cd68b86418a8b5a0e9928580d4756aa4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 02:28:43 +0200 Subject: gnu: python-parameterized: Update to 0.7.4. * gnu/packages/check.scm (python-parameterized): Update to 0.7.4. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9837ea9756..3edb79d55b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -584,14 +584,13 @@ (define-public cpputest (define-public python-parameterized (package (name "python-parameterized") - (version "0.7.3") + (version "0.7.4") (source (origin (method url-fetch) (uri (pypi-uri "parameterized" version)) (sha256 - (base32 - "0g1q6n7fkanjv7i1djzw62f46xf573jvza7afabh3baqjqxy7rpd")))) + (base32 "1444fdz5bj0k10nmhxv0bv2gfrfisi7hfzqdndb0pvhf4g3qq3qr")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From dc67e9e5b2485e7a2f50b3979bdff968028eec42 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:10:07 +0200 Subject: gnu: asunder: Update to 2.9.6. * gnu/packages/cdrom.scm (asunder): Update to 2.9.6. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index bd44ae8e80..67236f86de 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -686,7 +686,7 @@ (define-public geteltorito (define-public asunder (package (name "asunder") - (version "2.9.5") + (version "2.9.6") (source (origin (method url-fetch) (uri @@ -695,7 +695,7 @@ (define-public asunder ".tar.bz2")) (sha256 (base32 - "069x6az2r3wlb2hd07iz0hxpxwknw7s9h7pyhnkmzv1pw9ci3kk4")))) + "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a")))) (build-system glib-or-gtk-build-system) (arguments '(#:out-of-source? #f -- cgit v1.2.3 From 854c39ae42fb67efded29ab8d076aec2a7ba3d1f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:14:19 +0200 Subject: gnu: xbindkeys: Update to 1.8.7. * gnu/packages/xdisorg.scm (xbindkeys): Update to 1.8.7. [native-inputs]: Add pkg-config. [inputs]: Update to guile-2.2. --- gnu/packages/xdisorg.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 3c98836102..5941f63a26 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -899,7 +899,7 @@ (define-public xosd (define-public xbindkeys (package (name "xbindkeys") - (version "1.8.6") + (version "1.8.7") (source (origin (method url-fetch) ;; Download from the savannah mirror list fails @@ -909,11 +909,13 @@ (define-public xbindkeys ".tar.gz")) (sha256 (base32 - "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc")))) + "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("libx11" ,libx11) - ("guile" ,guile-2.0))) + ("guile" ,guile-2.2))) (home-page "https://www.nongnu.org/xbindkeys/") (synopsis "Associate a combination of keys with a shell command") (description -- cgit v1.2.3 From 8e9ccf7af7cc614d04aa71c472f855dd146729eb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:22:21 +0200 Subject: gnu: wpebackend-fdo: Update to 1.6.1. * gnu/packages/webkit.scm (wpebackend-fdo): Update to 1.6.1. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 90be7d2625..3804209841 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -93,14 +93,14 @@ (define-public libwpe (define-public wpebackend-fdo (package (name "wpebackend-fdo") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (string-append "https://wpewebkit.org/releases/" "wpebackend-fdo-" version ".tar.xz")) (sha256 (base32 - "0rzm16m3mw9dh2jis9avk2rhz7bijanrzlywyiaicyzrv2wxfnvz")))) + "1jdi43gciqjgvhnqxs160f3hmp1hkqhrllb0hhmldyxc4wryw3kl")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests -- cgit v1.2.3 From b8186ae606ca774db6ce942a5ffa7db5fcc45b8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:27:40 +0200 Subject: gnu: youtube-viewer: Update to 3.7.6. * gnu/packages/video.scm (youtube-viewer): Update to 3.7.6. --- 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 ccefb0c4f4..162ef953b3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1798,7 +1798,7 @@ (define-public you-get (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.7.5") + (version "3.7.6") (source (origin (method git-fetch) (uri (git-reference @@ -1807,7 +1807,7 @@ (define-public youtube-viewer (file-name (git-file-name name version)) (sha256 (base32 - "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f")))) + "1c7wynx0fzs8awb1s4rdrl8xavqlj64z95yckhl1m1gnhahhq291")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) -- cgit v1.2.3 From d9240c705b59337f7d64a348a5ea5951b7012c63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:39:08 +0200 Subject: gnu: ghostwriter: Update to 1.8.1. * gnu/packages/text-editors.scm (ghostwriter): Update to 1.8.1. --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 8e4e49112d..1740404709 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -498,7 +498,7 @@ (define-public qemacs (define-public ghostwriter (package (name "ghostwriter") - (version "1.8.0") + (version "1.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -507,7 +507,7 @@ (define-public ghostwriter (file-name (git-file-name name version)) (sha256 (base32 - "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran")))) + "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fdc61ca1f75b7ed9f4d9bde1a605d420006801bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:45:18 +0200 Subject: gnu: tmux-xpanes: Update to 4.1.2. * gnu/packages/tmux.scm (tmux-xpanes): Update to 4.1.2. --- gnu/packages/tmux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 8b54849b18..160dcb3001 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Stefan Reichör -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Oleg Pykhalov ;;; Copyright © 2020 Brice Waegeneire ;;; @@ -141,7 +141,7 @@ (define-public tmuxifier (define-public tmux-xpanes (package (name "tmux-xpanes") - (version "4.1.1") + (version "4.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -150,7 +150,7 @@ (define-public tmux-xpanes (file-name (git-file-name name version)) (sha256 (base32 - "13q02vdk229chgbn547wwv29cj4njvz02lmw840g8qmwh73qb2pi")))) + "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0")))) (build-system trivial-build-system) (inputs `(("bash" ,bash))) -- cgit v1.2.3 From 4fbe53a5b84ca2ca53e8ce6c3a0f07085c691dd9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:48:31 +0200 Subject: gnu: openh264: Update to 2.1.1. * gnu/packages/video.scm (openh264): Update to 2.1.1. --- 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 162ef953b3..261628d795 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2933,7 +2933,7 @@ (define-public intel-vaapi-driver (define-public openh264 (package (name "openh264") - (version "2.1.0") + (version "2.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -2942,7 +2942,7 @@ (define-public openh264 (file-name (git-file-name name version)) (sha256 (base32 - "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi")))) + "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s")))) (build-system gnu-build-system) (native-inputs `(("nasm" ,nasm) -- cgit v1.2.3 From 7f85664d0736be2694f7be75997279cfa4eb0525 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:49:14 +0200 Subject: gnu: sakura: Don't use NAME in source URI. * gnu/packages/terminals.scm (sakura)[source]: Hard-code NAME. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 335b8d3ae1..8447708376 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -676,8 +676,8 @@ (define-public sakura (version "3.7.0") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/" name "/trunk/" - version "/+download/" name "-" version + (uri (string-append "https://launchpad.net/sakura/trunk/" + version "/+download/sakura-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From cca40dce8c2aed916ccc38bbe0767228d804bdd6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:49:21 +0200 Subject: gnu: sakura: Update to 3.7.1. * gnu/packages/terminals.scm (sakura): Update to 3.7.1. --- gnu/packages/terminals.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8447708376..3f585cd7f6 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -673,15 +673,15 @@ (define-public cool-retro-term (define-public sakura (package (name "sakura") - (version "3.7.0") + (version "3.7.1") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/sakura/trunk/" version "/+download/sakura-" version - ".tar.gz")) + ".tar.bz2")) (sha256 (base32 - "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m")))) + "12wjmckf03qbnm8cb7qma0980anzajn3l92rj2yr8hhafl74x6kj")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check phase -- cgit v1.2.3 From 355d92a6a392823e3fea2a92b2597d753629dece Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 03:51:44 +0200 Subject: gnu: tilda: Update to 1.5.2. * gnu/packages/terminals.scm (tilda): Update to 1.5.2. --- gnu/packages/terminals.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 3f585cd7f6..b587cbd90e 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -90,7 +90,7 @@ (define-module (gnu packages terminals) (define-public tilda (package (name "tilda") - (version "1.5.0") + (version "1.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -99,7 +99,7 @@ (define-public tilda (file-name (git-file-name name version)) (sha256 (base32 - "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx")))) + "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 027d9a5403029cad6e8949c815cc3144dbbbc3f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:12:44 +0200 Subject: gnu: execline: Update to 2.6.0.2. * gnu/packages/skarnet.scm (execline): Update to 2.6.0.2. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 31768c814e..58a99e8e45 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -62,14 +62,14 @@ (define-public skalibs (define-public execline (package (name "execline") - (version "2.6.0.0") + (version "2.6.0.2") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 - (base32 "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al")))) + (base32 "0wdg93hwpxxdqmsnd8j1nf3m2pf85n3rxaawzaih1y0ajyz6gwya")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit v1.2.3 From f1a4ce2821960f1e1f4d964c64269cdd11c1a86d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:15:09 +0200 Subject: gnu: skalibs: Update to 2.9.2.1. * gnu/packages/skarnet.scm (skalibs): Update to 2.9.2.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 58a99e8e45..b4cab33271 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -30,14 +30,14 @@ (define-module (gnu packages skarnet) (define-public skalibs (package (name "skalibs") - (version "2.9.2.0") + (version "2.9.2.1") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4")))) + (base32 "0ff551181vv9d1z5sv7yg6n4b88ajcdircs4p4nif4yl7nsrj2r5")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist -- cgit v1.2.3 From 482b8cb555069866bdfabdef2a026f1cd651d7a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:17:24 +0200 Subject: gnu: byobu: Update to 5.133. * gnu/packages/screen.scm (byobu): Update to 5.133. --- gnu/packages/screen.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index c03e2e5e5e..af519de0a3 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,7 +104,7 @@ (define-public dtach (define-public byobu (package (name "byobu") - (version "5.127") + (version "5.133") (source (origin (method url-fetch) @@ -112,8 +112,7 @@ (define-public byobu version "/+download/byobu_" version ".orig.tar.gz")) (sha256 - (base32 - "0fznlj454vgxgzfw3avmvvjpawggs66da5l8k6v0lnzzd75wgbsb")) + (base32 "0qvmmdnvwqbgbhn5c8asmrmjhclcl029py2d2zvmd7h5ij7s93jd")) (patches (search-patches "byobu-writable-status.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 1b0e3795ec4b9dba95dbf3d0c095da8f5b6798f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:23:38 +0200 Subject: gnu: ubridge: Update to 0.9.18. * gnu/packages/networking.scm (ubridge): Update to 0.9.18. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fd29370841..c726b7bcea 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2539,7 +2539,7 @@ (define-public net-snmp (define-public ubridge (package (name "ubridge") - (version "0.9.16") + (version "0.9.18") (source (origin (method git-fetch) @@ -2548,7 +2548,7 @@ (define-public ubridge (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h")))) + (base32 "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit v1.2.3 From 2f26e2d6fdb2fb345ab670ecdfde740e5e40ab89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:30:36 +0200 Subject: gnu: samba: Update to 4.12.3. * gnu/packages/samba.scm (samba): Update to 4.12.3. --- gnu/packages/samba.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b58788719e..a502020121 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -169,15 +169,15 @@ (define (install dir) (define-public samba (package (name "samba") - (version "4.12.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.samba.org/pub/samba/stable/" - "samba-" version ".tar.gz")) - (sha256 - (base32 - "0l514s2xhsy1lspzgvibbzs80zi84zxr2wx4d40hq85yb2lg5434")) - (modules '((guix build utils))) + (version "4.12.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.samba.org/pub/samba/stable/" + "samba-" version ".tar.gz")) + (sha256 + (base32 "09w7aap1cjc41ayhaksm1igc7p7gl40fad4a1l6q4ds9a2jbrb9z")) + (modules '((guix build utils))) (snippet '(begin ;; TODO: also remove the bundled ‘third_party/popt’. -- cgit v1.2.3 From 26fd58f2bbd4a0c64b5563c0c125e4143a6c4c8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:33:19 +0200 Subject: gnu: enet: Update to 1.3.15. * gnu/packages/networking.scm (enet): Update to 1.3.15. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c726b7bcea..593605bb46 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1605,14 +1605,14 @@ (define-public proxychains-ng (define-public enet (package (name "enet") - (version "1.3.14") + (version "1.3.15") (source (origin (method url-fetch) (uri (string-append "http://enet.bespin.org/download/" "enet-" version ".tar.gz")) (sha256 (base32 - "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq")))) + "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a9f862687e297618318028d939b2c33852e5489f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:33:27 +0200 Subject: gnu: haproxy: Update to 2.1.5. * gnu/packages/networking.scm (haproxy): Update to 2.1.5. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 593605bb46..ca7b36bb6a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3103,7 +3103,7 @@ (define-public vde2 (define-public haproxy (package (name "haproxy") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) (uri (string-append "https://www.haproxy.org/download/" @@ -3111,7 +3111,7 @@ (define-public haproxy "/src/haproxy-" version ".tar.gz")) (sha256 (base32 - "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si")))) + "188ff33610jj11knjwjqwxci4p0i63n9k0l8bdb47ckahg2ll5s2")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 86a03090afa711dfa2f141caee820b66d7942bc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 18:15:08 +0200 Subject: gnu: libuemf: Work around Guile texinfo limitations. * gnu/packages/image.scm (libuemf)[description]: Substitute @acronym{} for @abbr{}. --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 05b64dd716..94e6abe19f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -903,8 +903,8 @@ (define-public libuemf (home-page "http://libuemf.sourceforge.net/") (synopsis "Library for working with WFM, EMF and EMF+ images") (description "The libUEMF library is a portable C99 implementation for -reading and writing @abbr{WFM, Windows Metafile}, @abbr{EMF, Enhanced -Metafile}, and @abbr{EMF+, Enhanced Metafile Plus} files.") +reading and writing @acronym{WFM, Windows Metafile}, @acronym{EMF, Enhanced +Metafile}, and @acronym{EMF+, Enhanced Metafile Plus} files.") (license license:gpl2+))) (define-public libungif -- cgit v1.2.3 From 15534de8b763d4342281b10528b6807006c7930d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 17:23:34 +0200 Subject: git-authenticate: Rename '%committers' to '%historical-committers'. * build-aux/git-authenticate.scm (%committers): Rename to... (%historical-committers): ... this. (%authorized-signing-keys): Rename to... (%historical-authorized-signing-keys): ... this. (authenticate-commit): Adjust accordingly. --- build-aux/git-authenticate.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index ab50459369..8e679fd5e5 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -42,12 +42,13 @@ (ice-9 pretty-print)) -(define %committers - ;; List of committers. These are the user names found on +(define %historical-committers + ;; List of "historical" committers---people once authorized committers + ;; before the '.guix-authorizations' file was created. + ;; + ;; These are the user names found on ;; along with ;; the fingerprint of the signing (sub)key. - ;; - ;; TODO: Replace this statically-defined list by an in-repo list. '(("andreas" "AD17 A21E F8AE D8F1 CC02 DBD9 F7D5 C9BF 765C 61E3") ("ajgrf" @@ -214,13 +215,13 @@ (define %committers ("wingo" "FF47 8FB2 64DE 32EC 2967 25A3 DDC0 F535 8812 F8F2"))) -(define %authorized-signing-keys - ;; Fingerprint of authorized signing keys. +(define %historical-authorized-signing-keys + ;; Fingerprint of historically authorized signing keys. (map (match-lambda ((name fingerprint) (base16-string->bytevector (string-downcase (string-filter char-set:graphic fingerprint))))) - %committers)) + %historical-committers)) (define %commits-with-bad-signature ;; Commits with a known-bad signature. @@ -312,7 +313,7 @@ (define signing-key (unless (member (openpgp-public-key-fingerprint signing-key) (commit-authorized-keys repository commit - %authorized-signing-keys)) + %historical-authorized-signing-keys)) (raise (condition (&message (message (format #f (G_ "commit ~a not signed by an authorized \ -- cgit v1.2.3 From c75a80189fc19f6ff8b4c82d1d1801be6763b6d2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Jun 2020 14:50:54 +0200 Subject: doc: Update README to refer to the manual. * README (Requirements): Refer to the manual. (Installation): Update URL of the manual. --- README | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/README b/README index 7121358157..5e9069f80f 100644 --- a/README +++ b/README @@ -18,27 +18,12 @@ Guix is based on the [[https://nixos.org/nix/][Nix]] package manager. * Requirements -GNU Guix currently depends on the following packages: +If you are building Guix from source, please see the manual for build +instructions and requirements, either by running: - - [[https://gnu.org/software/guile/][GNU Guile 2.2.x]] - - [[https://notabug.org/cwebber/guile-gcrypt][Guile-Gcrypt]] 0.1.0 or later - - [[https://www.gnu.org/software/make/][GNU Make]] - - [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled - - [[https://notabug.org/guile-sqlite3/guile-sqlite3][Guile-SQLite3]], version 0.1.0 or later - - [[https://gitlab.com/guile-git/guile-git][Guile-Git]] - - [[http://www.zlib.net/][zlib]] - - [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]] + info -f doc/guix.info "Requirements" -Unless `--disable-daemon' was passed, the following packages are needed: - - - [[https://gnupg.org/][GNU libgcrypt]] - - [[https://sqlite.org/][SQLite 3]] - - [[https://gcc.gnu.org][GCC's g++]] - - optionally [[http://www.bzip.org][libbz2]] - -When `--disable-daemon' was passed, you instead need the following: - - - [[https://nixos.org/nix/][Nix]] +or by checking the [[https://guix.gnu.org/manual/en/html_node/Requirements.html][web copy of the manual]]. * Installation @@ -46,7 +31,7 @@ See the manual for the installation instructions, either by running info -f doc/guix.info "Installation" -or by checking the [[https://www.gnu.org/software/guix/manual/guix.html#Installation][web copy of the manual]]. +or by checking the [[https://guix.gnu.org/manual/en/html_node/Installation.html][web copy of the manual]]. For information on installation from a Git checkout, please see the section "Building from Git" in the manual. -- cgit v1.2.3 From 793a48edc0533cacb193afe18c557e6408f3de22 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Jun 2020 18:26:34 +0200 Subject: gnu: guile-json: Add version 4.0.1. * gnu/packages/guile.scm (guile-json-4): New variable. (guile2.2-json): Use it. --- gnu/packages/guile.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index ef1e19c6b8..c2dc7f6d5f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -554,12 +554,25 @@ (define-public guile-json-3 ("guile" ,guile-3.0))) (inputs `(("guile" ,guile-3.0))))) -(define-public guile2.2-json - (package-for-guile-2.2 guile-json-3)) - (define-public guile3.0-json (deprecated-package "guile3.0-json" guile-json-3)) +(define-public guile-json-4 + (package + (inherit guile-json-3) + (name "guile-json") + (version "4.0.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/guile-json/guile-json-" + version ".tar.gz")) + (sha256 + (base32 + "0f25qak4i57c3x0q9hlrll911l57bb8nz57rjkd02mn2fc2h3730")))))) + +(define-public guile2.2-json + (package-for-guile-2.2 guile-json-4)) + ;; There are two guile-gdbm packages, one using the FFI and one with ;; direct C bindings, hence the verbose name. -- cgit v1.2.3 From 8f7cf3b50cda98afab1bef89bef2d6c01aa2b626 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Jun 2020 18:27:49 +0200 Subject: gnu: guix, guix-jupyter, cuirass, hpcguix-web: Use Guile-JSON 4.0. * gnu/packages/package-management.scm (guix)[native-inputs] [propagated-inputs]: Use GUILE-JSON-4 instead of GUILE-JSON-3. * gnu/packages/ci.scm (cuirass)[inputs]: Likewise. * gnu/packages/package-management.scm (guix-jupyter)[propagated-inputs]: Likewise. * gnu/packages/web.scm (hpcguix-web)[propagated-inputs]: Likewise. --- gnu/packages/ci.scm | 2 +- gnu/packages/package-management.scm | 6 +++--- gnu/packages/web.scm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index ec05523e0d..b74e73ceea 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -123,7 +123,7 @@ (define-public cuirass `(("guile" ,guile-3.0) ("guile-fibers" ,guile-fibers) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) ;; FIXME: this is propagated by "guile-git", but it needs to be among diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3fc6fc404a..8ab0c9b746 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -322,7 +322,7 @@ (define code ("guile" ,guile-3.0) ("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) @@ -373,7 +373,7 @@ (define code (propagated-inputs `(("gnutls" ,(if (%current-target-system) gnutls-3.6.13 guile3.0-gnutls)) ("guile-gcrypt" ,guile-gcrypt) - ("guile-json" ,guile-json-3) + ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git))) @@ -982,7 +982,7 @@ (define-public guix-jupyter `(("guix" ,guix) ("guile" ,guile-3.0))) (propagated-inputs - `(("guile-json" ,guile-json-3) + `(("guile-json" ,guile-json-4) ("guile-simple-zmq" ,guile-simple-zmq) ("guile-gcrypt" ,guile-gcrypt))) (synopsis "Guix kernel for Jupyter") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6e5bc81660..bd46ac9c2c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7346,7 +7346,7 @@ (define-public hpcguix-web (propagated-inputs `(("guile" ,guile-3.0) ("guile-commonmark" ,guile-commonmark) - ("guile-json" ,guile-json-3))) + ("guile-json" ,guile-json-4))) (home-page "https://github.com/UMCUGenetics/hpcguix-web") (synopsis "Web interface for cluster deployments of Guix") (description "Hpcguix-web provides a web interface to the list of packages -- cgit v1.2.3 From 7bc396bf353c5550c49b3f8791b34072ba417d90 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 2 Jun 2020 14:05:46 -0400 Subject: gnu: nss: Fix CVE-2020-12399 via graft. * gnu/packages/patches/nss-CVE-2020-12399.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/nss.scm (nss/fixed): New variable. (nss)[replacement]: Add field. --- gnu/local.mk | 1 + gnu/packages/nss.scm | 9 ++ gnu/packages/patches/nss-CVE-2020-12399.patch | 138 ++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 gnu/packages/patches/nss-CVE-2020-12399.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6d775828e0..4a8a855502 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1297,6 +1297,7 @@ dist_patch_DATA = \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/nsis-env-passthru.patch \ + %D%/packages/patches/nss-CVE-2020-12399.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \ diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index e423bdd3a2..887860157d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -73,6 +73,7 @@ (define-public nss (package (name "nss") (version "3.50") + (replacement nss/fixed) (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -191,3 +192,11 @@ (define-public nss PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) + +(define nss/fixed + (package + (inherit nss) + (source (origin + (inherit (package-source nss)) + (patches (append (search-patches "nss-CVE-2020-12399.patch") + (origin-patches (package-source nss)))))))) diff --git a/gnu/packages/patches/nss-CVE-2020-12399.patch b/gnu/packages/patches/nss-CVE-2020-12399.patch new file mode 100644 index 0000000000..0d91b655e2 --- /dev/null +++ b/gnu/packages/patches/nss-CVE-2020-12399.patch @@ -0,0 +1,138 @@ +Fix CVE-2020-12399 (Timing attack on DSA signature generation: NSS has +shown timing differences when performing DSA signatures, which was +exploitable and could eventually leak private keys.) + +Copied from upstream: + +but with "nss/" inserted into the file name to patch. + +# HG changeset patch +# User Robert Relyea +# Date 1589907685 0 +# Node ID daa823a4a29bcef0fec33a379ec83857429aea2e +# Parent d2cfb4ccdf167e5ea06d2bb5bc39c50f789929c8 +Bug 1631576 - Force a fixed length for DSA exponentiation r=pereida,bbrumley + +Differential Revision: https://phabricator.services.mozilla.com/D72011 + +diff --git a/nss/lib/freebl/dsa.c b/nss/lib/freebl/dsa.c +--- a/nss/lib/freebl/dsa.c ++++ b/nss/lib/freebl/dsa.c +@@ -308,23 +308,24 @@ DSA_NewKeyFromSeed(const PQGParams *para + SECItem seedItem; + seedItem.data = (unsigned char *)seed; + seedItem.len = PQG_GetLength(¶ms->subPrime); + return dsa_NewKeyExtended(params, &seedItem, privKey); + } + + static SECStatus + dsa_SignDigest(DSAPrivateKey *key, SECItem *signature, const SECItem *digest, +- const unsigned char *kb) ++ const unsigned char *kbytes) + { + mp_int p, q, g; /* PQG parameters */ + mp_int x, k; /* private key & pseudo-random integer */ + mp_int r, s; /* tuple (r, s) is signature) */ + mp_int t; /* holding tmp values */ + mp_int ar; /* holding blinding values */ ++ mp_digit fuzz; /* blinding multiplier for q */ + mp_err err = MP_OKAY; + SECStatus rv = SECSuccess; + unsigned int dsa_subprime_len, dsa_signature_len, offset; + SECItem localDigest; + unsigned char localDigestData[DSA_MAX_SUBPRIME_LEN]; + SECItem t2 = { siBuffer, NULL, 0 }; + + /* FIPS-compliance dictates that digest is a SHA hash. */ +@@ -368,31 +369,46 @@ dsa_SignDigest(DSAPrivateKey *key, SECIt + CHECK_MPI_OK(mp_init(&q)); + CHECK_MPI_OK(mp_init(&g)); + CHECK_MPI_OK(mp_init(&x)); + CHECK_MPI_OK(mp_init(&k)); + CHECK_MPI_OK(mp_init(&r)); + CHECK_MPI_OK(mp_init(&s)); + CHECK_MPI_OK(mp_init(&t)); + CHECK_MPI_OK(mp_init(&ar)); ++ + /* + ** Convert stored PQG and private key into MPI integers. + */ + SECITEM_TO_MPINT(key->params.prime, &p); + SECITEM_TO_MPINT(key->params.subPrime, &q); + SECITEM_TO_MPINT(key->params.base, &g); + SECITEM_TO_MPINT(key->privateValue, &x); +- OCTETS_TO_MPINT(kb, &k, dsa_subprime_len); ++ OCTETS_TO_MPINT(kbytes, &k, dsa_subprime_len); ++ ++ /* k blinding create a single value that has the high bit set in ++ * the mp_digit*/ ++ if (RNG_GenerateGlobalRandomBytes(&fuzz, sizeof(mp_digit)) != SECSuccess) { ++ PORT_SetError(SEC_ERROR_NEED_RANDOM); ++ rv = SECFailure; ++ goto cleanup; ++ } ++ fuzz |= 1ULL << ((sizeof(mp_digit) * PR_BITS_PER_BYTE - 1)); + /* + ** FIPS 186-1, Section 5, Step 1 + ** + ** r = (g**k mod p) mod q + */ +- CHECK_MPI_OK(mp_exptmod(&g, &k, &p, &r)); /* r = g**k mod p */ +- CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ ++ CHECK_MPI_OK(mp_mul_d(&q, fuzz, &t)); /* t = q*fuzz */ ++ CHECK_MPI_OK(mp_add(&k, &t, &t)); /* t = k+q*fuzz */ ++ /* length of t is now fixed, bits in k have been blinded */ ++ CHECK_MPI_OK(mp_exptmod(&g, &t, &p, &r)); /* r = g**t mod p */ ++ /* r is now g**(k+q*fuzz) == g**k mod p */ ++ CHECK_MPI_OK(mp_mod(&r, &q, &r)); /* r = r mod q */ ++ + /* + ** FIPS 186-1, Section 5, Step 2 + ** + ** s = (k**-1 * (HASH(M) + x*r)) mod q + */ + if (DSA_NewRandom(NULL, &key->params.subPrime, &t2) != SECSuccess) { + PORT_SetError(SEC_ERROR_NEED_RANDOM); + rv = SECFailure; +@@ -406,25 +422,34 @@ dsa_SignDigest(DSAPrivateKey *key, SECIt + goto cleanup; + } + SECITEM_TO_MPINT(t2, &ar); /* ar <-$ Zq */ + SECITEM_FreeItem(&t2, PR_FALSE); + + /* Using mp_invmod on k directly would leak bits from k. */ + CHECK_MPI_OK(mp_mul(&k, &ar, &k)); /* k = k * ar */ + CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ +- CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ ++ /* k is now k*t*ar */ ++ CHECK_MPI_OK(mp_invmod(&k, &q, &k)); /* k = k**-1 mod q */ ++ /* k is now (k*t*ar)**-1 */ + CHECK_MPI_OK(mp_mulmod(&k, &t, &q, &k)); /* k = k * t mod q */ +- SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ ++ /* k is now (k*ar)**-1 */ ++ SECITEM_TO_MPINT(localDigest, &s); /* s = HASH(M) */ + /* To avoid leaking secret bits here the addition is blinded. */ +- CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ +- CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ ++ CHECK_MPI_OK(mp_mul(&x, &ar, &x)); /* x = x * ar */ ++ /* x is now x*ar */ ++ CHECK_MPI_OK(mp_mulmod(&x, &r, &q, &x)); /* x = x * r mod q */ ++ /* x is now x*r*ar */ + CHECK_MPI_OK(mp_mulmod(&s, &ar, &q, &t)); /* t = s * ar mod q */ +- CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ +- CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ ++ /* t is now hash(M)*ar */ ++ CHECK_MPI_OK(mp_add(&t, &x, &s)); /* s = t + x */ ++ /* s is now (HASH(M)+x*r)*ar */ ++ CHECK_MPI_OK(mp_mulmod(&s, &k, &q, &s)); /* s = s * k mod q */ ++ /* s is now (HASH(M)+x*r)*ar*(k*ar)**-1 = (k**-1)*(HASH(M)+x*r) */ ++ + /* + ** verify r != 0 and s != 0 + ** mentioned as optional in FIPS 186-1. + */ + if (mp_cmp_z(&r) == 0 || mp_cmp_z(&s) == 0) { + PORT_SetError(SEC_ERROR_NEED_RANDOM); + rv = SECFailure; + goto cleanup; + -- cgit v1.2.3 From 833252a88bd9a11b7bd431877130dd80f1d548f2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 2 Jun 2020 00:24:56 -0400 Subject: gnu: icecat: Update to 68.9.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2020-12399 and CVE-2020-12405. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. * gnu/packages/patches/icecat-makeicecat.patch: Adapt to new version. --- gnu/packages/gnuzilla.scm | 12 ++++++------ gnu/packages/patches/icecat-makeicecat.patch | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7bf9850e97..e00a09e989 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -556,8 +556,8 @@ (define* (computed-origin-method gexp-promise hash-algo hash #:system system #:guile-for-build guile))) -(define %icecat-version "68.8.0-guix0-preview1") -(define %icecat-build-id "20200505000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.9.0-guix0-preview1") +(define %icecat-build-id "20200602000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -579,11 +579,11 @@ (define icecat-source "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0hp8cc7xk6qj4q1s8n97qv9sdrypkzvphik96m5qv1r5s9k24nzs")))) + "01s41p985g6v544lf08zch3myssn5c76jwmkzzd68zd9m3hhalck")))) - (upstream-icecat-base-version "68.8.0") ; maybe older than base-version + (upstream-icecat-base-version "68.9.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "5358ff2963a6136f8acafdc598cad540231ad23e") + (gnuzilla-commit "d7acf32ad905a3382cb2353577a96d29aa58f589") (gnuzilla-source (origin (method git-fetch) @@ -595,7 +595,7 @@ (define icecat-source (string-take gnuzilla-commit 8))) (sha256 (base32 - "1bq0qzgkxz9q61g48bc05i0zx1z8k0pklxnmn54ch136aqgsyli4")))) + "0m49zm05m3n95diij2zyvpm74q66zxjhv9rp8zvaab0h7v2s09n9")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch"))) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index 2978a5789e..d3d95cbf28 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz -- cgit v1.2.3 From 3ee51d616c3615ab34e2eb156ba2bc6250c3d7e8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Jun 2020 21:12:35 +0300 Subject: gnu: libreoffice: Update to 4.4.2.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 4.4.2.2. [arguments]: Remove unrecognized configure-flag. --- gnu/packages/libreoffice.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a3a6ea5d1a..01d33dc03c 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2016, 2018, 2019 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -998,7 +998,7 @@ (define-public libqxp (define-public libreoffice (package (name "libreoffice") - (version "6.4.2.2") + (version "6.4.4.2") (source (origin (method url-fetch) @@ -1009,7 +1009,7 @@ (define-public libreoffice (patches (search-patches "libreoffice-poppler-compat.patch")) (sha256 (base32 - "06acm41q9nda8r30b13cn9zafsw1gszjdphh6lx90s09d2sf7f23")))) + "0y6026h374787yy2f3as1q7clxmgywsfdrj62kw3577wvybqaf2l")))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) @@ -1205,7 +1205,6 @@ (define (install-appdata app) ;; patching the build scripts to work with GCC5. Try enabling this ;; when our default compiler is >=GCC 6. "--disable-pdfium" - "--disable-gtk" ; disable use of GTK+ 2 "--without-doxygen" "--enable-build-opensymbol"))) (home-page "https://www.libreoffice.org/") -- cgit v1.2.3 From 5359b601cd19eab96205e8eabca902ec8a47db18 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jun 2020 14:44:11 +0200 Subject: gnu: toutenclic: Add missing input. * gnu/packages/education.scm (toutenclic)[native-inputs]: Add UNZIP. --- gnu/packages/education.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 550925d638..ab02d1b7af 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -386,7 +386,10 @@ (define-public toutenclic Type=Application~%" out))) #t)))))) - (inputs `(("python-pyqt" ,python-pyqt))) + (native-inputs + `(("unzip" ,unzip))) + (inputs + `(("python-pyqt" ,python-pyqt))) (synopsis "School tools for physically disabled children") (description "ToutEnClic is intended to facilitate the schooling of physically disabled children in ordinary schools. It is both -- cgit v1.2.3 From 37465b5be0324d9c953408fe88e2509ad0891712 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jun 2020 20:35:00 +0200 Subject: gnu: texlive-csquotes: Update source checksum. This package had not been adjusted for the TeX Live 2019 upgrade. Fixes . * gnu/packages/tex.scm (texlive-csquotes)[simple-texlive-package]: Update expected checksum. --- gnu/packages/tex.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 137e000bc5..6f6ea73ffc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7306,7 +7306,7 @@ (define-public texlive-csquotes (list "/doc/latex/csquotes/" "/tex/latex/csquotes/") (base32 - "15hgn37zg433skn7ijqs1kl2z56fhy29cjxn01b5pjrnrkdar4i4") + "088gvi60d7sdl6fgg68fbz30fnpqc3yrpkx80sfw7vwgar3wm3av") #:trivial? #t))) (package (inherit template) -- cgit v1.2.3 From 33430a455e3c6b01a6edb4afb5febdf7b9c689af Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 18:57:15 +0200 Subject: gnu: os-prober: Fix cross-compilation. * gnu/packages/bootloaders.scm (os-prober)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/bootloaders.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 5273412adf..ea80cf020e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017, 2018 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 nee ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Björn Höfling @@ -1017,7 +1017,8 @@ (define-public os-prober (guix build utils) (ice-9 regex) ; for string-match (srfi srfi-26)) ; for cut - #:make-flags (list "CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:tests? #f ; no tests #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 9b9bc1b061c5e1628d013bff917eaf040a035421 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:11:05 +0200 Subject: gnu: pigz: Fix cross-compilation. * gnu/packages/compression.scm (pigz)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/compression.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 568de1cfb2..a6b0273f76 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -875,7 +875,8 @@ (define-public pigz (symlink "pigz" (string-append bin "/unpigz")) (install-file "pigz.1" man) #t)))) - #:make-flags (list "CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:test-target "tests")) (inputs `(("zlib" ,zlib))) (home-page "https://zlib.net/pigz/") -- cgit v1.2.3 From cb3ca320529c7f5a307808ecaa6510e80d0ef85b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:11:15 +0200 Subject: gnu: lunzip: Fix cross-compilation. * gnu/packages/compression.scm (lunzip)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index a6b0273f76..cd5f92e6b7 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1686,7 +1686,7 @@ (define-public lunzip (build-system gnu-build-system) (arguments `(#:configure-flags - (list "CC=gcc"))) + (list ,(string-append "CC=" (cc-for-target))))) (home-page "https://www.nongnu.org/lzip/lunzip.html") (synopsis "Small, stand-alone lzip decompressor") (description -- cgit v1.2.3 From cb056c4019e4ccebb404b19ff4985415d57a9c63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:11:44 +0200 Subject: gnu: clzip: Fix cross-compilation. * gnu/packages/compression.scm (clzip)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index cd5f92e6b7..e7d74d808f 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1713,7 +1713,7 @@ (define-public clzip (build-system gnu-build-system) (arguments `(#:configure-flags - (list "CC=gcc"))) + (list ,(string-append "CC=" (cc-for-target))))) (home-page "https://www.nongnu.org/lzip/clzip.html") (synopsis "Small, stand-alone lzip compressor and decompressor") (description -- cgit v1.2.3 From e712b998aafef76b3f9fe00f8156fe4b725d6335 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:15:03 +0200 Subject: gnu: lolcat: Fix cross-compilation. * gnu/packages/games.scm (lolcat)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/games.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bf68c34f5a..fc3569e9ea 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -626,8 +626,9 @@ (define-public lolcat (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;; no check target - #:make-flags (list "CC=gcc") + `(#:tests? #f ; no check target + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'bootstrap) -- cgit v1.2.3 From 2b9ce1007df59820d33c806d5feec04a38d59165 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:17:16 +0200 Subject: gnu: nvme-cli: Fix cross-compilation. * gnu/packages/linux.scm (nvme-cli)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0a154fd6cc..4acd50879e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3859,15 +3859,17 @@ (define-public nvme-cli (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc") + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases - (delete 'configure) ; No ./configure script + (delete 'configure) ; no ./configure script (replace 'install (lambda _ (invoke "make" "install-spec" "PREFIX=" (string-append "DESTDIR=" %output))))) - #:tests? #f)) ; The tests require sysfs, which is not accessible from - ; the build environment + ;; The tests require sysfs, which is not accessible from from the build + ;; environment + #:tests? #f)) (synopsis "NVM-Express user space tooling for Linux") (description "Nvme-cli is a utility to provide standards compliant tooling for NVM-Express drives. It was made specifically for Linux as it relies on the -- cgit v1.2.3 From 3a169fe30183011877b86d376a708e85b7a42671 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:24:36 +0200 Subject: gnu: clipnotify: Fix cross-compilation. * gnu/packages/xdisorg.scm (clipnotify)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/xdisorg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5941f63a26..86fbefbfb8 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2271,9 +2271,9 @@ (define-public clipnotify (install-file "clipnotify" bin) (install-file "README.md" doc) #t)))) - #:make-flags (list "CC=gcc") - ;; the package provides no test suite: - #:tests? #f)) + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) + #:tests? #f)) ; no test suite (inputs `(("libx11" ,libx11) ("libXfixes" ,libxfixes))) -- cgit v1.2.3 From 39f8ef2d16e413891bcd81a24011a01ecc9e07d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:25:28 +0200 Subject: gnu: linenoise: Fix cross-compilation. * gnu/packages/shells.scm (linenoise)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/shells.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 74d08e02bc..562748da4a 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -600,8 +600,9 @@ (define-public linenoise "1z16qwix8z6a40fskdgxsibkqgdrp4q6ncp4n6hnv4r9iihy2d8r")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;No tests are included - #:make-flags (list "CC=gcc") + `(#:tests? #f ; no tests are included + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From ebde5cfdf296e47673ab4b14136d0430fa544ec7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:27:11 +0200 Subject: gnu: iniparser: Fix cross-compilation. * gnu/packages/samba.scm (iniparser)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/samba.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index a502020121..b121b540f7 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -124,7 +124,7 @@ (define-public iniparser (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc") + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.2.3 From ae05ac8fd2e7b464fb61a3c46e9e2baf88d2abdb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 19:52:29 +0200 Subject: gnu: iniparser: Edit synopsis & description. * gnu/packages/samba.scm (iniparser)[synopsis, description]: Flesh out. --- gnu/packages/samba.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b121b540f7..0fa19e355c 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -159,11 +159,15 @@ (define (install dir) '("AUTHORS" "INSTALL" "LICENSE" "README.md")) #t)))))) (home-page "https://github.com/ndevilla/iniparser") - (synopsis "Standalone ini file parsing library") + (synopsis "Simple @file{.ini} configuration file parsing library") (description - "iniparser is a free stand-alone @code{ini} file parsing library (Windows -configuration files). It is written in portable ANSI C and should compile -anywhere.") + "The iniParser C library reads and writes Windows-style @file{.ini} +configuration files. These are simple text files with a basic structure +composed of sections, properties, and values. While not expressive, they +are easy to read, write, and modify. + +The library is small, thread safe, and written in portable ANSI C with no +external dependencies.") (license x11))) (define-public samba -- cgit v1.2.3 From 907b9dc8cb87a2ef831627185b4cb08576b87622 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 20:29:12 +0200 Subject: gnu: memtester: Fix cross-compilation. * gnu/packages/hardware.scm (memtester)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/hardware.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 7ebe8f48eb..6a2e2c695b 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -43,7 +43,8 @@ (define-module (gnu packages hardware) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) ;; This is a module for packages related to physical hardware that don't (yet) ;; have a more specific home like gps.scm, security-token.scm, &c. @@ -203,7 +204,7 @@ (define-public memtester (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc") + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (replace 'configure -- cgit v1.2.3 From 24f4fc84313c07b91cee747ef43af56411b6bc9e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 04:24:21 +0200 Subject: gnu: ubridge: Fix cross-compilation. * gnu/packages/networking.scm (ubridge)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/networking.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ca7b36bb6a..8f650b1ce8 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2552,7 +2552,8 @@ (define-public ubridge (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests - #:make-flags '("CC=gcc") + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script -- cgit v1.2.3 From d9fda98049b7758c5af49aca83f9e29ae2cd64d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 20:56:24 +0200 Subject: gnu: sct: Update to 0.5. * gnu/packages/xdisorg.scm (sct): Update to 0.5. --- gnu/packages/xdisorg.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 86fbefbfb8..60873637cf 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1911,7 +1911,7 @@ (define-public xrandr-invert-colors (define-public sct (package (name "sct") - (version "0.4") + (version "0.5") (source (origin (method url-fetch) @@ -1919,8 +1919,7 @@ (define-public sct (string-append "https://www.umaxx.net/dl/sct-" version ".tar.gz")) (sha256 - (base32 - "0r57z9ki8pvxhawfxys0v5h85z2x211sqxki0xvk1bga88ryldlv")))) + (base32 "0lrhx771iccbw04wrhj0ygids1pzmjfc4hvklm30m3p3flvhqf0m")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc") -- cgit v1.2.3 From 395659d86d98afaba4d311ca5618f49a4548f6ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 20:56:43 +0200 Subject: gnu: sct: Prepare for cross-compilation. * gnu/packages/xdisorg.scm (sct)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/xdisorg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 60873637cf..ee6b1a9ffd 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1922,8 +1922,9 @@ (define-public sct (base32 "0lrhx771iccbw04wrhj0ygids1pzmjfc4hvklm30m3p3flvhqf0m")))) (build-system gnu-build-system) (arguments - '(#:make-flags (list "CC=gcc") - #:tests? #f ; No tests exist. + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target))) + #:tests? #f ; no test suite #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 9a46e0dd843a2f4c832f74e9a503e7200c934eb7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jun 2020 23:40:19 +0200 Subject: gnu: dbus: Fix CVE-2020-12049. * gnu/packages/patches/dbus-CVE-2020-12049.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/glib.scm (dbus/fixed): New variable. (dbus)[replacement]: New field. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 10 +++++ gnu/packages/patches/dbus-CVE-2020-12049.patch | 58 ++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 gnu/packages/patches/dbus-CVE-2020-12049.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4a8a855502..babcb8f6ad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -855,6 +855,7 @@ dist_patch_DATA = \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ + %D%/packages/patches/dbus-CVE-2020-12049.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ %D%/packages/patches/dconf-meson-0.52.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 12ba6e939b..94dc6adf6f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -88,6 +88,7 @@ (define dbus (package (name "dbus") (version "1.12.16") + (replacement dbus/fixed) (source (origin (method url-fetch) (uri (string-append @@ -164,6 +165,15 @@ (define dbus shared NFS home directories.") (license license:gpl2+))) ; or Academic Free License 2.1 +;; Replacement package to fix CVE-2020-12049. +(define dbus/fixed + (package + (inherit dbus) + (source (origin + (inherit (package-source dbus)) + (patches (append (search-patches "dbus-CVE-2020-12049.patch") + (origin-patches (package-source dbus)))))))) + (define glib (package (name "glib") diff --git a/gnu/packages/patches/dbus-CVE-2020-12049.patch b/gnu/packages/patches/dbus-CVE-2020-12049.patch new file mode 100644 index 0000000000..71280144a1 --- /dev/null +++ b/gnu/packages/patches/dbus-CVE-2020-12049.patch @@ -0,0 +1,58 @@ +Fix CVE-2020-12049: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-12049 +https://lists.freedesktop.org/archives/ftp-release/2020-June/000753.html + +Taken from upstream: + +https://gitlab.freedesktop.org/dbus/dbus/-/commit/272d484283883fa9ff95b69d924fff6cd34842f5 + +diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c +--- a/dbus/dbus-sysdeps-unix.c ++++ b/dbus/dbus-sysdeps-unix.c +@@ -435,18 +435,6 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd, + struct cmsghdr *cm; + dbus_bool_t found = FALSE; + +- if (m.msg_flags & MSG_CTRUNC) +- { +- /* Hmm, apparently the control data was truncated. The bad +- thing is that we might have completely lost a couple of fds +- without chance to recover them. Hence let's treat this as a +- serious error. */ +- +- errno = ENOSPC; +- _dbus_string_set_length (buffer, start); +- return -1; +- } +- + for (cm = CMSG_FIRSTHDR(&m); cm; cm = CMSG_NXTHDR(&m, cm)) + if (cm->cmsg_level == SOL_SOCKET && cm->cmsg_type == SCM_RIGHTS) + { +@@ -501,6 +489,26 @@ _dbus_read_socket_with_unix_fds (DBusSocket fd, + if (!found) + *n_fds = 0; + ++ if (m.msg_flags & MSG_CTRUNC) ++ { ++ unsigned int i; ++ ++ /* Hmm, apparently the control data was truncated. The bad ++ thing is that we might have completely lost a couple of fds ++ without chance to recover them. Hence let's treat this as a ++ serious error. */ ++ ++ /* We still need to close whatever fds we *did* receive, ++ * otherwise they'll never get closed. (CVE-2020-12049) */ ++ for (i = 0; i < *n_fds; i++) ++ close (fds[i]); ++ ++ *n_fds = 0; ++ errno = ENOSPC; ++ _dbus_string_set_length (buffer, start); ++ return -1; ++ } ++ + /* put length back (doesn't actually realloc) */ + _dbus_string_set_length (buffer, start + bytes_read); + -- cgit v1.2.3 From c45431a2838644bae90613690b023019b8bce456 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 2 Jun 2020 23:41:08 +0200 Subject: gnu: libabigail: Update to 1.7. * gnu/packages/elf.scm (libabigail): Update to 1.7. --- gnu/packages/elf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 098c0fc94a..3aabc6e927 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -112,14 +112,14 @@ (define-public libabigail (package (name "libabigail") (home-page "https://sourceware.org/libabigail/") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) (uri (string-append "https://sourceware.org/pub/libabigail/" "libabigail-" version ".tar.gz")) (sha256 (base32 - "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g")))) + "0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" -- cgit v1.2.3 From 1f0e1c49aa83d5d180f4f5ee945085eeb2d62191 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:26:13 +0200 Subject: gnu: i2c-tools: Actually cross-compile. * gnu/packages/linux.scm (i2c-tools)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4acd50879e..1466165aa3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3595,10 +3595,10 @@ (define-public i2c-tools "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no 'check' target + `(#:tests? #f ; no 'check' target #:make-flags (list (string-append "prefix=" %output) - "CC=gcc") - ;; no configure script + ,(string-append "CC=" (cc-for-target))) + ;; No configure script. #:phases (modify-phases %standard-phases (delete 'configure)))) (inputs `(("perl" ,perl))) -- cgit v1.2.3 From 15c8b1723a4819e3bac024690cde3fac275be2dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:28:17 +0200 Subject: gnu: earlyoom: Actually cross-compile. * gnu/packages/linux.scm (earlyoom)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1466165aa3..1a1821b5a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3007,7 +3007,7 @@ (define-public earlyoom (install-file "contrib/notify_all_users.py" contrib) #t)))) #:make-flags (let* ((prefix (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "VERSION=v" ,version) (string-append "PREFIX=" prefix) (string-append "SYSCONFDIR=" prefix "/etc"))) -- cgit v1.2.3 From e45f0c79fbad86a9a181b8674219f385c8ea5504 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:31:27 +0200 Subject: gnu: mbpfan: Fix cross-compilation. * gnu/packages/linux.scm (mbpfan)[arguments]: Use CC-FOR-TARGET. --- 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 1a1821b5a7..e60cc790e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6490,10 +6490,10 @@ (define-public mbpfan (base32 "0aijyxrqh01x0s80yr4cgxgd001iiqqph65pxvby7f0wz8lnxnqj")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; tests ask to be run as root + `(#:tests? #f ; tests ask to be run as root #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "DESTDIR=" out) - "CC=gcc")) + ,(string-append "CC=" (cc-for-target)))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths -- cgit v1.2.3 From 7dd57cc00e949dd414ed1c820d6452b2c9978184 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:38:11 +0200 Subject: gnu: hdparm: Fix cross-compilation. * gnu/packages/linux.scm (hdparm)[arguments]: Use CC-FOR-TARGET. Don't strip the binary during the build phase. --- gnu/packages/linux.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e60cc790e2..30420b013b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3821,10 +3821,13 @@ (define-public hdparm "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws")))) (build-system gnu-build-system) (arguments - `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list (string-append "binprefix=" out) - (string-append "manprefix=" out) - "CC=gcc")) + `(#:make-flags + (let ((out (assoc-ref %outputs "out"))) + (list (string-append "binprefix=" out) + (string-append "manprefix=" out) + ,(string-append "CC=" (cc-for-target)) + ;; Let Guix strip the binaries and not break cross-compilation. + "STRIP=true")) #:phases (modify-phases %standard-phases (delete 'configure)) ; no configure script -- cgit v1.2.3 From 3dec317f1d54855705fb08c156f758b194c52d5c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:42:43 +0200 Subject: gnu: mdadm: Actually cross-compile. * gnu/packages/linux.scm (mdadm)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 30420b013b..197e5ea85a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4112,7 +4112,7 @@ (define-public mdadm `(("udev" ,eudev))) (arguments `(#:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) "INSTALL=install" "CHECK_RUN_DIR=0" ;; TODO: tell it where to find 'sendmail' -- cgit v1.2.3 From ac68ab337cf09c99a71393002854f66ad495d2ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:47:22 +0200 Subject: gnu: blktrace: Prepare for cross-compilation. * gnu/packages/linux.scm (blktrace)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 197e5ea85a..1e1ba787e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4331,12 +4331,13 @@ (define-public blktrace (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list "CC=gcc" (string-append "prefix=" %output)) - #:tests? #f ; no tests + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "prefix=" %output)) + #:tests? #f ; no tests #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script (add-after 'unpack 'fix-gnuplot-path (lambda* (#:key inputs #:allow-other-keys) (let ((gnuplot (assoc-ref inputs "gnuplot"))) -- cgit v1.2.3 From 0792984459a692e21e2503c7e2818ed46783b633 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:50:22 +0200 Subject: gnu: acpica: Update to 20200528. * gnu/packages/admin.scm (acpica): Update to 20200528. --- 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 2bd1922fea..2490d76618 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1805,7 +1805,7 @@ (define-public dmidecode (define-public acpica (package (name "acpica") - (version "20200430") + (version "20200528") (source (origin (method url-fetch) (uri (string-append @@ -1813,7 +1813,7 @@ (define-public acpica version ".tar.gz")) (sha256 (base32 - "1hiaz9lrmjzdbi5zl0ajfflja41cixzx2j76iyx02qbjlmy9cfjc")))) + "01ajxnz9dpnvdbib7yv20dw21a1yyfgwiw3whg0xi57cf4app2md")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From 3b394f6a3ec070b34f91715b8a228e6edebe45aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:51:19 +0200 Subject: gnu: inxi-minimal: Update to 3.1.01-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.1.01-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 2490d76618..bfbd533bcb 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3450,7 +3450,7 @@ (define-public inxi-minimal (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.1.00-1") + (version "3.1.01-1") (source (origin (method git-fetch) @@ -3459,7 +3459,7 @@ (define-public inxi-minimal (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa")))) + (base32 "0r204w0r06ibdr4dck7yw2nmvj7xq68bjr7xwwiy7liqdml0n0yc")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 6978cb2865ee26c2eb46bfe5a907d35b701a56c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 21:16:24 +0200 Subject: gnu: lemonbar: Fix cross-compilation. * gnu/packages/wm.scm (lemonbar)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/wm.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2e975354c3..06d28e30c1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1838,9 +1838,10 @@ (define-public lemonbar "1wwqbph392iwz8skaqxb0xpklb1l6yganqz80g4x1fhrnz7idmlh")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no test suite - #:make-flags (list "CC=gcc" - (string-append "PREFIX=" %output)) + `(#:tests? #f ; no test suite + #:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases (delete 'configure)))) -- cgit v1.2.3 From 898e8b528b6bde0a699cac81532181050344a548 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 21:31:11 +0200 Subject: gnu: net-tools: Fix cross-compilation. * gnu/packages/linux.scm (net-tools)[arguments]: Use CC-FOR-TARGET. --- 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 1e1ba787e2..12c37d8c51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2150,7 +2150,7 @@ (define-public net-tools (home-page "http://net-tools.sourceforge.net/") (build-system gnu-build-system) (arguments - '(#:modules ((guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1) (srfi srfi-26)) @@ -2190,7 +2190,7 @@ (define-public net-tools #:tests? #f ; no test suite #:make-flags (let ((out (assoc-ref %outputs "out"))) - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "BASEDIR=" out) (string-append "INSTALLNLSDIR=" out "/share/locale") (string-append "mandir=/share/man"))))) -- cgit v1.2.3 From 56a9ef22e3044134844f0093e2a3905f73dd830f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Jun 2020 21:41:32 +0200 Subject: gnu: iw: Use CC-FOR-TARGET. * gnu/packages/linux.scm (iw)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12c37d8c51..0a935d529d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2414,12 +2414,11 @@ (define-public iw (arguments `(#:make-flags (let* ((target ,(%current-target-system)) - (gcc (if target (string-append target "-gcc") "gcc")) (pkg-config (if target (string-append target "-pkg-config") "pkg-config"))) (list - (string-append "CC=" gcc) + ,(string-append "CC=" (cc-for-target)) (string-append "PKG_CONFIG=" (assoc-ref %build-inputs "pkg-config") "/bin/" pkg-config) -- cgit v1.2.3 From d6af27375dce80772488642211ade6608fa60456 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 01:58:08 +0200 Subject: gnu: bs1770gain: Update to 0.7.0. * gnu/packages/audio.scm (bs1770gain): Update to 0.7.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2d22dfc85a..ef1ff1ba5f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3373,14 +3373,14 @@ (define-public dcadec (define-public bs1770gain (package (name "bs1770gain") - (version "0.6.9") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/" version "/bs1770gain-" version ".tar.gz")) (sha256 - (base32 "1hcbff3q6xl9rj1pzy3fwy91y6fa99wwrhb31461j9kgc173ls7r")) + (base32 "0a2dcaxvxy5m3a5sb1lhplsymvz3ypaiidc5xn9qy01h53zvyvkp")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From f295c0834624e57e439cc4a1da021212bfff42f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 02:00:03 +0200 Subject: gnu: bs1770gain: Deduplicate home page URLs. * gnu/packages/audio.scm (bs1770gain)[source]: Re-use the HOME-PAGE field in the snippet. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ef1ff1ba5f..c8d15a3bb7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3374,6 +3374,7 @@ (define-public bs1770gain (package (name "bs1770gain") (version "0.7.0") + (home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html") (source (origin (method url-fetch) @@ -3383,7 +3384,7 @@ (define-public bs1770gain (base32 "0a2dcaxvxy5m3a5sb1lhplsymvz3ypaiidc5xn9qy01h53zvyvkp")) (modules '((guix build utils))) (snippet - '(begin + `(begin ;; XXX (substitute* (find-files "." "\\.[ch]$") (("^ \\* N..o.*") "")) @@ -3395,12 +3396,11 @@ (define-public bs1770gain "configure.ac" "configure") (("https?://bs1770gain[^/]*/") - "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html")) + ,home-page)) #t)))) (build-system gnu-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("sox" ,sox))) - (home-page "https://manpages.debian.org/sid/bs1770gain/bs1770gain.1.en.html") (synopsis "Tool to adjust loudness of media files") (description "BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its -- cgit v1.2.3 From 9605af1acdc4af7ccfc5e9d10f4524d5db634230 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 02:20:57 +0200 Subject: gnu: qutebrowser: Update to 1.12.0. * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.12.0. --- gnu/packages/web-browsers.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b61ed7f3ca..c30a4ff3a2 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016, 2019 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Eric Bavier -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2018 Timo Eisenmann ;;; Copyright © 2018 Pierre Neidhardt @@ -340,7 +340,7 @@ (define-public lynx (define-public qutebrowser (package (name "qutebrowser") - (version "1.11.0") + (version "1.12.0") (source (origin (method url-fetch) @@ -348,8 +348,7 @@ (define-public qutebrowser "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 - "0b0qlki9bp9mm41lrh6rc6qqvm4nsz8da63sby3a1f2xm9b9vvg2")))) + (base32 "0pywyhi4v6ymxpn85grrdr1agmcxsnm5jfqf3rlxqx5swbnxbfs1")))) (build-system python-build-system) (native-inputs `(("python-attrs" ,python-attrs))) ; for tests -- cgit v1.2.3 From 5c8a59e6b99e84e2f4b4989fc3529c702e096866 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 02:37:27 +0200 Subject: gnu: osinfo-db-tools: Update to 1.8.0. * gnu/packages/virtualization.scm (osinfo-db-tools): Update to 1.8.0. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 05ce96c974..9fa2887d48 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1440,7 +1440,7 @@ (define (filter-environment! filter-predicate (define-public osinfo-db-tools (package (name "osinfo-db-tools") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-tools-" @@ -1448,7 +1448,7 @@ (define-public osinfo-db-tools (sha256 (base32 - "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab")))) + "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9")))) (build-system meson-build-system) (inputs `(("libsoup" ,libsoup) -- cgit v1.2.3 From 16cf7d471c848133d2bf9643860237a7b22ecc7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 03:01:35 +0200 Subject: gnu: osinfo-db: Update to 20200529. * gnu/packages/virtualization.scm (osinfo-db): Update to 20200529. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9fa2887d48..26c0bb54cb 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1474,14 +1474,14 @@ (define-public osinfo-db-tools (define-public osinfo-db (package (name "osinfo-db") - (version "20200203") + (version "20200529") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/libosinfo/osinfo-db-" version ".tar.xz")) (sha256 (base32 - "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5")))) + "0mbrf9j5wmjhc6jixvhp4jqyxixh1717lqrmzmipdg99xnzba81n")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From a0cfa1e21a7792dba8e56c6b60148baf47282ad6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 05:33:02 +0200 Subject: gnu: intel-vaapi-driver: Update to 2.4.1. * gnu/packages/video.scm (intel-vaapi-driver): Update to 2.4.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf, automake, and libtool. --- gnu/packages/video.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 261628d795..b2d359cac2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2888,18 +2888,22 @@ (define-public handbrake (define-public intel-vaapi-driver (package (name "intel-vaapi-driver") - (version "2.4.0") + (version "2.4.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/intel/intel-vaapi-driver/" - "releases/download/" version "/intel-vaapi-driver-" - version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/intel/intel-vaapi-driver") + (commit version))) (sha256 - (base32 "12fhydgwpvyh97gxqlgv77wsf9yax321h46vi49j4sxghpcxvqki")))) + (base32 "1cidki3av9wnkgwi7fklxbg3bh6kysf8w3fk2qadjr05a92mx3zp")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) (inputs `(("libdrm" ,libdrm) ("libva" ,libva) -- cgit v1.2.3 From 9375555b555b16a54996d59321fe2dddeb5f2c50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 05:43:17 +0200 Subject: gnu: nix: Update to 2.3.5. * gnu/packages/package-management.scm (nix): Update to 2.3.5. --- 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 8ab0c9b746..edb09224c0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -542,14 +542,14 @@ (define-public current-guix (define-public nix (package (name "nix") - (version "2.3.4") + (version "2.3.5") (source (origin (method url-fetch) (uri (string-append "http://nixos.org/releases/nix/nix-" version "/nix-" version ".tar.xz")) (sha256 (base32 - "03fhbb8088sgz3709zd9n9rydavar79w87l9n4q9iimcw06nlqhw")))) + "1hbqsrp1ii2sfq8x2mahjrl2182qck76n8blrl1jfz3xq99m6i15")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) -- cgit v1.2.3 From 0c58139c9a91953d089cb39b9b856409c4975a7b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 06:01:39 +0200 Subject: gnu: re2: Update to 2020-06-01. * gnu/packages/regex.scm (re2): Update to 2020-06-01. --- gnu/packages/regex.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index c90ab88db1..60203ba5ca 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2020 Marius Bakke -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +30,7 @@ (define-module (gnu packages regex) (define-public re2 (package (name "re2") - (version "2020-05-01") + (version "2020-06-01") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,7 @@ (define-public re2 (file-name (git-file-name name version)) (sha256 (base32 - "0daav6ja99v5hdlwh1xzmja950y7767yw0phcbd0wpn42km39i20")) + "10jdgnp5dvkj3ay7grmdy539vv1srglnfxaqc5kb9v53cbql5hm8")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From e809c891dd05195c4390dd32540f5bf65418513a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 06:02:09 +0200 Subject: gnu: camlp5: Update to 7.12. * gnu/packages/ocaml.scm (camlp5): Update to 7.12. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 877e841b20..99f4518719 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -528,7 +528,7 @@ (define-public opam (define-public camlp5 (package (name "camlp5") - (version "7.11") + (version "7.12") (source (origin (method git-fetch) @@ -537,7 +537,7 @@ (define-public camlp5 (commit (string-append "rel" (string-delete #\. version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4")))) + (base32 "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf")))) (build-system gnu-build-system) (inputs `(("ocaml" ,ocaml))) -- cgit v1.2.3 From 523ddf348c6c24e1dddc86be0e136e7014fed7d0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 06:44:38 +0200 Subject: gnu: fmt: Update to 6.2.1. * gnu/packages/pretty-print.scm (fmt): Update to 6.2.1. --- gnu/packages/pretty-print.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index f7655c3535..c4bdbe9000 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Ludovic Courtès -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Vincent Legoll @@ -168,14 +168,14 @@ (define-public enscript (define-public fmt (package (name "fmt") - (version "6.1.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" - version "/fmt-" version ".zip")) - (sha256 - (base32 - "1s1hxaby5byb07rgmrk4a0q11fxhz7b42khch7sp2qx974y0yrb3")))) + (version "6.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" + version "/fmt-" version ".zip")) + (sha256 + (base32 "06l8g59frbsbwj15kg6x2bbn6p8yidh6wzsigdhbdjncvm1agzll")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) -- cgit v1.2.3 From 9ab2790e2acf872c0f2cf41ec180de80d1eee3f3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 3 Jun 2020 10:08:44 +0200 Subject: gnu: emacs-auctex: Update to 12.2.3. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 12.2.3. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ccb6614c74..0f547425a0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1804,14 +1804,14 @@ (define-public emacs-async (define-public emacs-auctex (package (name "emacs-auctex") - (version "12.2.2") + (version "12.2.3") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/auctex-" - version ".tar")) + (uri (string-append "https://elpa.gnu.org/packages/" + "auctex-" version ".tar")) (sha256 - (base32 "1map25xn7r28aldhcz9n8pbfk2l3gvnxx8hgih3ax8hyvnfi6brh")))) + (base32 "1rbn6pghkll5apjv1fyn82v523fch9l5ksi5lnh439nq460wx1yf")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). @@ -1829,8 +1829,8 @@ (define-public emacs-auctex (with-directory-excursion "doc" (setenv "HOME" (getenv "TMPDIR")) ; for mktextfm (invoke "pdftex" "tex-ref") - (install-file "tex-ref.pdf" (string-append etc-dir - "/refcards"))) + (install-file "tex-ref.pdf" + (string-append etc-dir "/refcards"))) #t)))))) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 683910e9834f6e83fc3c291f129e8c9f72cf595a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Jun 2020 12:43:04 +0300 Subject: gnu: global: Move vim plugins to correct directory. * gnu/packages/code.scm (global)[arguments]: Adjust 'post-install phase to install vim plugin files to the expected directory. --- gnu/packages/code.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index a50ac3506a..f6aaa63853 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2015, 2018 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2018 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Andy Wingo @@ -146,12 +146,19 @@ (define-public global ; a global variable (modify-phases %standard-phases (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) - ;; Install the Emacs Lisp file in the right place. + ;; Install the plugin files in the right place. (let* ((out (assoc-ref outputs "out")) (data (string-append out "/share/gtags")) + (vim (string-append out "/share/vim/vimfiles/plugin")) (lisp (string-append out "/share/emacs/site-lisp"))) - (install-file (string-append data "/gtags.el") lisp) - (delete-file (string-append data "/gtags.el")) + (mkdir-p lisp) + (mkdir-p vim) + (rename-file (string-append data "/gtags.el") + (string-append lisp "/gtags.el")) + (rename-file (string-append data "/gtags.vim") + (string-append vim "/gtags.vim")) + (rename-file (string-append data "/gtags-cscope.vim") + (string-append vim "/gtags-cscope.vim")) #t)))))) (home-page "https://www.gnu.org/software/global/") (synopsis "Cross-environment source code tag system") -- cgit v1.2.3 From ecd297a18c26e3d2c339371c9ee45901aa2bf731 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Jun 2020 12:46:04 +0300 Subject: gnu: global: Don't build static libraries. * gnu/packages/code.scm (global)[arguments]: Add configure-flag to disable static libraries. --- gnu/packages/code.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index f6aaa63853..6334c97ef2 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -140,7 +140,8 @@ (define-public global ; a global variable (list (string-append "--with-ncurses=" (assoc-ref %build-inputs "ncurses")) (string-append "--with-sqlite3=" - (assoc-ref %build-inputs "sqlite"))) + (assoc-ref %build-inputs "sqlite")) + "--disable-static") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 7277baf50d348a11cd824379f1bb32beb83e7ffb Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 16:02:13 -0500 Subject: gnu: librdkafka: Update to 1.4.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (librdkafka): Update to 1.4.2. Signed-off-by: 宋文武 --- gnu/packages/networking.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8f650b1ce8..df996d8b91 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -532,16 +532,16 @@ (define-public libnatpmp (define-public librdkafka (package (name "librdkafka") - (version "0.9.1") + (version "1.4.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/edenhill/librdkafka/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/edenhill/librdkafka.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "10ldx7g7ymmg17snzx78vy4n8ma1rjx0agzi34g15j2fk867xmas")))) + "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 08542026ea6312545d20f408f1743a811ae18f85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 3 Jun 2020 14:05:43 +0200 Subject: gnu: python-pybedtools: Disable unreliable test. * gnu/packages/bioinformatics.scm (python-pybedtools)[arguments]: Disable test_intron_exon_reads test; run tests verbosely. test_intron_exon_reads --- gnu/packages/bioinformatics.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cfa0263e46..97ad0fc2fd 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -806,12 +806,13 @@ (define-public python-pybedtools ;; See https://github.com/daler/pybedtools/issues/192 #:phases (modify-phases %standard-phases - ;; See https://github.com/daler/pybedtools/issues/261 (add-after 'unpack 'disable-broken-tests (lambda _ - ;; This test (pybedtools.test.test_scripts.test_venn_mpl) needs a - ;; graphical environment. (substitute* "pybedtools/test/test_scripts.py" + ;; This test freezes. + (("def test_intron_exon_reads") + "def _do_not_test_intron_exon_reads") + ;; This test fails in the Python 2 build. (("def test_venn_mpl") "def _do_not_test_venn_mpl")) (substitute* "pybedtools/test/test_helpers.py" @@ -868,7 +869,7 @@ (define (cythonized? c/c++-file) (mkdir-p "/tmp/test") (copy-recursively "pybedtools/test" "/tmp/test") (with-directory-excursion "/tmp/test" - (invoke "pytest"))))))) + (invoke "pytest" "-v" "--doctest-modules"))))))) (propagated-inputs `(("bedtools" ,bedtools) ("samtools" ,samtools) -- cgit v1.2.3 From 6742a84c6344370afe4923b1e3e8c36b288d3afe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 3 Jun 2020 14:06:28 +0200 Subject: gnu: Remove bedtools-2.26. * gnu/packages/bioinformatics.scm (bedtools-2.26): Remove variable. --- gnu/packages/bioinformatics.scm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 97ad0fc2fd..7ef55a25a3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -475,20 +475,6 @@ (define-public bedtools-2.18 (find-files "bin" ".*"))) #t))))))) -;; Needed for pybedtools. -(define-public bedtools-2.26 - (package (inherit bedtools) - (name "bedtools") - (version "2.26.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/arq5x/bedtools2/releases/" - "download/v" version "/" - "bedtools-" version ".tar.gz")) - (sha256 - (base32 - "0jhavwifnf7lmkb11h9y7dynr8d699h0rd2l52j1pfgircr2zwv5")))))) - (define-public pbbam (package (name "pbbam") -- cgit v1.2.3 From 2f49007dd076b14feb40d7c3331dee3e737265c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 3 Jun 2020 15:01:19 +0200 Subject: gnu: Add python-pairtools. * gnu/packages/bioinformatics.scm (python-pairtools): New variable. --- gnu/packages/bioinformatics.scm | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7ef55a25a3..8d1adafd7e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -972,6 +972,64 @@ (define-public python2-biom-format (("install_requires.append\\(\"pyqi\"\\)") "pass")) #t))))))))) +(define-public python-pairtools + (package + (name "python-pairtools") + (version "0.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirnylab/pairtools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gr8y13q7sd6yai6df4aavl2470n1f9s3cib6r473z4hr8hcbwmc")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-references + (lambda _ + (substitute* '("pairtools/pairtools_merge.py" + "pairtools/pairtools_sort.py") + (("/bin/bash") (which "bash"))) + #t)) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "/tmp" + (invoke "pytest" "-v"))))))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (inputs + `(("python" ,python-wrapper))) + (propagated-inputs + `(("htslib" ,htslib) ; for bgzip, looked up in PATH + ("samtools" ,samtools) ; looked up in PATH + ("lz4" ,lz4) ; for lz4c + ("python-click" ,python-click) + ("python-numpy" ,python-numpy))) + (home-page "https://github.com/mirnylab/pairtools") + (synopsis "Process mapped Hi-C data") + (description "Pairtools is a simple and fast command-line framework to +process sequencing data from a Hi-C experiment. Process pair-end sequence +alignments and perform the following operations: + +@itemize +@item detect ligation junctions (a.k.a. Hi-C pairs) in aligned paired-end + sequences of Hi-C DNA molecules +@item sort @code{.pairs} files for downstream analyses +@item detect, tag and remove PCR/optical duplicates +@item generate extensive statistics of Hi-C datasets +@item select Hi-C pairs given flexibly defined criteria +@item restore @code{.sam} alignments from Hi-C pairs. +@end itemize +") + (license license:expat))) + (define-public bioperl-minimal (let* ((inputs `(("perl-module-build" ,perl-module-build) ("perl-data-stag" ,perl-data-stag) -- cgit v1.2.3 From 7c9be7b7cb71103d8a382a254e8c7a20ce7adce0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 1 Jun 2020 20:54:40 -0400 Subject: gnu: services: docker: Add a debug? parameter. * gnu/services/docker.scm (docker-configuration): Add a debug? field. (containerd-shepherd-service): Pass the "--log-level=debug" argument when DEBUG? is true. (docker-shepherd-service): Pass the "--debug" and "--log-level=debug" arguments when DEBUG? is true. * doc/guix.texi (Miscellaneous Services): Update doc. --- doc/guix.texi | 9 +++++++++ gnu/services/docker.scm | 20 ++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index beeda34ea2..de958c9cf1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26287,6 +26287,15 @@ The Docker package to use. @item @code{containerd} (default: @var{containerd}) The Containerd package to use. +@item @code{proxy} (default @var{docker-libnetwork-cmd-proxy}) +The Docker user-land networking proxy package to use. + +@item @code{enable-proxy?} (default @code{#f}) +Enable or disable the use of the Docker user-land networking proxy. + +@item @code{debug?} (default @code{#f}) +Enable or disable debug output. + @end table @end deftp diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index d6dc792821..937dff7bdb 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,7 +53,10 @@ (define-configuration docker-configuration loop-back communications.") (enable-proxy? (boolean #t) - "Enable or disable the user-land proxy (enabled by default).")) + "Enable or disable the user-land proxy (enabled by default).") + (debug? + (boolean #f) + "Enable or disable debug output.")) (define %docker-accounts (list (user-group (name "docker") (system? #t)))) @@ -71,19 +75,24 @@ (define (%docker-activation config) (mkdir-p #$state-dir)))) (define (containerd-shepherd-service config) - (let* ((package (docker-configuration-containerd config))) + (let* ((package (docker-configuration-containerd config)) + (debug? (docker-configuration-debug? config))) (shepherd-service (documentation "containerd daemon.") (provision '(containerd)) (start #~(make-forkexec-constructor - (list (string-append #$package "/bin/containerd")) + (list (string-append #$package "/bin/containerd") + #$@(if debug? + '("--log-level=debug") + '())) #:log-file "/var/log/containerd.log")) (stop #~(make-kill-destructor))))) (define (docker-shepherd-service config) (let* ((docker (docker-configuration-docker config)) (enable-proxy? (docker-configuration-enable-proxy? config)) - (proxy (docker-configuration-proxy config))) + (proxy (docker-configuration-proxy config)) + (debug? (docker-configuration-debug? config))) (shepherd-service (documentation "Docker daemon.") (provision '(dockerd)) @@ -101,6 +110,9 @@ (define (docker-shepherd-service config) (start #~(make-forkexec-constructor (list (string-append #$docker "/bin/dockerd") "-p" "/var/run/docker.pid" + #$@(if debug? + '("--debug" "--log-level=debug") + '()) (if #$enable-proxy? "--userland-proxy" "") "--userland-proxy-path" (string-append #$proxy "/bin/proxy")) -- cgit v1.2.3 From 19b464fcb830b96e0d8c7bc93d3eb4dac851ff26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Jun 2020 11:08:16 -0400 Subject: gnu: python-can: Update to 3.3.3. This fixes the build of python-can, which is very exacting w.r.t. to its dependencies. * gnu/packages/python-xyz.scm (python-can): Update to 3.3.3. [phases]{relax-version-requirements}: New phase. [native-inputs]: Add python-coverage. [license]: Correct the license to lgpl3+. --- gnu/packages/python-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6aa666430a..2e9f0d5632 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1207,17 +1207,25 @@ (define-public python-aenum (define-public python-can (package (name "python-can") - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) (uri (pypi-uri "python-can" version)) (sha256 (base32 - "0bkbxi45sckzir6s0j3h01pkfn4vkz3ymih2zjp7zw77wz0vbvsz")))) + "123lz1bl6xf3d0fvxzr4bg4884yg4m9s21z6xd2m68zhnbv9rmpc")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-version-requirements + (lambda _ + (substitute* "setup.py" + (("mock~=2\\.0") "mock") + (("coverage<5") "coverage") + (("pytest~=4\\.3") "pytest") + (("hypothesis~=4\\.56") "hypothesis")) + #t)) (add-after 'unpack 'fix-broken-tests ;; The tests try to run two scripts it expects should be ;; in PATH, but they aren't at this time (see: @@ -1232,6 +1240,7 @@ (define-public python-can ("python-wrapt" ,python-wrapt))) (native-inputs `(("python-codecov" ,python-codecov) + ("python-coverage" ,python-coverage) ("python-future" ,python-future) ("python-hypothesis" ,python-hypothesis) ("python-mock" ,python-mock) @@ -1246,7 +1255,7 @@ (define-public python-can controller area network (CAN) support for Python developers; providing common abstractions to different hardware devices, and a suite of utilities for sending and receiving messages on a CAN bus.") - (license license:gpl3+))) + (license license:lgpl3+))) (define-public python-diskcache (package -- cgit v1.2.3 From 3f9c62d1a8b345909adaeb22f454ad22554c55a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Jun 2020 14:51:38 +0200 Subject: gnu: shepherd: Update to 0.8.1. * gnu/packages/admin.scm (shepherd): Update to 0.8.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 bfbd533bcb..77981e520a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -247,14 +247,14 @@ (define-public progress (define-public shepherd (package (name "shepherd") - (version "0.8.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll")))) + "0x9zr0x3xvk4qkb6jnda451d5iyrl06cz1bjzjsm0lxvjj3fabyk")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) -- cgit v1.2.3 From b6c445931e85c07286a79bc9c80fdc956d58b1e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Jun 2020 17:22:43 +0200 Subject: doc: Mention Btrfs compression. Suggested by Pierre Neidhardt . * doc/guix.texi (Keyboard Layout and Networking and Partitioning): Mention Btrfs compression. --- doc/guix.texi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index de958c9cf1..056bf011f6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2279,6 +2279,12 @@ types.}. For the ESP, if you have one and assuming it is mkfs.fat -F32 /dev/sda1 @end example +For the root file system, ext4 is the most widely used format. Other +file systems, such as Btrfs, support compression, which is reported to +nicely complement file deduplication that the daemon performs +independently of the file system (@pxref{Invoking guix-daemon, +deduplication}). + Preferably, assign file systems a label so that you can easily and reliably refer to them in @code{file-system} declarations (@pxref{File Systems}). This is typically done using the @code{-L} option of -- cgit v1.2.3 From d9ef5aeba757c6f86d2abafe6b62ef4c2516c2e6 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Sat, 30 May 2020 19:09:43 +0200 Subject: gnu: java-openjfx-build: Add helpful patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java.scm (java-openjfx-build)[source]: Use it. * gnu/packages/patches/java-openjfx-build-jdk_version.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Alexey Abramov Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/java.scm | 3 ++- .../patches/java-openjfx-build-jdk_version.patch | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/java-openjfx-build-jdk_version.patch diff --git a/gnu/local.mk b/gnu/local.mk index babcb8f6ad..01ec893310 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,6 +1111,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ + %D%/packages/patches/java-openjfx-build-jdk_version.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ %D%/packages/patches/java-svg-salamander-Fix-non-det.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b12c3ca95c..d569ed57d6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2499,7 +2499,8 @@ (define-public java-openjfx-build #t)) (sha256 (base32 - "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")))) + "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")) + (patches (search-patches "java-openjfx-build-jdk_version.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "java-openjfx.jar" diff --git a/gnu/packages/patches/java-openjfx-build-jdk_version.patch b/gnu/packages/patches/java-openjfx-build-jdk_version.patch new file mode 100644 index 0000000000..7be954467a --- /dev/null +++ b/gnu/packages/patches/java-openjfx-build-jdk_version.patch @@ -0,0 +1,27 @@ +Subject: [PATCH] openjfx: Determine the version of Java in JDK_HOME + +Icedtea contains guix in its version, so build.gradle failes to run. Openjfx +packaging is not trivial, so you will probably need to try build it with +gradlew. + +--- + build.gradle | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/build.gradle b/build.gradle +index df82f63..2c626cd 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -742,9 +742,9 @@ try { + if (inStream.readLine() != null) { + String v = inStream.readLine(); + if (v != null) { +- int ib = v.indexOf(" (build "); ++ int ib = v.indexOf(" (guix build "); + if (ib != -1) { +- String ver = v.substring(ib + 8, v.size() - 1); ++ String ver = v.substring(ib + 13, v.size() - 1); + + defineProperty("jdkRuntimeVersion", ver) + defineProperty("jdkVersion", jdkRuntimeVersion.split("-")[0]) +2.24.1 -- cgit v1.2.3 From c19293ad091ae8bcb96373afd327bcb544879023 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Sat, 30 May 2020 19:09:44 +0200 Subject: gnu: java-openjfx-build: Fix indentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java.scm (java-openjfx-build)[source]: Change the indentation of the uri dirictive. Signed-off-by: Alexey Abramov Signed-off-by: Ludovic Courtès --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d569ed57d6..43f0f37b91 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2486,10 +2486,10 @@ (define-public java-openjfx-build (source (origin (method hg-fetch) (uri (hg-reference - (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") - (changeset (string-append - (string-join (string-split version #\.) "u") - "-ga")))) + (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") + (changeset (string-append + (string-join (string-split version #\.) "u") + "-ga")))) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 56caf77e0d875a7f44e1f53508bfdd86331dff52 Mon Sep 17 00:00:00 2001 From: Marcin Karpezo Date: Fri, 29 May 2020 19:30:12 +0200 Subject: gnu: Add Polish hunspell dictionary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (hunspell-dict-pl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/libreoffice.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 01d33dc03c..34579a776c 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Jonathan Brielmaier ;;; Copyright © 2019 Chris Marusich +;;; Copyright © 2020 Marcin Karpezo ;;; ;;; This file is part of GNU Guix. ;;; @@ -920,6 +921,56 @@ (define-french-dictionary hunspell-dict-fr-toutes-variantes "toutesvariantes" (synopsis "Hunspell dictionary for all variants of French")) +(define-public hunspell-dict-pl + (package + (name "hunspell-dict-pl") + (version "20200327") + (source + (origin + (method url-fetch) + ;; Since creators of dictionary host only the latest daily release, + ;; we're using version mirrored by Arch Linux, which seems good + ;; enough. They're mirroring hunspell-pl releases since 2011. + (uri (string-append "https://sources.archlinux.org/other/community/" + "hunspell-pl/sjp-myspell-pl-" + version ".zip")) + (sha256 (base32 + "14mzf8glxkp2775dcqisb1zv6r8ncm3bvzl46q352rwyl2dg1c59")))) + + (build-system trivial-build-system) + (native-inputs `(("unzip" ,unzip))) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (unzip (string-append (assoc-ref %build-inputs "unzip") + "/bin/unzip"))) + (invoke unzip "-j" "-o" (assoc-ref %build-inputs "source")) + (invoke unzip "-j" "-o" "pl_PL.zip") + (for-each (cut install-file <> hunspell) + (find-files "." + ,(string-append "pl_PL" + "\\.(dic|aff)$"))) + (mkdir-p myspell) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (cut install-file <> doc) + (find-files "." "\\.(txt|org|md)$")) + #t)))) + (synopsis "Hunspell dictionary for Polish") + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "https://sjp.pl/slownik/ort/") + (license + (list license:gpl2 license:mpl1.1 license:cc-by4.0 license:lgpl2.1 license:asl2.0)))) + (define-public hyphen (package (name "hyphen") -- cgit v1.2.3 From 639bcf205d55c7a0c6d0894b4e7a814a86d3b9a9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 30 May 2020 19:10:30 +0200 Subject: gnu: Add mergerfs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/storage.scm (mergerfs): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/file-systems.scm | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 1f58917d0c..bb435d7ac0 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -682,3 +682,50 @@ (define-public zfs originally developed for Solaris and is now maintained by the OpenZFS community.") (license license:cddl1.0))) + +(define-public mergerfs + (package + (name "mergerfs") + (version "2.29.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/trapexit/mergerfs/releases/download/" + version "/mergerfs-" version ".tar.gz")) + (sha256 + (base32 + "17gizw4vgbqqjd2ykkfpp276942jb5qclp0lkiwkmq1yjgyjqfmk")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No tests exist. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "CC" "gcc") + ;; These were copied from the package libfuse. + (substitute* '("libfuse/lib/mount_util.c" "libfuse/util/mount_util.c") + (("/bin/(u?)mount" _ maybe-u) + (string-append (assoc-ref inputs "util-linux") + "/bin/" maybe-u "mount"))) + (substitute* '("libfuse/util/mount.mergerfs.c") + (("/bin/sh") + (which "sh"))) + ;; The Makefile does not allow overriding PREFIX via make variables. + (substitute* '("Makefile" "libfuse/Makefile") + (("= /usr/local") (string-append "= " (assoc-ref outputs "out"))) + ;; cannot chown as build user + (("chown root:root") "true")) + #t))))) + ;; mergerfs bundles a heavily modified copy of libfuse. + (inputs `(("util-linux" ,util-linux))) + (home-page "https://github.com/trapexit/mergerfs") + (synopsis "Featureful union filesystem") + (description "mergerfs is a union filesystem geared towards simplifying +storage and management of files across numerous commodity storage devices. It +is similar to mhddfs, unionfs, and aufs.") + (license (list + license:isc ; mergerfs + license:gpl2 license:lgpl2.0 ; Imported libfuse code. + )))) -- cgit v1.2.3 From 4960a955f8f77cc4c35d0db749cd6f3de8787bff Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 30 May 2020 19:10:55 +0200 Subject: gnu: Add mergerfs-tools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/storage.scm (mergerfs-tools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/file-systems.scm | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index bb435d7ac0..ca02a1e593 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -27,6 +27,7 @@ (define-module (gnu packages file-systems) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system linux-module) #:use-module (guix build-system trivial) @@ -53,7 +54,9 @@ (define-module (gnu packages file-systems) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages rsync) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) @@ -729,3 +732,53 @@ (define-public mergerfs license:isc ; mergerfs license:gpl2 license:lgpl2.0 ; Imported libfuse code. )))) + +(define-public mergerfs-tools + (let ((commit "c926779d87458d103f3b674603bf97801ae2486d") + (revision "1")) + (package + (name "mergerfs-tools") + ;; No released version exists. + (version (git-version "0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/trapexit/mergerfs-tools.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04hhwcib0xv4cf1mkj8zrp2aqpxkncml9iqg4m1mz6a5zhzsk0vm")))) + (build-system copy-build-system) + (inputs + `(("python" ,python) + ("python-xattr" ,python-xattr) + ("rsync" ,rsync))) + (arguments + '(#:install-plan + '(("src/" "bin/")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src" "^mergerfs\\.") + (("'rsync'") + (string-append "'" (assoc-ref inputs "rsync") "/bin/rsync'")) + (("'rm'") + (string-append "'" (assoc-ref inputs "coreutils") "/bin/rm'"))) + (substitute* "src/mergerfs.mktrash" + (("xattr") + (string-append (assoc-ref inputs "python-xattr") "/bin/xattr")) + (("mkdir") + (string-append (assoc-ref inputs "coreutils") "/bin/mkdir"))) + #t))))) + (synopsis "Tools to help manage data in a mergerfs pool") + (description "mergerfs-tools is a suite of programs that can audit +permissions and ownership of files and directories on a mergerfs volume, +duplicates files and directories across branches in its pool, find and remove +duplicate files, balance pool drives, consolidate files in a single mergerfs +directory onto a single drive and create FreeDesktop.org Trash specification +compatible directories.") + (home-page "https://github.com/trapexit/mergerfs-tools") + (license license:isc)))) -- cgit v1.2.3 From 6aec7e2ec14dc86890c1e7ad142899a83736e10a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 19:56:37 +0200 Subject: gnu: hcxdumptool: Update to 6.0.6. * gnu/packages/networking.scm (hcxdumptool): Update to 6.0.6. [inputs]: Add openssl. --- gnu/packages/networking.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index df996d8b91..84535bda63 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2612,7 +2612,7 @@ (define-public hcxtools (define-public hcxdumptool (package (name "hcxdumptool") - (version "5.2.0") + (version "6.0.6") (source (origin (method git-fetch) @@ -2620,7 +2620,7 @@ (define-public hcxdumptool (url "https://github.com/ZerBea/hcxdumptool.git") (commit version))) (sha256 - (base32 "0pg1pvg029gm4rj0fj5kcsjb32hixgn4cxsgiir7spkmacf1qm4q")) + (base32 "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -2631,6 +2631,8 @@ (define-public hcxdumptool #:phases (modify-phases %standard-phases (delete 'configure)))) + (inputs + `(("openssl" ,openssl))) (home-page "https://github.com/ZerBea/hcxdumptool") (synopsis "Small tool to capture packets from wlan devices") (description -- cgit v1.2.3 From 39a598c686839d65a61ec1ebb982bd5896f3d7e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 19:56:47 +0200 Subject: gnu: hcxdumptool: Fix cross-compilation. * gnu/packages/networking.scm (hcxdumptool)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 84535bda63..7dfdf8c0a1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2625,7 +2625,7 @@ (define-public hcxdumptool (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) (string-append "INSTALLDIR=" (assoc-ref %outputs "out") "/bin")) #:tests? #f ; no test suite #:phases -- cgit v1.2.3 From bb79af865a032f6a2477bfefe49a3e6125439893 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 19:59:50 +0200 Subject: gnu: ocaml-extlib: Update to 1.7.7. * gnu/packages/ocaml.scm (ocaml-extlib): Update to 1.7.7. [source]: Update TLD. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 99f4518719..d9ba2aee2d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -267,14 +267,14 @@ (define-public ocamlbuild (define-public ocaml-extlib (package (name "ocaml-extlib") - (version "1.7.6") + (version "1.7.7") (source (origin (method url-fetch) - (uri (string-append "https://ygrek.org.ua/p/release/ocaml-extlib/" + (uri (string-append "https://ygrek.org/p/release/ocaml-extlib/" "extlib-" version ".tar.gz")) (sha256 (base32 - "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz")))) + "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1")))) (build-system ocaml-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6810e9fe842664e3e3dd0f63c6ab7af61d4631ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 20:00:03 +0200 Subject: gnu: perl-net-dns: Update to 1.24. * gnu/packages/networking.scm (perl-net-dns): Update to 1.24. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7dfdf8c0a1..3ad68ad070 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1286,7 +1286,7 @@ (define-public perl-data-validate-ip (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.21") + (version "1.24") (source (origin (method url-fetch) @@ -1297,7 +1297,7 @@ (define-public perl-net-dns (string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-" version ".tar.gz"))) (sha256 - (base32 "0yknrsh0wqr9s43c0wf3dyzrsi2r7k0v75hay74gqkq850xy3vyx")))) + (base32 "0qyy5k4k0llqjjmkkfg96919gqybdc1z5fy9047n9imidjxc59hi")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit v1.2.3 From eb683ebb87faeebc0ac1ba7ab319b2fd0e9ba0be Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 20:05:26 +0200 Subject: gnu: lsp-plugins: Update to 1.1.22. * gnu/packages/music.scm (lsp-plugins): Update to 1.1.22. --- gnu/packages/music.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ac149a804c..24192f89c7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4872,7 +4872,7 @@ (define-public artyfx (define-public lsp-plugins (package (name "lsp-plugins") - (version "1.1.21") + (version "1.1.22") (source (origin (method git-fetch) @@ -4881,8 +4881,7 @@ (define-public lsp-plugins (commit (string-append "lsp-plugins-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1zw0iip6ki9k65kh8dp53x7l4va4mi5rj793n2yn4p9y84qzwrz9")))) + (base32 "0s0i0kf5nqxxywckg03fds1w7696ly60rnlljzqvp7qfgzps1r6c")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 5122961329906dd1cd721ad3d0659ce4038f6cc8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 20:05:52 +0200 Subject: gnu: ncdu: Update to 1.15. * gnu/packages/ncdu.scm (ncdu): Update to 1.15. --- gnu/packages/ncdu.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 720b8a7858..e59e0334b7 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -28,14 +28,14 @@ (define-module (gnu packages ncdu) (define-public ncdu (package (name "ncdu") - (version "1.14.2") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "1cf6a9qw7ljaw09b0g7c5i252dl7wb2mnkrbwwwf7m0c3mf7yyll")))) + "1ywpa8yg74a5xa46f0qig92xw5z5s1lmspwzcslr497brk2ksnaa")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses))) (synopsis "Ncurses based disk usage analyzer") -- cgit v1.2.3 From b3ece3ba1691c358d98283bf23fa7ac7cf632fff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 20:44:47 +0200 Subject: gnu: mpg123: Update to 1.26.1. * gnu/packages/mp3.scm (mpg123): Update to 1.26.1. --- gnu/packages/mp3.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 60ef5560a1..2a4ca555dc 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -309,7 +309,7 @@ (define-public mp3splt (define-public mpg123 (package (name "mpg123") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) @@ -319,7 +319,7 @@ (define-public mpg123 "https://www.mpg123.org/download/mpg123-" version ".tar.bz2"))) (sha256 - (base32 "0s62k45mz6264h0ljkrrs9vyagvl78q9pxhi7dnbk56pmgs0br74")))) + (base32 "0cp01wdy77ggzqzzasxd5jd9iypcly5m4c89idc9mpgknyd65mkl")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) (native-inputs -- cgit v1.2.3 From 6b8ad47b2afb2b017a4f44471fc460795719d0d7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:45:05 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.226. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.226. (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 0a935d529d..efd02b9902 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,10 +409,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.225") +(define-public linux-libre-4.4-version "4.4.226") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0pn66hf9yrjg15skq1inscr5m0slvgsd2qm8rg5id70llrb4jis9"))) + (hash (base32 "1dwvm81i62b06jsl38spfn719zrsbwq5z8viwckrpw4ma4w9k0j1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From c77b62ca5cc02cef0ee4a324645e843a9c528e75 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:46:02 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.226. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.226. (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 efd02b9902..23d58beb79 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,10 +401,10 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.225") +(define-public linux-libre-4.9-version "4.9.226") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1s63aymgsc4lsysy9d972ps9cyrf6bncyy5wcpv5a3wbaj678iz5"))) + (hash (base32 "1jj5ydz5cy87z7hrv54bkyl9739lpzja8580ngjhrip5iwb8q2j6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f2a65479becef076584888d535bcc471a557f7aa Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:46:30 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.183. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.183. (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 23d58beb79..bdc8ef9761 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -393,10 +393,10 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.182") +(define-public linux-libre-4.14-version "4.14.183") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "142v7qnfska86jqzilwq00kxdrq08iaaaw7f47xp9bnhb8fiy7b7"))) + (hash (base32 "11c0vd2pwplm8wafich4zg2mnp10vvnap987c5jh96w1avpsyra2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 644690b3e2d3bcb565ce796b096bb05d6944d690 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:47:09 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.126. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.126. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bdc8ef9761..e86baed959 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -385,10 +385,10 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.125") +(define-public linux-libre-4.19-version "4.19.126") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0zmxs6q2rgssvsh76xq9xgcax7bps19x2448d1q1fj9pzc7g8hwq"))) + (hash (base32 "129ziwvk3f4xh8jvnq2krajc0bnrl2zxffqsiz63j7p3vc57wakf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From f52504a92c45545a754df7af5e952ba141e3b367 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:47:44 -0400 Subject: gnu: linux-libre@5.6: Update to 5.6.16. * gnu/packages/linux.scm (linux-libre-5.6-version): Update to 5.6.16. (linux-libre-5.6-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e86baed959..9beb764a39 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -369,10 +369,10 @@ (define (%upstream-linux-source version hash) (sha256 hash))) -(define-public linux-libre-5.6-version "5.6.15") +(define-public linux-libre-5.6-version "5.6.16") (define-public linux-libre-5.6-pristine-source (let ((version linux-libre-5.6-version) - (hash (base32 "0kh34f9vdfsi9g83fa1i1926djyzfi466w02c4y4d46ljf9pkav5"))) + (hash (base32 "1xvwk6yxi5nhiwhskpmr89a31286mw9hpm0y3l3i5ydswx6lnl15"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.6))) -- cgit v1.2.3 From 3daf7bc169561eadf986ca4477549c562c65b9ff Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 3 Jun 2020 14:48:20 -0400 Subject: gnu: linux-libre: Update to 5.4.44. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.44. (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 9beb764a39..35b4d73b51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -377,10 +377,10 @@ (define-public linux-libre-5.6-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.6))) -(define-public linux-libre-5.4-version "5.4.43") +(define-public linux-libre-5.4-version "5.4.44") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0i07g72138xdf1l8x593jndq0waf3fx7plz3m6n5f9fl885bjrr6"))) + (hash (base32 "0fc4nsv1zwlknvfv1bzkjlq2vlx28wfl09hg2p7r8cn7a77bphlp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 4c8700fd844d24f52c54966467765f14dca6510c Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Wed, 3 Jun 2020 21:21:34 +0200 Subject: gnu: sameboy: Update to 0.13.1 [security fix]. * gnu/packages/emulators.scm (sameboy): Update to 0.13.1. --- 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 14c438337c..9798ac370e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -470,7 +470,7 @@ (define-public mgba (define-public sameboy (package (name "sameboy") - (version "0.13") + (version "0.13.1") (source (origin (method git-fetch) @@ -479,7 +479,7 @@ (define-public sameboy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cp126sd76h1c6pj7cmsgzn5kd471524ikhyspv7flcm8nmz9mq0")))) + (base32 "1il2bpbc3xyvvhbs2bgid64svjxcdl4dbqz6jy1azfmvzdp7jkrn")))) (build-system gnu-build-system) (native-inputs `(("rgbds" ,rgbds) -- cgit v1.2.3 From 026609453176f67d2f28871af114d3d6a9544c2a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 4 Jun 2020 11:54:38 +0200 Subject: gnu: python-pypairix: Update to 0.3.7 and build programs. * gnu/packages/bioinformatics.scm (python-pypairix): Update to 0.3.7. [source]: Fetch from github. [arguments]: Add phases "build-programs" and "install-programs". --- gnu/packages/bioinformatics.scm | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8d1adafd7e..54cdb353c1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13788,18 +13788,31 @@ (define-public python-intervaltree (define-public python-pypairix (package (name "python-pypairix") - (version "0.3.6") + (version "0.3.7") + ;; The tarball on pypi does not include the makefile to build the + ;; programs. (source (origin - (method url-fetch) - (uri (pypi-uri "pypairix" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/4dn-dcic/pairix.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0zs92b74s5v4xy2h16s15f3z6l4nnbw8x8zyif7xx5xpafjn0xss")))) + "1snr3lrmsld8sy77ng6ba6wcmd33xjccf1l2f3m6pi29xis9nd6p")))) (build-system python-build-system) - ;; FIXME: the tests fail because test.support cannot be loaded: - ;; ImportError: cannot import name 'support' - (arguments '(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'build-programs + (lambda _ (invoke "make"))) + (add-after 'install 'install-programs + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "bin" (string-append + (assoc-ref outputs "out") + "/bin")) + #t))))) (inputs `(("zlib" ,zlib))) (home-page "https://github.com/4dn-dcic/pairix") -- cgit v1.2.3 From 8b158e8b2cd0293eeebe73f5a71f0c513a89d606 Mon Sep 17 00:00:00 2001 From: Caleb Ristvedt Date: Tue, 2 Jun 2020 06:28:46 -0500 Subject: xorg: honor xorg-configuration-server in xorg-configuration->file Fixes . Previously the xorg-server package specified in the configuration was ignored entirely in xorg-configuration->file. This had the effect that while the X program of the configured package would be executed, the modules of the configured package would be ignored in favor of the default xorg-server package's modules. This fixes that. * gnu/services/xorg.scm (xorg-configuration->file): honor xorg-configuration-server. --- gnu/services/xorg.scm | 161 +++++++++++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 80 deletions(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 2505bde97b..ca39994516 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -180,31 +180,32 @@ (define-record-type* (define (xorg-configuration->file config) "Compute an Xorg configuration file corresponding to CONFIG, an record." - (define all-modules - ;; 'xorg-server' provides 'fbdevhw.so' etc. - (append (xorg-configuration-modules config) - (list xorg-server))) - - (define build - #~(begin - (use-modules (ice-9 match) - (srfi srfi-1) - (srfi srfi-26)) - - (call-with-output-file #$output - (lambda (port) - (define drivers - '#$(xorg-configuration-drivers config)) + (let ((xorg-server (xorg-configuration-server config))) + (define all-modules + ;; 'xorg-server' provides 'fbdevhw.so' etc. + (append (xorg-configuration-modules config) + (list xorg-server))) + + (define build + #~(begin + (use-modules (ice-9 match) + (srfi srfi-1) + (srfi srfi-26)) + + (call-with-output-file #$output + (lambda (port) + (define drivers + '#$(xorg-configuration-drivers config)) - (define (device-section driver) - (string-append " + (define (device-section driver) + (string-append " Section \"Device\" Identifier \"device-" driver "\" Driver \"" driver "\" EndSection")) - (define (screen-section driver resolutions) - (string-append " + (define (screen-section driver resolutions) + (string-append " Section \"Screen\" Identifier \"screen-" driver "\" Device \"device-" driver "\" @@ -218,8 +219,8 @@ (define (screen-section driver resolutions) EndSubSection EndSection")) - (define (input-class-section layout variant model options) - (string-append " + (define (input-class-section layout variant model options) + (string-append " Section \"InputClass\" Identifier \"evdev keyboard catchall\" MatchIsKeyboard \"on\" @@ -243,69 +244,69 @@ (define (input-class-section layout variant model options) Driver \"evdev\" EndSection\n")) - (define (expand modules) - ;; Append to MODULES the relevant /lib/xorg/modules - ;; sub-directories. - (append-map (lambda (module) - (filter-map (lambda (directory) - (let ((full (string-append module - directory))) - (and (file-exists? full) - full))) - '("/lib/xorg/modules/drivers" - "/lib/xorg/modules/input" - "/lib/xorg/modules/multimedia" - "/lib/xorg/modules/extensions"))) - modules)) - - (display "Section \"Files\"\n" port) - (for-each (lambda (font) - (format port " FontPath \"~a\"~%" font)) - '#$(xorg-configuration-fonts config)) - (for-each (lambda (module) - (format port - " ModulePath \"~a\"~%" - module)) - (append (expand '#$all-modules) - - ;; For fbdevhw.so and so on. - (list #$(file-append xorg-server - "/lib/xorg/modules")))) - (display "EndSection\n" port) - (display " + (define (expand modules) + ;; Append to MODULES the relevant /lib/xorg/modules + ;; sub-directories. + (append-map (lambda (module) + (filter-map (lambda (directory) + (let ((full (string-append module + directory))) + (and (file-exists? full) + full))) + '("/lib/xorg/modules/drivers" + "/lib/xorg/modules/input" + "/lib/xorg/modules/multimedia" + "/lib/xorg/modules/extensions"))) + modules)) + + (display "Section \"Files\"\n" port) + (for-each (lambda (font) + (format port " FontPath \"~a\"~%" font)) + '#$(xorg-configuration-fonts config)) + (for-each (lambda (module) + (format port + " ModulePath \"~a\"~%" + module)) + (append (expand '#$all-modules) + + ;; For fbdevhw.so and so on. + (list #$(file-append xorg-server + "/lib/xorg/modules")))) + (display "EndSection\n" port) + (display " Section \"ServerFlags\" Option \"AllowMouseOpenFail\" \"on\" EndSection\n" port) - (display (string-join (map device-section drivers) "\n") - port) - (newline port) - (display (string-join - (map (cut screen-section <> - '#$(xorg-configuration-resolutions config)) - drivers) - "\n") - port) - (newline port) - - (let ((layout #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-name)) - (variant #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-variant)) - (model #$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-model)) - (options '#$(and=> (xorg-configuration-keyboard-layout config) - keyboard-layout-options))) - (when layout - (display (input-class-section layout variant model options) - port) - (newline port))) - - (for-each (lambda (config) - (display config port)) - '#$(xorg-configuration-extra-config config)))))) - - (computed-file "xserver.conf" build)) + (display (string-join (map device-section drivers) "\n") + port) + (newline port) + (display (string-join + (map (cut screen-section <> + '#$(xorg-configuration-resolutions config)) + drivers) + "\n") + port) + (newline port) + + (let ((layout #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-name)) + (variant #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-variant)) + (model #$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-model)) + (options '#$(and=> (xorg-configuration-keyboard-layout config) + keyboard-layout-options))) + (when layout + (display (input-class-section layout variant model options) + port) + (newline port))) + + (for-each (lambda (config) + (display config port)) + '#$(xorg-configuration-extra-config config)))))) + + (computed-file "xserver.conf" build))) (define (xorg-configuration-directory modules) "Return a directory that contains the @code{.conf} files for X.org that -- cgit v1.2.3 From c987b72382e739bf887849b02c533eda317ea52b Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Wed, 3 Jun 2020 21:05:30 +0200 Subject: doc: cookbook: Add entry about getting substitutes through Tor. * doc/guix-cookbook.texi (Getting substitutes from Tor): New section. --- doc/guix-cookbook.texi | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 5574a60857..1342826c97 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -14,6 +14,7 @@ Copyright @copyright{} 2019 Pierre Neidhardt@* Copyright @copyright{} 2020 Oleg Pykhalov@* Copyright @copyright{} 2020 Matthew Brooks@* Copyright @copyright{} 2020 Marcin Karpezo@* +Copyright @copyright{} 2020 Brice Waegeneire@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -1326,6 +1327,7 @@ reference. * Connecting to Wireguard VPN:: Connecting to a Wireguard VPN. * Customizing a Window Manager:: Handle customization of a Window manager on Guix System. * Setting up a bind mount:: Setting up a bind mount in the file-systems definition. +* Getting substitutes from Tor:: Configuring Guix daemon to get substitutes through Tor. @end menu @node Customizing the Kernel @@ -1785,6 +1787,62 @@ mount itself. )) @end lisp +@node Getting substitutes from Tor +@section Getting substitutes from Tor + +Guix daemon can use a HTTP proxy to get substitutes, here we are +configuring it to get them via Tor. + +@quotation Warning +@emph{Not all} Guix daemon's traffic will go through Tor! Only +HTTP/HTTPS will get proxied; FTP, Git protocol, SSH, etc connections +will still go through the clearnet. Again, this configuration isn't +foolproof some of your traffic won't get routed by Tor at all. Use it +at your own risk. +@end quotation + +Guix's substitute server is available as a Onion service, if you want +to use it to get your substitutes from Tor configure your system as +follow: + +@lisp +(use-modules (gnu)) +(use-service-module base networking) + +(operating-system + … + (services + (cons + (service tor-service-type + (tor-configuration + (config-file (plain-file "tor-config" + "HTTPTunnelPort 127.0.0.1:9250")))) + (modify-services %base-services + (guix-service-type + config => (guix-configuration + (inherit config) + ;; ci.guix.gnu.org's Onion service + (substitute-urls "https://bp7o7ckwlewr4slm.onion") + (http-proxy "http://localhost:9250"))))))) +@end lisp + +This will keep a tor process running that provides a HTTP CONNECT tunnel +which will be used by @command{guix-daemon}. The daemon can use other +protocols than HTTP(S) to get remote resources, request using those +protocols won't go through Tor since we are only setting a HTTP tunnel +here. Note that @code{substitutes-urls} is using HTTPS and not HTTP or +it won't work, that's a limitation of Tor's tunnel; you may want to use +@command{privoxy} instead to avoid such limitations. + +If you don't want to always get substitutes through Tor but using it just +some of the times, then skip the @code{guix-configuration}. When you +want to get a substitute from the Tor tunnel run: + +@example +sudo herd set-http-proxy guix-daemon http://localhost:9250 +guix build --substitute-urls=https://bp7o7ckwlewr4slm.onion … +@end example + @c ********************************************************************* @node Advanced package management @chapter Advanced package management -- cgit v1.2.3 From 4a6a6f1a2a121687303bf02de2db2714f8467abd Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Thu, 4 Jun 2020 14:55:19 +0200 Subject: gnu: Add emacs-glsl-mode. * gnu/packages/emacs-xyz.scm (emacs-glsl-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0f547425a0..dfdc40bcc6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22693,6 +22693,32 @@ (define-public emacs-message-x executes a different function (default: @code{indent-relative}).") (license license:gpl2+)))) +(define-public emacs-glsl-mode + ;; No tag, version grabbed from source .el file. + (let ((commit "b07112016436d9634cd4ef747f9af6b01366d136") + (revision "0")) + (package + (name "emacs-glsl-mode") + (version (git-version "2.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jimhourihan/glsl-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bav9ipfm0vy26n74ngsmjzc7fsyqz6xmriadzx55s44h8p5dn1s")))) + (build-system emacs-build-system) + (home-page "https://github.com/jimhourihan/glsl-mode") + (synopsis "Major mode for Open GLSL shader files") + (description + "This package provides a major mode for editing OpenGLSL grammar files, +usually files ending with @file{.vert}, @file{.frag}, @file{.glsl} or +@file{.geom}. It is based on C mode plus some features and pre-specified +fontifications.") + (license license:gpl3+)))) + (define-public emacs-gnus-harvest (let ((commit "feda071a87b799bd5d23cacde3ee71f0b166e75d") (revision "0")) -- cgit v1.2.3 From f0dab65663651a879882f975d5dd6824e8795e7d Mon Sep 17 00:00:00 2001 From: Simon South Date: Wed, 3 Jun 2020 21:22:21 -0400 Subject: gnu: emacs-nov-el: Update to 0.3.0. * gnu/packages/emacs-xyz.scm (emacs-nov-el): Update to 0.3.0. [home-page, source]: Use new upstream URIs. 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 dfdc40bcc6..bf89f8455e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12428,16 +12428,16 @@ (define-public emacs-esxml (define-public emacs-nov-el (package (name "emacs-nov-el") - (version "0.2.9") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/wasamasa/nov.el.git") - (commit version))) + (url "https://depp.brause.cc/nov.el.git") + (commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596"))) (file-name (git-file-name name version)) (sha256 (base32 - "0v01l1p35mcigixs6j4c5bpc7n7bd51kxa0p3l1xl0gr92774yq3")))) + "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) (build-system emacs-build-system) (arguments `(#:phases @@ -12453,7 +12453,7 @@ (define-public emacs-nov-el ("emacs-esxml" ,emacs-esxml))) (inputs `(("unzip" ,unzip))) - (home-page "https://github.com/wasamasa/nov.el/") + (home-page "https://depp.brause.cc/nov.el/") (synopsis "Major mode for reading EPUBs in Emacs") (description "@code{nov.el} provides a major mode for reading EPUB documents. -- cgit v1.2.3 From 398ec3c1e265a3f89ed07987f33b264db82e4080 Mon Sep 17 00:00:00 2001 From: Simon South Date: Wed, 3 Jun 2020 21:48:41 -0400 Subject: gnu: emacs-elpher: Update to 2.7.9. * gnu/packages/emacs-xyz.scm (emacs-elpher): Update to 2.7.9. Signed-off-by: Nicolas Goaziou --- 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 bf89f8455e..8b06ead381 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20866,7 +20866,7 @@ (define-public emacs-multi-term (define-public emacs-elpher (package (name "emacs-elpher") - (version "2.7.8") + (version "2.7.9") (source (origin (method git-fetch) @@ -20876,7 +20876,7 @@ (define-public emacs-elpher (file-name (git-file-name name version)) (sha256 (base32 - "1x86c2lmqpmi5my356iz7lbygwpmp956dc50ng762ld0savzxff0")))) + "1vikzia87z5x3wx2qjihv0r2f29b7s9xkm6i1j0y646dwnzn6wzr")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit v1.2.3 From 3d8496705d5c4aa3c7253750dbc93ec513e94ffe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jun 2020 15:31:59 +0200 Subject: gnu: emacs-nov-el: Add comment about upstream not tagging releases. * gnu/packages/emacs-xyz.scm (emacs-nov-el): Add a comment. Fix indentation. --- gnu/packages/emacs-xyz.scm | 65 ++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8b06ead381..1f509a37a9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12426,36 +12426,39 @@ (define-public emacs-esxml (license license:gpl3+))) (define-public emacs-nov-el - (package - (name "emacs-nov-el") - (version "0.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://depp.brause.cc/nov.el.git") - (commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-path-to-unzip - (lambda _ - (substitute* "nov.el" - (("\\(executable-find \"unzip\"\\)") - (string-append "\"" (which "unzip") "\""))) - #t))))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-esxml" ,emacs-esxml))) - (inputs - `(("unzip" ,unzip))) - (home-page "https://depp.brause.cc/nov.el/") - (synopsis "Major mode for reading EPUBs in Emacs") - (description "@code{nov.el} provides a major mode for reading EPUB + ;; Upstream does not tag releases. Specify raw commit hash matching the + ;; release. + (let ((commit "ea0c835c1b5e6e70293f4bd64e9c89bdc42f8596")) + (package + (name "emacs-nov-el") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://depp.brause.cc/nov.el.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04phmm14ywgicjsl2bsg6w9rapd71vdkxdp5wp0brj6px27y85jz")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-path-to-unzip + (lambda _ + (substitute* "nov.el" + (("\\(executable-find \"unzip\"\\)") + (string-append "\"" (which "unzip") "\""))) + #t))))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-esxml" ,emacs-esxml))) + (inputs + `(("unzip" ,unzip))) + (home-page "https://depp.brause.cc/nov.el/") + (synopsis "Major mode for reading EPUBs in Emacs") + (description "@code{nov.el} provides a major mode for reading EPUB documents. Features: @@ -12472,7 +12475,7 @@ (define-public emacs-nov-el @item Image rescaling @end itemize ") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public epipe (package -- cgit v1.2.3 From 415b90f24ee83059102f5fb0ce74a2bc0954fe58 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Tue, 2 Jun 2020 21:32:32 +0200 Subject: gnu: network-manager-applet: Propagate 'libnma'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/gnome.scm (network-manager-applet)[inputs]: Move 'libnma' to … [propagated-inputs]: … here. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2be117d21b..7335dc1cd6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6807,10 +6807,11 @@ (define-public network-manager-applet ;; libnm-gtk.pc refers to all these. `(("dbus-glib" ,dbus-glib) ("gtk+" ,gtk+) - ("network-manager" ,network-manager))) + ("network-manager" ,network-manager) + ;; nm-applet need by org.gnome.nm-applet.gschema.xml + ("libnma" ,libnma))) (inputs `(("gcr" ,gcr) - ("libnma" ,libnma) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) -- cgit v1.2.3 From 55cdcf5f5582efb91242e7c1495ff1a2f8614a27 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 10:30:05 -0500 Subject: gnu: emacs-slack: Update to a6d9f49. * gnu/packages/emacs-xyz.scm (emacs-slack): Update to a6d9f49. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1f509a37a9..d7975707d3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11899,8 +11899,8 @@ (define-public emacs-tracking (license license:gpl3+))) (define-public emacs-slack - (let ((commit "b7b9eada0bf62d40dfe764b00f55913a2d3d742e") - (revision "7")) + (let ((commit "a6d9f49bc6161f12c594d25254e77eedf4a67666") + (revision "8")) (package (name "emacs-slack") (version (git-version "0.0.2" revision commit)) @@ -11912,7 +11912,7 @@ (define-public emacs-slack (file-name (git-file-name name commit)) (sha256 (base32 - "0cqr7jnfxzb0z2wy79pdwpv9cvmawjif1kin3zbp8q7zhwrq09v0")))) + "0crjjankqi4bqjk5pdz4r2ixf56n1nnq8ab1gz3sbl3v6as6262w")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2ca87aecd106afcf26c130d27b37583bfcc3e095 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 4 Jun 2020 10:45:44 -0500 Subject: gnu: emacs-treemacs: Update to 2.8. * gnu/packages/emacs-xyz.scm (emacs-treemacs): Update to 2.8. [arguments]: Do not prepare dependencies before testing. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d7975707d3..87797aabcc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19047,7 +19047,7 @@ (define-public emacs-pfuture (define-public emacs-treemacs (package (name "emacs-treemacs") - (version "2.6") + (version "2.8") (source (origin (method git-fetch) (uri (git-reference @@ -19056,7 +19056,7 @@ (define-public emacs-treemacs (file-name (git-file-name name version)) (sha256 (base32 - "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1")))) + "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) @@ -19078,7 +19078,9 @@ (define-public emacs-treemacs (add-after 'unpack 'fix-makefile (lambda _ (substitute* "Makefile" - (("@\\$\\(CASK\\) exec ") "")) + (("@\\$\\(CASK\\) exec ") "") + ;; Guix does not need to prepare dependencies before testing. + (("test: prepare") "test:")) #t)) (add-after 'fix-makefile 'chdir-elisp ;; Elisp directory is not in root of the source. -- cgit v1.2.3 From 790ada9168e0689c1c4607c61cdc1d2dbc327abf Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 30 May 2020 14:49:45 +0200 Subject: gnu: autorandr: Fix typo. * gnu/packages/xdisorg.scm (autorandr)[arguments]: Fix typo in bash completion directory. --- gnu/packages/xdisorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ee6b1a9ffd..d4acd90154 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -201,7 +201,7 @@ (define-public autorandr (invoke "make" (string-append "DESTDIR=" (assoc-ref outputs "out")) "PREFIX=" - "BASH_COMPLETIONS_DIR=etc/bash_completiond.d" + "BASH_COMPLETIONS_DIR=etc/bash_completion.d" "install" "TARGETS=autorandr launcher manpage bash_completion")))))) (synopsis "Auto-detect connected displays and load appropriate setup") -- cgit v1.2.3 From 80cd90ef30e78e3b483ee1d00993c9a9a4a096ac Mon Sep 17 00:00:00 2001 From: Fredrik Salomonsson Date: Thu, 4 Jun 2020 12:42:30 -0700 Subject: gnu: Add emacs-meson-mode. * gnu/packages/emacs-xyz.scm (emacs-meson-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 87797aabcc..188ecf45b6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22671,6 +22671,28 @@ (define-public emacs-no-littering files and subdirectories when appropriate.") (license license:gpl3+))) +(define-public emacs-meson-mode + (package + (name "emacs-meson-mode") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wentasah/meson-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1720b3hpfqd989zrgcns51jbjrv4vzl9di9mccl55vkmkbqzfin0")))) + (build-system emacs-build-system) + (home-page "https://github.com/wentasah/meson-mode") + (synopsis "Major mode for Meson build system files") + (description + "This is an Emacs major mode for Meson build system files. Syntax +highlighting works reliably. Indentation works too, but there are probably +cases where it breaks.") + (license license:gpl3+))) + (define-public emacs-message-x ;; Use the latest commit, as there are no tagged releases. (let ((commit "5524de7bbfdd8749c110f48de5afb024d9f83133") -- cgit v1.2.3 From 20a9d2f2804fef79afbcfb46ea793a8362e6b92b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jun 2020 23:23:38 +0200 Subject: gnu: emacs-modus-vivendi-theme: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-modus-vivendi-theme): Update to 0.9.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 188ecf45b6..d5c3896c05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21468,14 +21468,14 @@ (define-public emacs-modus-operandi-theme (define-public emacs-modus-vivendi-theme (package (name "emacs-modus-vivendi-theme") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-vivendi-theme-" version ".el")) (sha256 - (base32 "121nlr5w58j4q47rh9xjjf9wzb97yl2m1n2l6g58ck4vnarwndl1")))) + (base32 "0f6cd93q9vrxfmgg6ff85ixcmq6acvrirb3kwgkf7qv16w3ipcir")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible dark theme (WCAG AAA)") -- cgit v1.2.3 From e6d9e055ec7e211f462c76642ed1b96bb8a70e81 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jun 2020 23:24:06 +0200 Subject: gnu: emacs-modus-operandi-theme: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme): Update to 0.9.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 d5c3896c05..a111cbb99b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21447,14 +21447,14 @@ (define-public emacs-doom-themes (define-public emacs-modus-operandi-theme (package (name "emacs-modus-operandi-theme") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "modus-operandi-theme-" version ".el")) (sha256 - (base32 "0i8s6blkhx53m1jk1bblqs7fwlbn57xkxxhsp9famcj5m0xyfimb")))) + (base32 "0wzwhzpw5g719xxz58v5bjqb8gdz1xzqwxslgm9cng4y3hwy3igh")))) (build-system emacs-build-system) (home-page "https://gitlab.com/protesilaos/modus-themes") (synopsis "Accessible light theme (WCAG AAA)") -- cgit v1.2.3 From b7bb381ba3740d33652c2a8e7772c17b93b259cc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Jun 2020 17:32:23 +0200 Subject: bash completion: Complete file names after '-p' and '-C'. * etc/completion/bash/guix (_guix_is_dash_C, _guix_is_dash_p): New functions. (_guix_complete): Honor them for "install", "remove", "upgrade", "pull", and "time-machine". --- etc/completion/bash/guix | 53 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index 0333bfc8a2..650cf1d1ce 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +# Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès # # This file is part of GNU Guix. # @@ -115,6 +115,24 @@ _guix_is_dash_m () esac } } +_guix_is_dash_C () +{ + [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-C" ] \ + || { case "${COMP_WORDS[$COMP_CWORD]}" in + --channels=*) true;; + *) false;; + esac } +} + +_guix_is_dash_p () +{ + [ "${COMP_WORDS[$COMP_CWORD - 1]}" = "-p" ] \ + || { case "${COMP_WORDS[$COMP_CWORD]}" in + --profile=*) true;; + *) false;; + esac } +} + _guix_complete_file () { # Let Readline complete file names. @@ -169,13 +187,28 @@ _guix_complete () fi elif _guix_is_command "install" then - _guix_complete_available_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_available_package "$word_at_point" + fi elif _guix_is_command "remove" then - _guix_complete_installed_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_installed_package "$word_at_point" + fi elif _guix_is_command "upgrade" then - _guix_complete_installed_package "$word_at_point" + if _guix_is_dash_L || _guix_is_dash_m || _guix_is_dash_p + then + _guix_complete_file + else + _guix_complete_installed_package "$word_at_point" + fi elif _guix_is_command "build" then if _guix_is_dash_L || _guix_is_dash_m @@ -193,6 +226,18 @@ _guix_complete () 2) _guix_complete_subcommand;; *) _guix_complete_file;; # TODO: restrict to *.scm esac + elif _guix_is_command "pull" + then + if _guix_is_dash_C || _guix_is_dash_p + then + _guix_complete_file + fi + elif _guix_is_command "time-machine" + then + if _guix_is_dash_C + then + _guix_complete_file + fi elif _guix_is_command "container" then case $COMP_CWORD in -- cgit v1.2.3 From 538ca8dd65f0075cc65bcca18ed87f66a789290a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Jun 2020 18:09:11 +0200 Subject: bash completion: Complete sub-commands after 'guix time-machine'. * etc/completion/bash/guix (_guix_complete_subcommand): New function. (_guix_complete): Use it. For "time-machine", call '_guix_complete_subcommand' by default. --- etc/completion/bash/guix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/etc/completion/bash/guix b/etc/completion/bash/guix index 650cf1d1ce..df35919eb2 100644 --- a/etc/completion/bash/guix +++ b/etc/completion/bash/guix @@ -148,6 +148,17 @@ _guix_complete_pid () declare _guix_subcommands +_guix_complete_subcommand () +{ + if [ -z "$_guix_subcommands" ] + then + # Cache the list of subcommands to speed things up. + _guix_subcommands="$(guix --help 2> /dev/null \ + | grep '^ ' | cut -c 2-)" + fi + COMPREPLY=($(compgen -W "$_guix_subcommands" -- "$word_at_point")) +} + _guix_complete () { local word_count=${#COMP_WORDS[*]} @@ -165,13 +176,7 @@ _guix_complete () case $COMP_CWORD in 1) - if [ -z "$_guix_subcommands" ] - then - # Cache the list of subcommands to speed things up. - _guix_subcommands="$(guix --help 2> /dev/null \ - | grep '^ ' | cut -c 2-)" - fi - COMPREPLY=($(compgen -W "$_guix_subcommands" -- "$word_at_point")) + _guix_complete_subcommand ;; *) if _guix_is_command "package" @@ -237,6 +242,8 @@ _guix_complete () if _guix_is_dash_C then _guix_complete_file + else + _guix_complete_subcommand fi elif _guix_is_command "container" then -- cgit v1.2.3 From b54a1b504ea44a6fa6bc708d5198b0b6f34df15c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Jun 2020 23:25:54 +0200 Subject: gnu: guile-rsvg: Use 'git-fetch' instead of a generated archive. * gnu/packages/gtk.scm (guile-rsvg)[source]: Switch to GIT-FETCH. --- gnu/packages/gtk.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 24089668d2..eb1984fb20 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -943,13 +943,13 @@ (define-public guile-rsvg (version (string-append "2.18.1-" revision "." (string-take commit 7))) (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/wingo/guile-rsvg/" - "repository/archive.tar.gz?ref=" - commit)) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/wingo/guile-rsvg/") + (commit commit))) (sha256 (base32 - "0vdzjx8l5nc4y2xjqs0g1rqn1zrwfsm30brh5gz00r1x41a2pvv2")) + "0cnbl40df2sbhpc32cma6j6w312rfvcgbxxqaixgf0ymim3fb248")) (patches (search-patches "guile-rsvg-pkgconfig.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 0713929685d2fd1970df1b1ce238ee7bd6e892f8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Jun 2020 23:59:12 +0200 Subject: gnu: rosegarden: Update to 20.06. * gnu/packages/music.scm (rosegarden): Update to 20.06. --- 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 24192f89c7..a26c4fc250 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4132,14 +4132,14 @@ (define-public dssi (define-public rosegarden (package (name "rosegarden") - (version "19.12") + (version "20.06") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/rosegarden/rosegarden/" version "/rosegarden-" version ".tar.bz2")) (sha256 - (base32 "1qcaxc6hdzva7kwxxhgl95437fagjbxzv4mihsgpr7y9qk08ppw1")))) + (base32 "1i9x9rkqwwdrk77xl5ra8i48cjirbc7fbisnj0nnclccwaq0wk6r")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") -- cgit v1.2.3 From 7730f41afd90a9c3c83a56adfee09069da66a8e5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 4 Jun 2020 14:56:37 +0200 Subject: installer: final: Add some extra logging. * gnu/installer/final.scm (kill-cow-users): Log the killed process name, (umount-cow-store): inform that we are umounting the cow-store. --- gnu/installer/final.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 4c2da484c9..ece1aff95c 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -128,7 +128,7 @@ (define %not-nul (match (string-tokenize (read-string port) %not-nul) ((argv0 _ ...) (unless (member (pk (basename argv0)) spare) - (syslog "Killing process ~a~%" pid) + (syslog "Killing process ~a (~a)~%" pid argv0) (kill pid SIGKILL))) (_ #f)))))) pids))) @@ -146,6 +146,8 @@ (define (restart-service name) (catch #t (lambda () (let ((tmp-dir "/remove")) + (syslog "Unmounting cow-store.~%") + (mkdir-p tmp-dir) (mount (%store-directory) tmp-dir "" MS_MOVE) -- cgit v1.2.3 From 66294d7cfee011b80f13dfc87a69710d3460db07 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jun 2020 09:10:34 +0200 Subject: gnu: guix: Update to 7730f41afd. * gnu/packages/package-management.scm (guix): Update to 1.1.0-5.7730f41. --- 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 edb09224c0..5c192156c3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "bdc801e1cfa8e436890da5bd755dd7759cb0f748") - (revision 4)) + (commit "7730f41afd90a9c3c83a56adfee09069da66a8e5") + (revision 5)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "1wf30g45kh4nmcapd4vrcl6m2wjzly7v7dv8z0r584770i2yh836")) + "008ihwvcsj8y5wz4i9l28nv5gzi01v8j16zxv46gaxc736kinhxq")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 3a7fcfb34ef8cefb64c93d48e2d665a08fe3b8a1 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 5 Jun 2020 14:08:20 +0200 Subject: gnu: txr: Update to 239. * gnu/packages/lisp.scm (txr): Update to 239. [arguments]: Use cc-for-target. --- gnu/packages/lisp.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 498eee9526..a2e0f0724d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -800,7 +800,7 @@ (define-public confusion-mdl (define-public txr (package (name "txr") - (version "238") + (version "239") (source (origin (method git-fetch) @@ -809,15 +809,12 @@ (define-public txr (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0asdq4n828xb1m31s7f47mqcbjqkzxz11bwnw8v3f2249m93ync4")))) + (base32 "1jldpkd5f855m3z4zjpd1ha64f405pcdwwrnr8jnk66v22dsvdwx")))) (build-system gnu-build-system) (arguments `(#:configure-flags - (let ((target ,(%current-target-system))) - (list (string-append "cc=" (if target - (string-append target "-gcc") - "gcc")) - (string-append "--prefix=" (assoc-ref %outputs "out")))) + (list ,(string-append "cc=" (cc-for-target)) + (string-append "--prefix=" (assoc-ref %outputs "out"))) #:test-target "tests" #:phases (modify-phases %standard-phases -- cgit v1.2.3 From b2eae0e1427502b171347fb173bab2547560a707 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Mon, 1 Jun 2020 17:41:40 -0500 Subject: gnu: Add quantile-estimator. * gnu/packages/lisp-xyz.scm (sbcl-quantile-estimator, ecl-quantile-estimator, cl-quantile-estimator): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b78eec7f4d..df0424ef55 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11555,3 +11555,37 @@ (define-public sbcl-osicat (define-public cl-osicat (sbcl-package->cl-source-package sbcl-osicat)) + +(define-public sbcl-quantile-estimator + (package + (name "sbcl-quantile-estimator") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deadtrickster/quantile-estimator.cl") + (commit "84d0ea405d793f5e808c68c4ddaf25417b0ff8e5"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rlswkf0siaabsvvch3dgxmg45fw5w8pd9b7ri2w7a298aya52z9")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-system-name "quantile-estimator")) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/deadtrickster/quantile-estimator.cl") + (synopsis + "Effective computation of biased quantiles over data streams") + (description + "Common Lisp implementation of Graham Cormode and S. +Muthukrishnan's Effective Computation of Biased Quantiles over Data +Streams in ICDE’05.") + (license license:expat))) + +(define-public cl-quantile-estimator + (sbcl-package->cl-source-package sbcl-quantile-estimator)) + +(define-public ecl-quantile-estimator + (sbcl-package->ecl-package sbcl-quantile-estimator)) -- cgit v1.2.3 From 4c7c3077904cb7ce790bee4b463133b02133f335 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:38:19 +0200 Subject: gnu: Add cl-prometheus. * gnu/packages/lisp-xyz.scm (sbcl-prometheus, cl-prometheus, ecl-prometheus): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index df0424ef55..cfc699d0d0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11589,3 +11589,35 @@ (define-public cl-quantile-estimator (define-public ecl-quantile-estimator (sbcl-package->ecl-package sbcl-quantile-estimator)) + +(define-public sbcl-prometheus + (package + (name "sbcl-prometheus") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/deadtrickster/prometheus.cl.git") + (commit "7352b92296996ff383503e19bdd3bcea30409a15"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fzczls2kfgdx18pja4lqxjrz72i583185d8nq0pb3s331hhzh0z")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("local-time" ,sbcl-local-time) + ("quantile-estimator" ,sbcl-quantile-estimator))) + (home-page "https://github.com/deadtrickster/prometheus.cl") + (synopsis "Prometheus.io Common Lisp client") + (description "Prometheus.io Common Lisp client.") + (license license:expat))) + +(define-public cl-prometheus + (sbcl-package->cl-source-package sbcl-prometheus)) + +(define-public ecl-prometheus + (sbcl-package->ecl-package sbcl-prometheus)) -- cgit v1.2.3 From 4e21f5bcabafc4e1f3375f5f91059bed67b5a8e3 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:44:18 +0200 Subject: gnu: Add cl-prometheus.collectors.sbcl. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.collectors.sbcl, cl-prometheus.collectors.sbcl): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 cfc699d0d0..ceab76990d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11621,3 +11621,14 @@ (define-public cl-prometheus (define-public ecl-prometheus (sbcl-package->ecl-package sbcl-prometheus)) + +(define-public sbcl-prometheus.collectors.sbcl + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.collectors.sbcl") + (inputs `(("prometheus" ,sbcl-prometheus))) + (synopsis "Prometheus collector for SBCL metrics") + (description "Prometheus collector for SBCL metrics."))) + +(define-public cl-prometheus.collectors.sbcl + (sbcl-package->cl-source-package sbcl-prometheus.collectors.sbcl)) -- cgit v1.2.3 From b4ece1a291bbeb04c185a995df699fde022bd482 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:49:51 +0200 Subject: gnu: Add cl-prometheus.collectors.process. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.collectors.process, cl-prometheus.collectors.process, ecl-prometheus.collectors.process): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ceab76990d..96de71b4f0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11632,3 +11632,22 @@ (define-public sbcl-prometheus.collectors.sbcl (define-public cl-prometheus.collectors.sbcl (sbcl-package->cl-source-package sbcl-prometheus.collectors.sbcl)) + +(define-public sbcl-prometheus.collectors.process + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.collectors.process") + (inputs + `(("cffi" ,sbcl-cffi) + ("cffi-grovel" ,sbcl-cffi-grovel) + ("cl-fad" ,sbcl-cl-fad) + ("prometheus" ,sbcl-prometheus) + ("split-sequence" ,sbcl-split-sequence))) + (synopsis "Prometheus collector for process metrics") + (description "Prometheus collector for process metrics."))) + +(define-public cl-prometheus.collectors.process + (sbcl-package->cl-source-package sbcl-prometheus.collectors.process)) + +(define-public ecl-prometheus.collectors.process + (sbcl-package->ecl-package sbcl-prometheus.collectors.process)) -- cgit v1.2.3 From 78d1aa9eef788654ce3c8440a86927a219b3c4fa Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:55:17 +0200 Subject: gnu: Add cl-prometheus.formats.text. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.formats.text, cl-prometheus.formats.text, ecl-prometheus.formats.text): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 96de71b4f0..9af4b851fa 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11651,3 +11651,19 @@ (define-public cl-prometheus.collectors.process (define-public ecl-prometheus.collectors.process (sbcl-package->ecl-package sbcl-prometheus.collectors.process)) + +(define-public sbcl-prometheus.formats.text + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.formats.text") + (inputs + `(("alexandria" ,sbcl-alexandria) + ("prometheus" ,sbcl-prometheus))) + (synopsis "Prometheus client text format") + (description "Prometheus client text format."))) + +(define-public cl-prometheus.formats.text + (sbcl-package->cl-source-package sbcl-prometheus.formats.text)) + +(define-public ecl-prometheus.formats.text + (sbcl-package->ecl-package sbcl-prometheus.formats.text)) -- cgit v1.2.3 From 019ff3c3c74048a133263ccacac3db87e52bc00a Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 14:59:19 +0200 Subject: gnu: Add cl-prometheus.exposers.hunchentoot. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.exposers.hunchentoot, cl-prometheus.exposers.hunchentoot): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9af4b851fa..3156bc9de2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11667,3 +11667,19 @@ (define-public cl-prometheus.formats.text (define-public ecl-prometheus.formats.text (sbcl-package->ecl-package sbcl-prometheus.formats.text)) + +(define-public sbcl-prometheus.exposers.hunchentoot + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.exposers.hunchentoot") + (inputs + `(("hunchentoot" ,sbcl-hunchentoot) + ("prometheus" ,sbcl-prometheus) + ("prometheus.formats.text" ,sbcl-prometheus.formats.text) + ("salza2" ,sbcl-salza2) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (synopsis "Prometheus collector for Hunchentoot metrics") + (description "Prometheus collector for Hunchentoot metrics"))) + +(define-public cl-prometheus.exposers.hunchentoot + (sbcl-package->cl-source-package sbcl-prometheus.exposers.hunchentoot)) -- cgit v1.2.3 From 9e20646bf5210c8068150c9f75983badb6fd249c Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Fri, 5 Jun 2020 15:03:59 +0200 Subject: gnu: Add cl-prometheus.pushgateway. * gnu/packages/lisp-xyz.scm (sbcl-prometheus.pushgateway, cl-prometheus.pushgateway, ecl-prometheus.pushgateway): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 3156bc9de2..591615f4d1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11683,3 +11683,20 @@ (define-public sbcl-prometheus.exposers.hunchentoot (define-public cl-prometheus.exposers.hunchentoot (sbcl-package->cl-source-package sbcl-prometheus.exposers.hunchentoot)) + +(define-public sbcl-prometheus.pushgateway + (package + (inherit sbcl-prometheus) + (name "sbcl-prometheus.pushgateway") + (inputs + `(("drakma" ,sbcl-drakma) + ("prometheus" ,sbcl-prometheus) + ("prometheus.formats.text" ,sbcl-prometheus.formats.text))) + (synopsis "Prometheus Pushgateway client") + (description "Prometheus Pushgateway client."))) + +(define-public cl-prometheus.pushgateway + (sbcl-package->cl-source-package sbcl-prometheus.pushgateway)) + +(define-public ecl-prometheus.pushgateway + (sbcl-package->ecl-package sbcl-prometheus.pushgateway)) -- cgit v1.2.3 From 59dda9709af2f969865b6edb5e1505b934a90e5f Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:30:04 -0500 Subject: gnu: Add cl-uuid. * gnu/packages/lisp-xyz.scm (sbcl-uuid, cl-uuid, ecl-uuid): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 591615f4d1..13faa6ccb7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11700,3 +11700,35 @@ (define-public cl-prometheus.pushgateway (define-public ecl-prometheus.pushgateway (sbcl-package->ecl-package sbcl-prometheus.pushgateway)) + +(define-public sbcl-uuid + (let ((commit "e7d6680c3138385c0708f7aaf0c96622eeb140e8")) + (package + (name "sbcl-uuid") + (version (git-version "2012.12.26" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dardoria/uuid.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jnyp2kibcf5cwi60l6grjrj8wws9chasjvsw7xzwyym2lyid46f")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("ironclad" ,sbcl-ironclad) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (home-page "https://github.com/dardoria/uuid") + (synopsis + "Common Lisp implementation of UUIDs according to RFC4122") + (description + "Common Lisp implementation of UUIDs according to RFC4122.") + (license license:llgpl)))) + +(define-public cl-uuid + (sbcl-package->cl-source-package sbcl-uuid)) + +(define-public ecl-uuid + (sbcl-package->ecl-package sbcl-uuid)) -- cgit v1.2.3 From adf70454caef289fc263263c2373d648922a7a05 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:36:35 -0500 Subject: gnu: Add cl-dissect. * gnu/packages/lisp-xyz.scm (sbcl-dissect, cl-dissect, ecl-dissect): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 13faa6ccb7..24d961fadf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11732,3 +11732,35 @@ (define-public cl-uuid (define-public ecl-uuid (sbcl-package->ecl-package sbcl-uuid)) + +(define-public sbcl-dissect + (let ((commit "cffd38479f0e64e805f167bbdb240b783ecc8d45")) + (package + (name "sbcl-dissect") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/dissect.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rmsjkgjl90gl6ssvgd60hb0d5diyhsiyypvw9hbc0ripvbmk5r5")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre))) + (home-page "https://shinmera.github.io/dissect/") + (synopsis + "Introspection library for the call stack and restarts") + (description + "Dissect is a small Common Lisp library for introspecting the call stack +and active restarts.") + (license license:zlib)))) + +(define-public cl-dissect + (sbcl-package->cl-source-package sbcl-dissect)) + +(define-public ecl-dissect + (sbcl-package->ecl-package sbcl-dissect)) -- cgit v1.2.3 From 38d738e92bfc634f4d515247a5ac2719653e2735 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:39:18 -0500 Subject: gnu: Add cl-rove. * gnu/packages/lisp-xyz.scm (sbcl-rove, cl-rove, ecl-rove): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 24d961fadf..f6f523daf9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11764,3 +11764,39 @@ (define-public cl-dissect (define-public ecl-dissect (sbcl-package->ecl-package sbcl-dissect)) + +;; TODO: Uses ASDF's package-inferred-system which is not supported by +;; asdf-build-system/sbcl as of 2020-05-21. We should fix +;; asdf-build-system/sbcl. +(define-public sbcl-rove + (package + (name "sbcl-rove") + (version "0.9.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/rove.git") + (commit "f3695db08203bf26f3b861dc22ac0f4257d3ec21"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07ala4l2fncxf540fzxj3h5mhi9i4wqllhj0rqk8m2ljl5zbz89q")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("dissect" ,sbcl-dissect) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (home-page "https://github.com/fukamachi/rove") + (synopsis + "Yet another common lisp testing library") + (description + "Rove is a unit testing framework for Common Lisp applications. +This is intended to be a successor of Prove.") + (license license:bsd-3))) + +(define-public cl-rove + (sbcl-package->cl-source-package sbcl-rove)) + +(define-public ecl-rove + (sbcl-package->ecl-package sbcl-rove)) -- cgit v1.2.3 From aae3df1817ebb98891ce5866c908b3a9a009835a Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:47:09 -0500 Subject: gnu: Add cl-exponential-backoff. * gnu/packages/lisp-xyz.scm (sbcl-exponential-backoff, cl-exponential-backoff, ecl-exponential-backoff): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 f6f523daf9..62977f5e8b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11800,3 +11800,33 @@ (define-public cl-rove (define-public ecl-rove (sbcl-package->ecl-package sbcl-rove)) + +(define-public sbcl-exponential-backoff + (let ((commit "8d9e8444d8b3184a524c12ce3449f91613ab714f")) + (package + (name "sbcl-exponential-backoff") + (version (git-version "0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/death/exponential-backoff.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1389hm9hxv85s0125ja4js1bvh8ay4dsy9q1gaynjv27ynik6gmv")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/death/exponential-backoff") + (synopsis "Exponential backoff algorithm in Common Lisp") + (description + "An implementation of the exponential backoff algorithm in Common Lisp. +Inspired by the implementation found in Chromium. Read the header file to +learn about each of the parameters.") + (license license:expat)))) + +(define-public cl-exponential-backoff + (sbcl-package->cl-source-package sbcl-exponential-backoff)) + +(define-public ecl-exponential-backoff + (sbcl-package->ecl-package sbcl-exponential-backoff)) -- cgit v1.2.3 From 3e7362181c697babe9c3a1f6952cf16b3ad7fbce Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:52:20 -0500 Subject: gnu: Add cl-sxql. * gnu/packages/lisp-xyz.scm (sbcl-sxql, cl-sxql, ecl-sxql): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 62977f5e8b..e33f3b203a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11830,3 +11830,42 @@ (define-public cl-exponential-backoff (define-public ecl-exponential-backoff (sbcl-package->ecl-package sbcl-exponential-backoff)) + +(define-public sbcl-sxql + (let ((commit "5aa8b739492c5829e8623432b5d46482263990e8")) + (package + (name "sbcl-sxql") + (version (git-version "0.1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/sxql.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0k25p6w2ld9cn8q8s20lda6yjfyp4q89219sviayfgixnj27avnj")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:test-asd-file "sxql-test.asd")) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cl-syntax-annot" ,sbcl-cl-syntax-annot) + ("iterate" ,sbcl-iterate) + ("optima" ,sbcl-optima) + ("split-sequence" ,sbcl-split-sequence) + ("trivial-types" ,sbcl-trivial-types))) + (native-inputs + `(("prove" ,sbcl-prove) + ("prove-asdf" ,sbcl-prove-asdf))) + (home-page "https://github.com/fukamachi/sxql") + (synopsis "SQL generator for Common Lisp") + (description "SQL generator for Common Lisp.") + (license license:bsd-3)))) + +(define-public cl-sxql + (sbcl-package->cl-source-package sbcl-sxql)) + +(define-public ecl-sxql + (sbcl-package->ecl-package sbcl-sxql)) -- cgit v1.2.3 From 1f9999df4a104558454d36d4aab821c9d5c631fd Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 2 Jun 2020 12:55:36 -0500 Subject: gnu: Add cl-1am. * gnu/packages/lisp-xyz.scm (sbcl-1am, cl-1am, ecl-1am): New variables. Signed-off-by: Guillaume Le Vaillant --- 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 e33f3b203a..1bb6c4b55c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11869,3 +11869,32 @@ (define-public cl-sxql (define-public ecl-sxql (sbcl-package->ecl-package sbcl-sxql)) + +(define-public sbcl-1am + (let ((commit "8b1da94eca4613fd8a20bdf63f0e609e379b0ba5")) + (package + (name "sbcl-1am") + (version (git-version "0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lmj/1am.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05ss4nz1jb9kb796295482b62w5cj29msfj8zis33sp2rw2vmv2g")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-system-name "1am")) + (home-page "https://github.com/lmj/1am") + (synopsis "Minimal testing framework for Common Lisp") + (description "A minimal testing framework for Common Lisp.") + (license license:expat)))) + +(define-public cl-1am + (sbcl-package->cl-source-package sbcl-1am)) + +(define-public ecl-1am + (sbcl-package->ecl-package sbcl-1am)) -- cgit v1.2.3 From ea924134f819eef072ba7df9080d39de97fd73e6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jun 2020 12:28:12 +0200 Subject: tests: syscall: Support file-systems without extended attributes. * tests/syscalls.scm (setxattr): Catch ENOTSUP that can be raised if the file-system does not support extended user attributes. --- tests/syscalls.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 6098a09437..6acaa0b131 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 David Thompson ;;; Copyright © 2020 Simon South +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -276,8 +277,14 @@ (define perform-container-tests? (let ((key "user.translator") (value "/hurd/pfinet\0") (file (open-file temp-file "w0"))) - (setxattr temp-file key value) - (string=? (getxattr temp-file key) value))) + (catch 'system-error + (lambda () + (setxattr temp-file key value) + (string=? (getxattr temp-file key) value)) + (lambda args + ;; Accept ENOTSUP, if the file-system does not support extended user + ;; attributes. + (memv (system-error-errno args) (list ENOTSUP)))))) (false-if-exception (delete-file temp-file)) (test-equal "fcntl-flock wait" -- cgit v1.2.3 From 6f07472ab2ded3effd98565330b1f8b21d721961 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jun 2020 19:23:27 +0200 Subject: gnu: guix: Update to ea924134f8. Update Guix to include ea924134f819eef072ba7df9080d39de97fd73e6, that fixes a test failure that can occur when running from a file-system without user_xattr support. * gnu/packages/package-management.scm (guix): Update to 1.1.0-6.ea92413. --- 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 5c192156c3..ecaebac291 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -118,8 +118,8 @@ (define-public guix ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.1.0") - (commit "7730f41afd90a9c3c83a56adfee09069da66a8e5") - (revision 5)) + (commit "ea924134f819eef072ba7df9080d39de97fd73e6") + (revision 6)) (package (name "guix") @@ -135,7 +135,7 @@ (define-public guix (commit commit))) (sha256 (base32 - "008ihwvcsj8y5wz4i9l28nv5gzi01v8j16zxv46gaxc736kinhxq")) + "08likdidf3k1zqf8821h6a84dsrvgbdhridhkzpjymc2c884j0w4")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2d84d653164ea932540bd27e518a2ed6f8658f96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 21:43:49 +0200 Subject: gnu: synapse: Update to 1.14.0. * gnu/packages/matrix.scm (synapse): Update to 1.14.0. --- gnu/packages/matrix.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 7bbdc09688..002c1b530d 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Alex ter Weele +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,15 +60,15 @@ (define-public python-matrix-synapse-ldap3 (define-public synapse (package (name "synapse") - (version "1.11.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (pypi-uri "matrix-synapse" version)) (sha256 (base32 - "0cqbwcz0fi4w413s1kcxvf696qi4n46n1k4ggnygqri5yq26qlfy")))) + "09drdqcjvpk9s3hq5rx9yxsxq0wak5fg5gfaiqfnbnxav2c2v7kq")))) (build-system python-build-system) - ;; TODO I think there are custom tests + ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. (propagated-inputs `(("python-simplejson" ,python-simplejson) ; not attested but required ;; requirements (synapse/python_dependencies.py) @@ -100,6 +101,7 @@ (define-public synapse ("python-bleach" ,python-bleach) ("python-typing-extensions" ,python-typing-extensions) ;; conditional requirements (synapse/python_dependencies.py) + ;;("python-hiredis" ,python-hiredis) ("python-matrix-synapse-ldap3" ,python-matrix-synapse-ldap3) ("python-psycopg2" ,python-psycopg2) ("python-jinja2" ,python-jinja2) -- cgit v1.2.3 From d57eae24a4f8d936b3603526dbc03b7af253838f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jun 2020 21:51:35 +0200 Subject: gnu: fetchmail: Update to 6.4.6. * gnu/packages/mail.scm (fetchmail): Update to 6.4.6. --- 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 a408c84dfb..67ed8c4b68 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -347,7 +347,7 @@ (define-public nullmailer (define-public fetchmail (package (name "fetchmail") - (version "6.4.5") + (version "6.4.6") (source (origin (method url-fetch) @@ -355,7 +355,7 @@ (define-public fetchmail (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk")))) + (base32 "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3 From 9cd1b802fb000583cefafb9ccd35b87949fbb888 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2020 01:29:14 +0200 Subject: gnu: man-db: Update to 2.9.2. * gnu/packages/man.scm (man-db): Update to 2.9.2. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 4dfac4f87b..779781f822 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -62,14 +62,14 @@ (define-public libpipeline (define-public man-db (package (name "man-db") - (version "2.9.1") + (version "2.9.2") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/man-db/man-db-" version ".tar.xz")) (sha256 (base32 - "0ky7aq8313xa1y0zdwdbz5yvjfjb3xy0xymbimd2d9q9bky8lgds")))) + "0z04kwv5ymmd0pzadpaag696jfckg6rbz8x4jrgj09bmqqk3yf3v")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f0bebc570614dbe052edca956f7bab2c593379ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Jun 2020 19:05:51 +0200 Subject: gnu: iproute2: Update to 5.7.0. * gnu/packages/linux.scm (iproute): Update to 5.7.0. --- 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 35b4d73b51..f61ce864af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2072,7 +2072,7 @@ (define-public ebtables (define-public iproute (package (name "iproute2") - (version "5.5.0") + (version "5.7.0") (source (origin (method url-fetch) (uri (string-append @@ -2080,7 +2080,7 @@ (define-public iproute version ".tar.xz")) (sha256 (base32 - "0ywg70f98wgfai35jl47xzpjp45a6n7crja4vc8ql85cbi1l7ids")))) + "088gs56iqhdlpw1iqjwrss4zxd4zbl2wl8s2implrrdajjxcfpbj")))) (build-system gnu-build-system) (arguments `( ;; There is a test suite, but it wants network namespaces and sudo. -- cgit v1.2.3 From 28d6b57c38abf8843ef02d85178755790db824a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 17:02:03 +0200 Subject: gnu: singular: Update to 4.1.3p1. * gnu/packages/algebra.scm (singular): Update to 4.1.3p1. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 4df2e96ecd..1008d24cd3 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -609,7 +609,7 @@ (define-public ntl (define-public singular (package (name "singular") - (version "4.1.2p1") + (version "4.1.3p1") (source (origin (method url-fetch) @@ -623,7 +623,7 @@ (define-public singular #\.) "-") "/singular-" version ".tar.gz")) (sha256 (base32 - "0kvd55353fiqyq1msmi0kka66n5h0aqs7m3km60r01b1w2f8085m")))) + "1f02mrjwh7pd3pydfvjxsw5rph2qmkg1idwqrdsax924sa77sljw")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 53428597a690b409cdb66070ca4397ed76015e20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:02:03 +0200 Subject: gnu: strace: Update to 5.7. * gnu/packages/linux.scm (strace): Update to 5.7. [arguments]: Disable three failing tests. --- gnu/packages/linux.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f61ce864af..745370b8f8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1788,7 +1788,7 @@ (define-public zerofree (define-public strace (package (name "strace") - (version "5.5") + (version "5.7") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -1796,7 +1796,7 @@ (define-public strace "/strace-" version ".tar.xz")) (sha256 (base32 - "1zrhpzjlgfwfl8dd53llswmmharm5rbi0zch7lln5sjris69an4z")))) + "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1805,6 +1805,12 @@ (define-public strace (lambda _ (substitute* "strace.c" (("/bin/sh") (which "sh"))) + #t)) + (add-after 'unpack 'disable-failing-tests + (lambda _ + ;; XXX These hang forever even if the test time-out is extended. + (substitute* "tests/Makefile.in" + (("^\tstrace-DD?D?\\.test \\\\.*") "")) #t))) ;; Don't fail if the architecture doesn't support different personalities. #:configure-flags '("--enable-mpers=check") -- cgit v1.2.3 From 1860b4152360a18ac562690c1f541e53537bf262 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:45:11 +0200 Subject: gnu: websocketpp: Update to 0.8.2. * gnu/packages/web.scm (websocketpp): Update to 0.8.2. [source]: Replace patch. * gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch: Delete file. * gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 2 +- .../patches/websocketpp-fix-for-boost-1.70.patch | 103 --------------------- .../patches/websocketpp-fix-for-cmake-3.15.patch | 17 ++++ gnu/packages/web.scm | 6 +- 4 files changed, 21 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch create mode 100644 gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01ec893310..5dc0909efd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1588,7 +1588,7 @@ dist_patch_DATA = \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ %D%/packages/patches/webkitgtk-share-store.patch \ - %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ + %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ diff --git a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch b/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch deleted file mode 100644 index ece414a1cb..0000000000 --- a/gnu/packages/patches/websocketpp-fix-for-boost-1.70.patch +++ /dev/null @@ -1,103 +0,0 @@ -This patch for Boost >= 1.70 was made by merging two patches that -are in the 'develop' branch (c769c92 and f810ca2). - -diff -u b/websocketpp/transport/asio/connection.hpp b/websocketpp/transport/asio/connection.hpp ---- b/websocketpp/transport/asio/connection.hpp -+++ b/websocketpp/transport/asio/connection.hpp -@@ -311,9 +311,10 @@ - * needed. - */ - timer_ptr set_timer(long duration, timer_handler callback) { -- timer_ptr new_timer = lib::make_shared( -- lib::ref(*m_io_service), -- lib::asio::milliseconds(duration) -+ timer_ptr new_timer( -+ new lib::asio::steady_timer( -+ *m_io_service, -+ lib::asio::milliseconds(duration)) - ); - - if (config::enable_multithreading) { -@@ -461,8 +462,7 @@ - m_io_service = io_service; - - if (config::enable_multithreading) { -- m_strand = lib::make_shared( -- lib::ref(*io_service)); -+ m_strand.reset(new lib::asio::io_service::strand(*io_service)); - } - - lib::error_code ec = socket_con_type::init_asio(io_service, m_strand, -diff -u b/websocketpp/transport/asio/endpoint.hpp b/websocketpp/transport/asio/endpoint.hpp ---- b/websocketpp/transport/asio/endpoint.hpp -+++ b/websocketpp/transport/asio/endpoint.hpp -@@ -195,8 +195,7 @@ - - m_io_service = ptr; - m_external_io_service = true; -- m_acceptor = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_acceptor.reset(new lib::asio::ip::tcp::acceptor(*m_io_service)); - - m_state = READY; - ec = lib::error_code(); -@@ -688,9 +687,7 @@ - * @since 0.3.0 - */ - void start_perpetual() { -- m_work = lib::make_shared( -- lib::ref(*m_io_service) -- ); -+ m_work.reset(new lib::asio::io_service::work(*m_io_service)); - } - - /// Clears the endpoint's perpetual flag, allowing it to exit when empty -@@ -854,8 +851,7 @@ - - // Create a resolver - if (!m_resolver) { -- m_resolver = lib::make_shared( -- lib::ref(*m_io_service)); -+ m_resolver.reset(new lib::asio::ip::tcp::resolver(*m_io_service)); - } - - tcon->set_uri(u); -unchanged: ---- a/websocketpp/transport/asio/security/none.hpp -+++ b/websocketpp/transport/asio/security/none.hpp -@@ -168,8 +168,7 @@ protected: - return socket::make_error_code(socket::error::invalid_state); - } - -- m_socket = lib::make_shared( -- lib::ref(*service)); -+ m_socket.reset(new lib::asio::ip::tcp::socket(*service)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, *m_socket); -unchanged: ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -193,8 +193,7 @@ protected: - if (!m_context) { - return socket::make_error_code(socket::error::invalid_tls_context); - } -- m_socket = lib::make_shared( -- _WEBSOCKETPP_REF(*service),lib::ref(*m_context)); -+ m_socket.reset(new socket_type(*service, *m_context)); - - if (m_socket_init_handler) { - m_socket_init_handler(m_hdl, get_socket()); -only in patch2: -unchanged: ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - endif () - - if (NOT Boost_USE_STATIC_LIBS) -- add_definitions (/DBOOST_TEST_DYN_LINK) -+ add_definitions (-DBOOST_TEST_DYN_LINK) - endif () - - set (Boost_FIND_REQUIRED TRUE) diff --git a/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch b/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch new file mode 100644 index 0000000000..ea759d022b --- /dev/null +++ b/gnu/packages/patches/websocketpp-fix-for-cmake-3.15.patch @@ -0,0 +1,17 @@ +From: Tobias Geerinckx-Rice +Date: Fri, 05 Jun 2020 18:37:51 +0200 +Subject: [PATCH] gnu: websocketpp: Fix build with CMake >= 3.15. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57ed01e78..43c772d78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ + set (Boost_USE_MULTITHREADED TRUE) + set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! + +- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") ++ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) + + if (Boost_FOUND) + # Boost is a project wide global dependency. diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bd46ac9c2c..30ef341fa3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1178,7 +1178,7 @@ (define-public wabt (define-public websocketpp (package (name "websocketpp") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -1187,8 +1187,8 @@ (define-public websocketpp (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy")) - (patches (search-patches "websocketpp-fix-for-boost-1.70.patch")))) + (base32 "1ww4fhl8qf12hkv6jaild8zzsygdspxm1gqpk2f63gv1xfi31wpm")) + (patches (search-patches "websocketpp-fix-for-cmake-3.15.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("openssl" ,openssl))) -- cgit v1.2.3 From 98a76dd8f3f0f367ac4f1513d36b95caa3159c46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:47:00 +0200 Subject: gnu: docker, docker-cli: Update to 19.03.9. * gnu/packages/docker.scm (%docker-version): Update to 19.03.9. (docker, docker-cli): Update hashes. --- gnu/packages/docker.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index bf009a792b..aeb43a6393 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson ;;; Copyright © 2018 Efraim Flashner -;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; @@ -47,7 +47,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization)) -(define %docker-version "19.03.7") +(define %docker-version "19.03.9") (define-public python-docker-py (package @@ -314,7 +314,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sik109lxmiwgrsnvfip1nnal1xkh8z1mlvys6aknjyh29ll1iq8")) + (base32 "1a9hkprkix5d7lqi88r8svvfpzh1qbzw9nrkp11lxrcf9wdan4hg")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -592,7 +592,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "164l33npy8acdbbrz8vcyiwx18vi55wwwikkasg0w43b5bdhz8sx")))) + (base32 "1599ff7699p3m925rdyfg7gl3cga6gy0lli7qh2ybyiw2kwf4gj9")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" -- cgit v1.2.3 From a0e5111eb14faf92d1241614486aa5bee1e8e41e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 18:58:02 +0200 Subject: gnu: diffoscope: Remove redundant let binding. * gnu/packages/diffoscope.scm (diffoscope): Unbind VERSION. --- gnu/packages/diffoscope.scm | 315 ++++++++++++++++++++++---------------------- 1 file changed, 157 insertions(+), 158 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 0c780932eb..99922ab5a4 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -70,163 +70,162 @@ (define-module (gnu packages diffoscope) #:use-module (ice-9 match)) (define-public diffoscope - (let ((version "145")) - (package - (name "diffoscope") - (version version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - ;; setup.py mistakenly requires python-magic from PyPi, even - ;; though the Python bindings of `file` are sufficient. - ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 - (add-after 'unpack 'dependency-on-python-magic - (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 - (lambda _ - (delete-file "tests/comparators/test_berkeley_db.py") - #t)) - ;; Test is dynamically generated and may have false - ;; negatives with different ocaml versions. Further - ;; background in: https://bugs.debian.org/939386 - (add-after 'unpack 'remove-ocaml-test - (lambda _ - (substitute* "tests/comparators/test_ocaml.py" - (("def test_diff.differences.:") - "def skip_test_diff(differences):")) - #t)) - (add-after 'unpack 'skip-elf-tests - ;; FIXME: libmix_differences test added in 125, and is - ;; failing, need to explore why... - (lambda _ - (substitute* "tests/comparators/test_elf.py" - (("def test_libmix_differences.libmix_differences.:") - "def skip_test_libmix_differences(libmix_differences):")) - #t)) - (add-after 'unpack 'embed-tool-references - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "diffoscope/comparators/utils/compare.py" - (("\\['xxd',") - (string-append "['" (which "xxd") "',"))) - (substitute* "diffoscope/comparators/elf.py" - (("@tool_required\\('readelf'\\)") "") - (("get_tool_name\\('readelf'\\)") - (string-append "'" (which "readelf") "'"))) - (substitute* "diffoscope/comparators/directory.py" - (("@tool_required\\('stat'\\)") "") - (("@tool_required\\('getfacl'\\)") "") - (("\\['stat',") - (string-append "['" (which "stat") "',")) - (("\\['getfacl',") - (string-append "['" (which "getfacl") "',"))) - #t)) - (add-before 'check 'writable-test-data - (lambda _ - ;; tests may need needs write access to tests - ;; directory - (for-each make-file-writable (find-files "tests")) - #t)) - (add-before 'check 'delete-failing-test - (lambda _ - ;; this requires /sbin to be on the path - (delete-file "tests/test_tools.py") - #t))))) - (inputs `(("rpm" ,rpm) ;for rpm-python - ("python-file" ,python-file) - ("python-debian" ,python-debian) - ("python-libarchive-c" ,python-libarchive-c) - ("python-tlsh" ,python-tlsh) - ("acl" ,acl) ;for getfacl - ("colordiff" ,colordiff) - ("xxd" ,xxd))) - ;; Below are modules used for tests. - (native-inputs `(("python-pytest" ,python-pytest) - ("python-chardet" ,python-chardet) - ("python-binwalk" ,python-binwalk) - ("python-h5py" ,python-h5py) - ("python-pypdf2" ,python-pypdf2) - ("python-progressbar33" ,python-progressbar33) - ;; test suite skips tests when tool is missing - ,@(match (%current-system) - ;; ghc is only available on x86 currently. - ((or "x86_64-linux" "i686-linux") - `(("ghc" ,ghc))) - (_ - `())) - ,@(match (%current-system) - ;; openjdk and dependent packages are only - ;; available on x86_64 currently. - ((or "x86_64-linux") - `(("enjarify" ,enjarify) - ;; no unversioned openjdk available - ("openjdk:jdk" ,openjdk12 "jdk") - )) - (_ - `())) - ("abootimg" ,abootimg) - ("bdb" ,bdb) - ("binutils" ,binutils) - ("bzip2" ,bzip2) - ("cdrtools" ,cdrtools) - ("colord" ,colord) - ("cpio" ,cpio) - ("docx2txt" ,docx2txt) - ("dtc" ,dtc) - ("e2fsprogs" ,e2fsprogs) - ("ffmpeg" ,ffmpeg) - ("gettext" ,gettext-minimal) - ("ghostscript" ,ghostscript) - ("giflib:bin" ,giflib "bin") - ("gnumeric" ,gnumeric) - ("gnupg" ,gnupg) - ("hdf5" ,hdf5) - ("imagemagick" ,imagemagick) - ("libarchive" ,libarchive) - ("llvm" ,llvm) - ("lz4" ,lz4) - ("mono" ,mono) - ("ocaml" ,ocaml) - ("odt2txt" ,odt2txt) - ("openssh" ,openssh) - ("openssl" ,openssl) - ("pgpdump" ,pgpdump) - ("poppler" ,poppler) - ("python-jsbeautifier" ,python-jsbeautifier) - ("r-minimal" ,r-minimal) - ("rpm" ,rpm) - ("sng" ,sng) - ("sqlite" ,sqlite) - ("squashfs-tools" ,squashfs-tools) - ("tcpdump" ,tcpdump) - ("unzip" ,unzip) - ("wabt" ,wabt) - ("xxd" ,xxd) - ("xz" ,xz) - ("zip" ,zip) - ("zstd" ,zstd))) - (home-page "https://diffoscope.org/") - (synopsis "Compare files, archives, and directories in depth") - (description - "Diffoscope tries to get to the bottom of what makes files or directories + (package + (name "diffoscope") + (version "145") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/reproducible-builds/diffoscope.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + ;; setup.py mistakenly requires python-magic from PyPi, even + ;; though the Python bindings of `file` are sufficient. + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 + (add-after 'unpack 'dependency-on-python-magic + (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 + (lambda _ + (delete-file "tests/comparators/test_berkeley_db.py") + #t)) + ;; Test is dynamically generated and may have false + ;; negatives with different ocaml versions. Further + ;; background in: https://bugs.debian.org/939386 + (add-after 'unpack 'remove-ocaml-test + (lambda _ + (substitute* "tests/comparators/test_ocaml.py" + (("def test_diff.differences.:") + "def skip_test_diff(differences):")) + #t)) + (add-after 'unpack 'skip-elf-tests + ;; FIXME: libmix_differences test added in 125, and is + ;; failing, need to explore why... + (lambda _ + (substitute* "tests/comparators/test_elf.py" + (("def test_libmix_differences.libmix_differences.:") + "def skip_test_libmix_differences(libmix_differences):")) + #t)) + (add-after 'unpack 'embed-tool-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "diffoscope/comparators/utils/compare.py" + (("\\['xxd',") + (string-append "['" (which "xxd") "',"))) + (substitute* "diffoscope/comparators/elf.py" + (("@tool_required\\('readelf'\\)") "") + (("get_tool_name\\('readelf'\\)") + (string-append "'" (which "readelf") "'"))) + (substitute* "diffoscope/comparators/directory.py" + (("@tool_required\\('stat'\\)") "") + (("@tool_required\\('getfacl'\\)") "") + (("\\['stat',") + (string-append "['" (which "stat") "',")) + (("\\['getfacl',") + (string-append "['" (which "getfacl") "',"))) + #t)) + (add-before 'check 'writable-test-data + (lambda _ + ;; tests may need needs write access to tests + ;; directory + (for-each make-file-writable (find-files "tests")) + #t)) + (add-before 'check 'delete-failing-test + (lambda _ + ;; this requires /sbin to be on the path + (delete-file "tests/test_tools.py") + #t))))) + (inputs `(("rpm" ,rpm) ;for rpm-python + ("python-file" ,python-file) + ("python-debian" ,python-debian) + ("python-libarchive-c" ,python-libarchive-c) + ("python-tlsh" ,python-tlsh) + ("acl" ,acl) ;for getfacl + ("colordiff" ,colordiff) + ("xxd" ,xxd))) + ;; Below are modules used for tests. + (native-inputs `(("python-pytest" ,python-pytest) + ("python-chardet" ,python-chardet) + ("python-binwalk" ,python-binwalk) + ("python-h5py" ,python-h5py) + ("python-pypdf2" ,python-pypdf2) + ("python-progressbar33" ,python-progressbar33) + ;; test suite skips tests when tool is missing + ,@(match (%current-system) + ;; ghc is only available on x86 currently. + ((or "x86_64-linux" "i686-linux") + `(("ghc" ,ghc))) + (_ + `())) + ,@(match (%current-system) + ;; openjdk and dependent packages are only + ;; available on x86_64 currently. + ((or "x86_64-linux") + `(("enjarify" ,enjarify) + ;; no unversioned openjdk available + ("openjdk:jdk" ,openjdk12 "jdk") + )) + (_ + `())) + ("abootimg" ,abootimg) + ("bdb" ,bdb) + ("binutils" ,binutils) + ("bzip2" ,bzip2) + ("cdrtools" ,cdrtools) + ("colord" ,colord) + ("cpio" ,cpio) + ("docx2txt" ,docx2txt) + ("dtc" ,dtc) + ("e2fsprogs" ,e2fsprogs) + ("ffmpeg" ,ffmpeg) + ("gettext" ,gettext-minimal) + ("ghostscript" ,ghostscript) + ("giflib:bin" ,giflib "bin") + ("gnumeric" ,gnumeric) + ("gnupg" ,gnupg) + ("hdf5" ,hdf5) + ("imagemagick" ,imagemagick) + ("libarchive" ,libarchive) + ("llvm" ,llvm) + ("lz4" ,lz4) + ("mono" ,mono) + ("ocaml" ,ocaml) + ("odt2txt" ,odt2txt) + ("openssh" ,openssh) + ("openssl" ,openssl) + ("pgpdump" ,pgpdump) + ("poppler" ,poppler) + ("python-jsbeautifier" ,python-jsbeautifier) + ("r-minimal" ,r-minimal) + ("rpm" ,rpm) + ("sng" ,sng) + ("sqlite" ,sqlite) + ("squashfs-tools" ,squashfs-tools) + ("tcpdump" ,tcpdump) + ("unzip" ,unzip) + ("wabt" ,wabt) + ("xxd" ,xxd) + ("xz" ,xz) + ("zip" ,zip) + ("zstd" ,zstd))) + (home-page "https://diffoscope.org/") + (synopsis "Compare files, archives, and directories in depth") + (description + "Diffoscope tries to get to the bottom of what makes files or directories different. It recursively unpacks archives of many kinds and transforms various binary formats into more human readable forms to compare them. It can compare two tarballs, ISO images, or PDFs just as easily. @@ -234,7 +233,7 @@ (define-public diffoscope Diffoscope has many optional dependencies; @code{diffoscope --list-missing-tools guix} will display optional packages to install.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public reprotest (package -- cgit v1.2.3 From ba6d3612550f5d978c4b5b1df122444f8fb29377 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 19:06:11 +0200 Subject: gnu: diffoscope: Update to 146. * gnu/packages/diffoscope.scm (diffoscope): Update to 146. --- 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 99922ab5a4..f6f402b315 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-module (gnu packages diffoscope) (define-public diffoscope (package (name "diffoscope") - (version "145") + (version "146") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (define-public diffoscope (file-name (git-file-name name version)) (sha256 (base32 - "01n7q3q0hib4bd8gcq0yjghy5zhp0fh0bq1jxrn2ww8zyd4knmc3")))) + "07kd3vshf4wlm0mv3mp6ljbxjq80mcg52w5ks6si1gnpzfbfz07p")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ecab53c320b1584a08f811b17a92bd9a50a50ff3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Jun 2020 21:30:56 +0200 Subject: gnu: boost-signals2: Update hash. Reported by pkill9 on #guix. * gnu/packages/boost.scm (boost-signals2)[source]: Fix the hash. --- gnu/packages/boost.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index d28c58d663..9e7c40cd99 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -322,7 +322,7 @@ (define-public boost-signals2 (file-name (git-file-name name version)) (sha256 (base32 - "1nayaqshhzr1n6jj43bpvvay36d5gn075h0b95psii5x8ingszdk")))) + "13i5j43nggb46i6qpaf7gk53i7zp7pimphl7sydyfqz2m9yx5cdy")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 41f443c90af57f9537eccb1a1a45c6e11b377a32 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 17:48:11 +0200 Subject: Add (guix git-authenticate). * build-aux/git-authenticate.scm (commit-signing-key) (read-authorizations, commit-authorized-keys, authenticate-commit) (load-keyring-from-blob, load-keyring-from-reference) (authenticate-commits, authenticated-commit-cache-file) (previously-authenticated-commits, cache-authenticated-commit): Remove. * build-aux/git-authenticate.scm (git-authenticate): Pass #:default-authorizations to 'authenticate-commits'. * guix/git-authenticate.scm: New file, with code taken from 'build-aux/git-authenticate.scm'. Remove references to '%historical-authorized-signing-keys' and add #:default-authorizations parameter instead. * Makefile.am (MODULES): Add it. (authenticate): Depend on guix/git-authenticate.go. --- Makefile.am | 3 +- build-aux/git-authenticate.scm | 203 ++-------------------------------- guix/git-authenticate.scm | 244 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+), 197 deletions(-) create mode 100644 guix/git-authenticate.scm diff --git a/Makefile.am b/Makefile.am index 5b64386b53..db30004b1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,6 +104,7 @@ MODULES = \ guix/lint.scm \ guix/glob.scm \ guix/git.scm \ + guix/git-authenticate.scm \ guix/graph.scm \ guix/cache.scm \ guix/cve.scm \ @@ -632,7 +633,7 @@ commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac # Authenticate the current Git checkout by checking signatures on every commit # starting from $(commit_v1_0_1). -authenticate: guix/openpgp.go guix/git.go +authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go $(AM_V_at)echo "Authenticating Git checkout..." ; \ "$(top_builddir)/pre-inst-env" $(GUILE) \ --no-auto-compile -e git-authenticate \ diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 8e679fd5e5..5e1fdaaa24 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -22,21 +22,16 @@ ;;; (use-modules (git) - (guix git) - (guix openpgp) (guix base16) - ((guix utils) - #:select (cache-directory with-atomic-file-output)) - ((guix build utils) #:select (mkdir-p)) + (guix git) + (guix git-authenticate) (guix i18n) + ((guix openpgp) + #:select (openpgp-public-key-fingerprint + openpgp-format-fingerprint)) (guix progress) (srfi srfi-1) - (srfi srfi-11) (srfi srfi-26) - (srfi srfi-34) - (srfi srfi-35) - (rnrs bytevectors) - (rnrs io ports) (ice-9 match) (ice-9 format) (ice-9 pretty-print)) @@ -231,195 +226,9 @@ (define %unsigned-commits ;; Commits lacking a signature. '()) -(define (commit-signing-key repo commit-id keyring) - "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception -if the commit is unsigned, has an invalid signature, or if its signing key is -not in KEYRING." - (let-values (((signature signed-data) - (catch 'git-error - (lambda () - (commit-extract-signature repo commit-id)) - (lambda _ - (values #f #f))))) - (unless signature - (raise (condition - (&message - (message (format #f (G_ "commit ~a lacks a signature") - commit-id)))))) - - (let ((signature (string->openpgp-packet signature))) - (with-fluids ((%default-port-encoding "UTF-8")) - (let-values (((status data) - (verify-openpgp-signature signature keyring - (open-input-string signed-data)))) - (match status - ('bad-signature - ;; There's a signature but it's invalid. - (raise (condition - (&message - (message (format #f (G_ "signature verification failed \ -for commit ~a") - (oid->string commit-id))))))) - ('missing-key - (raise (condition - (&message - (message (format #f (G_ "could not authenticate \ -commit ~a: key ~a is missing") - (oid->string commit-id) - data)))))) - ('good-signature data))))))) - -(define (read-authorizations port) - "Read authorizations in the '.guix-authorizations' format from PORT, and -return a list of authorized fingerprints." - (match (read port) - (('authorizations ('version 0) - (((? string? fingerprints) _ ...) ...) - _ ...) - (map (lambda (fingerprint) - (base16-string->bytevector - (string-downcase (string-filter char-set:graphic fingerprint)))) - fingerprints)))) - -(define* (commit-authorized-keys repository commit - #:optional (default-authorizations '())) - "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on -authorizations listed in its parent commits. If one of the parent commits -does not specify anything, fall back to DEFAULT-AUTHORIZATIONS." - (define (commit-authorizations commit) - (catch 'git-error - (lambda () - (let* ((tree (commit-tree commit)) - (entry (tree-entry-bypath tree ".guix-authorizations")) - (blob (blob-lookup repository (tree-entry-id entry)))) - (read-authorizations - (open-bytevector-input-port (blob-content blob))))) - (lambda (key error) - (if (= (git-error-code error) GIT_ENOTFOUND) - default-authorizations - (throw key error))))) - - (apply lset-intersection bytevector=? - (map commit-authorizations (commit-parents commit)))) - -(define (authenticate-commit repository commit keyring) - "Authenticate COMMIT from REPOSITORY and return the signing key fingerprint. -Raise an error when authentication fails." - (define id - (commit-id commit)) - - (define signing-key - (commit-signing-key repository id keyring)) - - (unless (member (openpgp-public-key-fingerprint signing-key) - (commit-authorized-keys repository commit - %historical-authorized-signing-keys)) - (raise (condition - (&message - (message (format #f (G_ "commit ~a not signed by an authorized \ -key: ~a") - (oid->string id) - (openpgp-format-fingerprint - (openpgp-public-key-fingerprint - signing-key)))))))) - - signing-key) - -(define (load-keyring-from-blob repository oid keyring) - "Augment KEYRING with the keyring available in the blob at OID, which may or -may not be ASCII-armored." - (let* ((blob (blob-lookup repository oid)) - (port (open-bytevector-input-port (blob-content blob)))) - (get-openpgp-keyring (if (port-ascii-armored? port) - (open-bytevector-input-port (read-radix-64 port)) - port) - keyring))) - -(define (load-keyring-from-reference repository reference) - "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return -an OpenPGP keyring." - (let* ((reference (branch-lookup repository - (string-append "origin/" reference) - BRANCH-REMOTE)) - (target (reference-target reference)) - (commit (commit-lookup repository target)) - (tree (commit-tree commit))) - (fold (lambda (name keyring) - (if (string-suffix? ".key" name) - (let ((entry (tree-entry-bypath tree name))) - (load-keyring-from-blob repository - (tree-entry-id entry) - keyring)) - keyring)) - %empty-keyring - (tree-list tree)))) - -(define* (authenticate-commits repository commits - #:key - (keyring-reference "keyring") - (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)) - - (fold (lambda (commit stats) - (report-progress) - (let ((signer (authenticate-commit repository commit keyring))) - (match (assq signer stats) - (#f (cons `(,signer . 1) stats)) - ((_ . count) (cons `(,signer . ,(+ count 1)) - (alist-delete signer stats)))))) - '() - commits)) - (define commit-short-id (compose (cut string-take <> 7) oid->string commit-id)) - -;;; -;;; Caching. -;;; - -(define (authenticated-commit-cache-file) - "Return the name of the file that contains the cache of -previously-authenticated commits." - (string-append (cache-directory) "/authentication/channels/guix")) - -(define (previously-authenticated-commits) - "Return the previously-authenticated commits as a list of commit IDs (hex -strings)." - (catch 'system-error - (lambda () - (call-with-input-file (authenticated-commit-cache-file) - 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 %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))) - (mkdir-p (dirname file)) - (with-atomic-file-output file - (lambda (port) - (let ((lst (if (> (length lst) %max-cache-length) - (take lst %max-cache-length) ;truncate - lst))) - (chmod port #o600) - (display ";; List of previously-authenticated commits.\n\n" - port) - (pretty-print lst port)))))) - ;;; ;;; Entry point. @@ -462,6 +271,8 @@ (define reporter (let ((stats (call-with-progress-reporter reporter (lambda (report) (authenticate-commits repository commits + #:default-authorizations + %historical-authorized-signing-keys #:report-progress report))))) (cache-authenticated-commit (oid->string (commit-id end-commit))) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm new file mode 100644 index 0000000000..4df56fab59 --- /dev/null +++ b/guix/git-authenticate.scm @@ -0,0 +1,244 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019, 2020 Ludovic Courtès +;;; +;;; 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 (guix git-authenticate) + #:use-module (git) + #:use-module (guix base16) + #:use-module (guix i18n) + #:use-module (guix openpgp) + #:use-module ((guix utils) + #:select (cache-directory with-atomic-file-output)) + #:use-module ((guix build utils) + #:select (mkdir-p)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) + #:use-module (rnrs bytevectors) + #:use-module (rnrs io ports) + #:use-module (ice-9 match) + #:autoload (ice-9 pretty-print) (pretty-print) + #:export (read-authorizations + commit-signing-key + commit-authorized-keys + authenticate-commit + authenticate-commits + load-keyring-from-reference + previously-authenticated-commits + cache-authenticated-commit)) + +;;; Commentary: +;;; +;;; This module provides tools to authenticate a range of Git commits. A +;;; commit is considered "authentic" if and only if it is signed by an +;;; authorized party. Parties authorized to sign a commit are listed in the +;;; '.guix-authorizations' file of the parent commit. +;;; +;;; Code: + +(define (commit-signing-key repo commit-id keyring) + "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception +if the commit is unsigned, has an invalid signature, or if its signing key is +not in KEYRING." + (let-values (((signature signed-data) + (catch 'git-error + (lambda () + (commit-extract-signature repo commit-id)) + (lambda _ + (values #f #f))))) + (unless signature + (raise (condition + (&message + (message (format #f (G_ "commit ~a lacks a signature") + commit-id)))))) + + (let ((signature (string->openpgp-packet signature))) + (with-fluids ((%default-port-encoding "UTF-8")) + (let-values (((status data) + (verify-openpgp-signature signature keyring + (open-input-string signed-data)))) + (match status + ('bad-signature + ;; There's a signature but it's invalid. + (raise (condition + (&message + (message (format #f (G_ "signature verification failed \ +for commit ~a") + (oid->string commit-id))))))) + ('missing-key + (raise (condition + (&message + (message (format #f (G_ "could not authenticate \ +commit ~a: key ~a is missing") + (oid->string commit-id) + data)))))) + ('good-signature data))))))) + +(define (read-authorizations port) + "Read authorizations in the '.guix-authorizations' format from PORT, and +return a list of authorized fingerprints." + (match (read port) + (('authorizations ('version 0) + (((? string? fingerprints) _ ...) ...) + _ ...) + (map (lambda (fingerprint) + (base16-string->bytevector + (string-downcase (string-filter char-set:graphic fingerprint)))) + fingerprints)))) + +(define* (commit-authorized-keys repository commit + #:optional (default-authorizations '())) + "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on +authorizations listed in its parent commits. If one of the parent commits +does not specify anything, fall back to DEFAULT-AUTHORIZATIONS." + (define (commit-authorizations commit) + (catch 'git-error + (lambda () + (let* ((tree (commit-tree commit)) + (entry (tree-entry-bypath tree ".guix-authorizations")) + (blob (blob-lookup repository (tree-entry-id entry)))) + (read-authorizations + (open-bytevector-input-port (blob-content blob))))) + (lambda (key error) + (if (= (git-error-code error) GIT_ENOTFOUND) + default-authorizations + (throw key error))))) + + (apply lset-intersection bytevector=? + (map commit-authorizations (commit-parents commit)))) + +(define* (authenticate-commit repository commit keyring + #:key (default-authorizations '())) + "Authenticate COMMIT from REPOSITORY and return the signing key fingerprint. +Raise an error when authentication fails. If one of the parent commits does +not specify anything, fall back to DEFAULT-AUTHORIZATIONS." + (define id + (commit-id commit)) + + (define signing-key + (commit-signing-key repository id keyring)) + + (unless (member (openpgp-public-key-fingerprint signing-key) + (commit-authorized-keys repository commit + default-authorizations)) + (raise (condition + (&message + (message (format #f (G_ "commit ~a not signed by an authorized \ +key: ~a") + (oid->string id) + (openpgp-format-fingerprint + (openpgp-public-key-fingerprint + signing-key)))))))) + + signing-key) + +(define (load-keyring-from-blob repository oid keyring) + "Augment KEYRING with the keyring available in the blob at OID, which may or +may not be ASCII-armored." + (let* ((blob (blob-lookup repository oid)) + (port (open-bytevector-input-port (blob-content blob)))) + (get-openpgp-keyring (if (port-ascii-armored? port) + (open-bytevector-input-port (read-radix-64 port)) + port) + keyring))) + +(define (load-keyring-from-reference repository reference) + "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return +an OpenPGP keyring." + (let* ((reference (branch-lookup repository + (string-append "origin/" reference) + BRANCH-REMOTE)) + (target (reference-target reference)) + (commit (commit-lookup repository target)) + (tree (commit-tree commit))) + (fold (lambda (name keyring) + (if (string-suffix? ".key" name) + (let ((entry (tree-entry-bypath tree name))) + (load-keyring-from-blob repository + (tree-entry-id entry) + keyring)) + keyring)) + %empty-keyring + (tree-list tree)))) + +(define* (authenticate-commits repository commits + #:key + (default-authorizations '()) + (keyring-reference "keyring") + (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)) + + (fold (lambda (commit stats) + (report-progress) + (let ((signer (authenticate-commit repository commit keyring + #:default-authorizations + default-authorizations))) + (match (assq signer stats) + (#f (cons `(,signer . 1) stats)) + ((_ . count) (cons `(,signer . ,(+ count 1)) + (alist-delete signer stats)))))) + '() + commits)) + + +;;; +;;; Caching. +;;; + +(define (authenticated-commit-cache-file) + "Return the name of the file that contains the cache of +previously-authenticated commits." + (string-append (cache-directory) "/authentication/channels/guix")) + +(define (previously-authenticated-commits) + "Return the previously-authenticated commits as a list of commit IDs (hex +strings)." + (catch 'system-error + (lambda () + (call-with-input-file (authenticated-commit-cache-file) + 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 %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))) + (mkdir-p (dirname file)) + (with-atomic-file-output file + (lambda (port) + (let ((lst (if (> (length lst) %max-cache-length) + (take lst %max-cache-length) ;truncate + lst))) + (chmod port #o600) + (display ";; List of previously-authenticated commits.\n\n" + port) + (pretty-print lst port)))))) -- cgit v1.2.3 From 512b9e2da26968ebafdd47f701edd8fc3936d3e8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 22:52:03 +0200 Subject: git-authenticate: Don't hard-code "origin/" for keyring reference. * guix/git-authenticate.scm (load-keyring-from-reference): Remove hard-coded "origin/". Use BRANCH-ALL instead of BRANCH-REMOTE. --- guix/git-authenticate.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 4df56fab59..4217ab6d27 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -161,9 +161,7 @@ (define (load-keyring-from-blob repository oid keyring) (define (load-keyring-from-reference repository reference) "Load the '.key' files from the tree at REFERENCE in REPOSITORY and return an OpenPGP keyring." - (let* ((reference (branch-lookup repository - (string-append "origin/" reference) - BRANCH-REMOTE)) + (let* ((reference (branch-lookup repository reference BRANCH-ALL)) (target (reference-target reference)) (commit (commit-lookup repository target)) (tree (commit-tree commit))) -- cgit v1.2.3 From f8213f1bca912ec41be61bc5e166c702968fcf89 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 22:53:06 +0200 Subject: git-authenticate: Raise proper SRFI-35 conditions. * guix/git-authenticate.scm (&git-authentication-error) (&unsigned-commit-error, &unauthorized-commit-error) (&signature-verification-error, &missing-key-error): New condition types. (commit-signing-key, authenticate-commit): Raise them. --- guix/git-authenticate.scm | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 4217ab6d27..b73f957105 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -41,7 +41,18 @@ (define-module (guix git-authenticate) authenticate-commits load-keyring-from-reference previously-authenticated-commits - cache-authenticated-commit)) + cache-authenticated-commit + + git-authentication-error? + git-authentication-error-commit + unsigned-commit-error? + unauthorized-commit-error? + unauthorized-commit-error-signing-key + signature-verification-error? + signature-verification-error-keyring + signature-verification-error-signature + missing-key-error? + missing-key-error-signature)) ;;; Commentary: ;;; @@ -52,6 +63,27 @@ (define-module (guix git-authenticate) ;;; ;;; Code: +(define-condition-type &git-authentication-error &error + git-authentication-error? + (commit git-authentication-error-commit)) + +(define-condition-type &unsigned-commit-error &git-authentication-error + unsigned-commit-error?) + +(define-condition-type &unauthorized-commit-error &git-authentication-error + unauthorized-commit-error? + (signing-key unauthorized-commit-error-signing-key)) + +(define-condition-type &signature-verification-error &git-authentication-error + signature-verification-error? + (signature signature-verification-error-signature) + (keyring signature-verification-error-keyring)) + +(define-condition-type &missing-key-error &git-authentication-error + missing-key-error? + (signature missing-key-error-signature)) + + (define (commit-signing-key repo commit-id keyring) "Return the OpenPGP key that signed COMMIT-ID (an OID). Raise an exception if the commit is unsigned, has an invalid signature, or if its signing key is @@ -64,9 +96,10 @@ (define (commit-signing-key repo commit-id keyring) (values #f #f))))) (unless signature (raise (condition + (&unsigned-commit-error (commit commit-id)) (&message (message (format #f (G_ "commit ~a lacks a signature") - commit-id)))))) + (oid->string commit-id))))))) (let ((signature (string->openpgp-packet signature))) (with-fluids ((%default-port-encoding "UTF-8")) @@ -77,12 +110,17 @@ (define (commit-signing-key repo commit-id keyring) ('bad-signature ;; There's a signature but it's invalid. (raise (condition + (&signature-verification-error (commit commit-id) + (signature signature) + (keyring keyring)) (&message (message (format #f (G_ "signature verification failed \ for commit ~a") (oid->string commit-id))))))) ('missing-key (raise (condition + (&missing-key-error (commit commit-id) + (signature signature)) (&message (message (format #f (G_ "could not authenticate \ commit ~a: key ~a is missing") @@ -138,6 +176,8 @@ (define signing-key (commit-authorized-keys repository commit default-authorizations)) (raise (condition + (&unauthorized-commit-error (commit id) + (signing-key signing-key)) (&message (message (format #f (G_ "commit ~a not signed by an authorized \ key: ~a") -- cgit v1.2.3 From c83eedba2361c3831d3efb5ad63d5077d636fb28 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Jun 2020 23:20:06 +0200 Subject: git-authenticate: Add tests. * guix/tests/git.scm (call-with-environment-variables) (with-environment-variables): Remove. * guix/tests/git.scm (populate-git-repository): Add clauses for signed commits and signed merges. * guix/tests/gnupg.scm: New file. * tests/git-authenticate.scm: New file. * tests/ed25519bis.key, tests/ed25519bis.sec: New files. * Makefile.am (dist_noinst_DATA): Add 'guix/tests/gnupg.scm'. (SCM_TESTS): Add 'tests/git-authenticate.scm'. (EXTRA_DIST): Add tests/ed25519bis.{key,sec}. --- .dir-locals.el | 2 + Makefile.am | 6 +- guix/tests/git.scm | 26 ++--- guix/tests/gnupg.scm | 72 ++++++++++++ tests/ed25519bis.key | 10 ++ tests/ed25519bis.sec | 10 ++ tests/git-authenticate.scm | 286 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 393 insertions(+), 19 deletions(-) create mode 100644 guix/tests/gnupg.scm create mode 100644 tests/ed25519bis.key create mode 100644 tests/ed25519bis.sec create mode 100644 tests/git-authenticate.scm diff --git a/.dir-locals.el b/.dir-locals.el index fcde914e60..e34ddc5a85 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -96,6 +96,8 @@ (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1)) (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)) ;; This notably allows '(' in Paredit to not insert a space when the ;; preceding symbol is one of these. diff --git a/Makefile.am b/Makefile.am index db30004b1b..f3985f9572 100644 --- a/Makefile.am +++ b/Makefile.am @@ -319,7 +319,8 @@ MODULES += $(STORE_MODULES) dist_noinst_DATA = \ guix/tests.scm \ guix/tests/http.scm \ - guix/tests/git.scm + guix/tests/git.scm \ + guix/tests/gnupg.scm # Auxiliary files for packages. AUX_FILES = \ @@ -404,6 +405,7 @@ SCM_TESTS = \ tests/gem.scm \ tests/gexp.scm \ tests/git.scm \ + tests/git-authenticate.scm \ tests/glob.scm \ tests/gnu-maintenance.scm \ tests/grafts.scm \ @@ -576,6 +578,8 @@ EXTRA_DIST += \ tests/dsa.key \ tests/ed25519.key \ tests/ed25519.sec \ + tests/ed25519bis.key \ + tests/ed25519bis.sec \ build-aux/config.rpath \ bootstrap \ doc/build.scm \ diff --git a/guix/tests/git.scm b/guix/tests/git.scm index 566660e85e..c77c544e03 100644 --- a/guix/tests/git.scm +++ b/guix/tests/git.scm @@ -21,6 +21,7 @@ (define-module (guix tests git) #:use-module ((guix git) #:select (with-repository)) #:use-module (guix utils) #:use-module (guix build utils) + #:use-module ((guix tests gnupg) #:select (with-environment-variables)) #:use-module (ice-9 match) #:use-module (ice-9 control) #:export (git-command @@ -30,24 +31,6 @@ (define-module (guix tests git) (define git-command (make-parameter "git")) -(define (call-with-environment-variables variables thunk) - "Call THUNK with the environment VARIABLES set." - (let ((environment (environ))) - (dynamic-wind - (lambda () - (for-each (match-lambda - ((variable value) - (setenv variable value))) - variables)) - thunk - (lambda () - (environ environment))))) - -(define-syntax-rule (with-environment-variables variables exp ...) - "Evaluate EXP with the given environment VARIABLES set." - (call-with-environment-variables variables - (lambda () exp ...))) - (define (populate-git-repository directory directives) "Initialize a new Git checkout and repository in DIRECTORY and apply DIRECTIVES. Each element of DIRECTIVES is an sexp like: @@ -97,6 +80,9 @@ (define (git command . args) ((('commit text) rest ...) (git "commit" "-m" text) (loop rest)) + ((('commit text ('signer fingerprint)) rest ...) + (git "commit" "-m" text (string-append "--gpg-sign=" fingerprint)) + (loop rest)) ((('tag name) rest ...) (git "tag" name) (loop rest)) @@ -108,6 +94,10 @@ (define (git command . args) (loop rest)) ((('merge branch message) rest ...) (git "merge" branch "-m" message) + (loop rest)) + ((('merge branch message ('signer fingerprint)) rest ...) + (git "merge" branch "-m" message + (string-append "--gpg-sign=" fingerprint)) (loop rest))))) (define (call-with-temporary-git-repository directives proc) diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm new file mode 100644 index 0000000000..6e7fdbcf65 --- /dev/null +++ b/guix/tests/gnupg.scm @@ -0,0 +1,72 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; 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 (guix tests gnupg) + #:use-module (guix utils) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:export (gpg-command + gpgconf-command + with-fresh-gnupg-setup + + with-environment-variables)) + +(define (call-with-environment-variables variables thunk) + "Call THUNK with the environment VARIABLES set." + (let ((environment (environ))) + (dynamic-wind + (lambda () + (for-each (match-lambda + ((variable value) + (setenv variable value))) + variables)) + thunk + (lambda () + (environ environment))))) + +(define-syntax-rule (with-environment-variables variables exp ...) + "Evaluate EXP with the given environment VARIABLES set." + (call-with-environment-variables variables + (lambda () exp ...))) + +(define gpg-command + (make-parameter "gpg")) + +(define gpgconf-command + (make-parameter "gpgconf")) + +(define (call-with-fresh-gnupg-setup imported thunk) + (call-with-temporary-directory + (lambda (home) + (with-environment-variables `(("GNUPGHOME" ,home)) + (dynamic-wind + (lambda () + (for-each (lambda (file) + (invoke (gpg-command) "--import" file)) + imported)) + thunk + (lambda () + ;; Terminate 'gpg-agent' & co. + (invoke (gpgconf-command) "--kill" "all"))))))) + +(define-syntax-rule (with-fresh-gnupg-setup imported exp ...) + "Evaluate EXP in the context of a fresh GnuPG setup where all the files +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 ...))) diff --git a/tests/ed25519bis.key b/tests/ed25519bis.key new file mode 100644 index 0000000000..f5329105d5 --- /dev/null +++ b/tests/ed25519bis.key @@ -0,0 +1,10 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEXtVsNhYJKwYBBAHaRw8BAQdAnLsYdh3BpeK1xDguJE80XW2/MSmqeeP6pbQw +8jAw0OG0IkNoYXJsaWUgR3VpeCA8Y2hhcmxpZUBleGFtcGxlLm9yZz6IlgQTFggA +PhYhBKBDaY1jer75FlruS4IkDtyrgNqDBQJe1Ww2AhsDBQkDwmcABQsJCAcCBhUK +CQgLAgQWAgMBAh4BAheAAAoJEIIkDtyrgNqDM6cA/idDdoxo9SU+witdTXt24APH +yRzHbX9Iyh4dZNIek9JwAP9E0BwSvDHB4LY9z4RWf2hJp3dm/yZ/jEpK+w4BGN4J +Ag== +=JIU0 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/tests/ed25519bis.sec b/tests/ed25519bis.sec new file mode 100644 index 0000000000..059765f557 --- /dev/null +++ b/tests/ed25519bis.sec @@ -0,0 +1,10 @@ +-----BEGIN PGP PRIVATE KEY BLOCK----- + +lFgEXtVsNhYJKwYBBAHaRw8BAQdAnLsYdh3BpeK1xDguJE80XW2/MSmqeeP6pbQw +8jAw0OEAAP9lsLf3tk0OH1X4By4flYSz4PBFo40EwS4t6xx76poUphCEtCJDaGFy +bGllIEd1aXggPGNoYXJsaWVAZXhhbXBsZS5vcmc+iJYEExYIAD4WIQSgQ2mNY3q+ ++RZa7kuCJA7cq4DagwUCXtVsNgIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIe +AQIXgAAKCRCCJA7cq4DagzOnAP4nQ3aMaPUlPsIrXU17duADx8kcx21/SMoeHWTS +HpPScAD/RNAcErwxweC2Pc+EVn9oSad3Zv8mf4xKSvsOARjeCQI= +=gUik +-----END PGP PRIVATE KEY BLOCK----- diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm new file mode 100644 index 0000000000..5937c37ee6 --- /dev/null +++ b/tests/git-authenticate.scm @@ -0,0 +1,286 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Ludovic Courtès +;;; +;;; 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 (test-git-authenticate) + #: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 (guix build utils) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-64) + #:use-module (rnrs bytevectors) + #:use-module (rnrs io ports)) + +;; 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)))) + + +(test-begin "git-authenticate") + +(unless (which (git-command)) (test-skip 1)) +(test-assert "unsigned commits" + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "first commit") + (add "b.txt" "B") + (commit "second commit")) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second"))) + (guard (c ((unsigned-commit-error? c) + (oid=? (git-authentication-error-commit c) + (commit-id commit1)))) + (authenticate-commits repository (list commit1 commit2) + #:keyring-reference "master") + 'failed))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, default authorizations" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + (with-temporary-git-repository directory + `((add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (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)))) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second"))) + (authenticate-commits repository (list commit1 commit2) + #:default-authorizations + (list (openpgp-public-key-fingerprint + (read-openpgp-packet + %ed25519-public-key-file))) + #:keyring-reference "master")))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations" + (with-fresh-gnupg-setup (list %ed25519-public-key-file + %ed25519-secret-key-file) + (with-temporary-git-repository directory + `((add "signer.key" ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (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 ".guix-authorizations" + ,(object->string `(authorizations (version 0) ()))) ;empty + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "b.txt" "B") + (commit "third commit" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((commit1 (find-commit repository "first")) + (commit2 (find-commit repository "second")) + (commit3 (find-commit repository "third"))) + ;; COMMIT1 and COMMIT2 are fine. + (and (authenticate-commits repository (list commit1 commit2) + #:keyring-reference "master") + + ;; 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 + %ed25519-public-key-file)))))) + (authenticate-commits repository + (list commit1 commit2 commit3) + #:keyring-reference "master") + 'failed))))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations, unauthorized merge" + (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 "signer1.key" + ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add "signer2.key" + ,(call-with-input-file %ed25519bis-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (branch "devel") + (checkout "devel") + (add "devel/1.txt" "1") + (commit "first devel commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file))) + (checkout "master") + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (merge "devel" "merge" + (signer ,(key-fingerprint %ed25519-public-key-file)))) + (with-repository directory repository + (let ((master1 (find-commit repository "first commit")) + (master2 (find-commit repository "second commit")) + (devel1 (find-commit repository "first devel commit")) + (merge (find-commit repository "merge"))) + (define (correct? c commit) + (and (oid=? (git-authentication-error-commit c) + (commit-id commit)) + (bytevector=? + (openpgp-public-key-fingerprint + (unauthorized-commit-error-signing-key c)) + (openpgp-public-key-fingerprint + (read-openpgp-packet %ed25519bis-public-key-file))))) + + (and (authenticate-commits repository (list master1 master2) + #:keyring-reference "master") + + ;; DEVEL1 is signed by an unauthorized key according to its + ;; parent's '.guix-authorizations' file. + (guard (c ((unauthorized-commit-error? c) + (correct? c devel1))) + (authenticate-commits repository + (list master1 devel1) + #:keyring-reference "master") + #f) + + ;; MERGE is authorized but one of its ancestors is not. + (guard (c ((unauthorized-commit-error? c) + (correct? c devel1))) + (authenticate-commits repository + (list master1 master2 + devel1 merge) + #:keyring-reference "master") + #f))))))) + +(unless (gpg+git-available?) (test-skip 1)) +(test-assert "signed commits, .guix-authorizations, authorized merge" + (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 "signer1.key" + ,(call-with-input-file %ed25519-public-key-file + get-string-all)) + (add "signer2.key" + ,(call-with-input-file %ed25519bis-public-key-file + get-string-all)) + (add ".guix-authorizations" + ,(object->string + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")))))) + (commit "zeroth commit") + (add "a.txt" "A") + (commit "first commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (branch "devel") + (checkout "devel") + (add ".guix-authorizations" + ,(object->string ;add the second signer + `(authorizations (version 0) + ((,(key-fingerprint + %ed25519-public-key-file) + (name "Alice")) + (,(key-fingerprint + %ed25519bis-public-key-file)))))) + (commit "first devel commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (add "devel/2.txt" "2") + (commit "second devel commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file))) + (checkout "master") + (add "b.txt" "B") + (commit "second commit" + (signer ,(key-fingerprint %ed25519-public-key-file))) + (merge "devel" "merge" + (signer ,(key-fingerprint %ed25519-public-key-file))) + ;; After the merge, the second signer is authorized. + (add "c.txt" "C") + (commit "third commit" + (signer ,(key-fingerprint %ed25519bis-public-key-file)))) + (with-repository directory repository + (let ((master1 (find-commit repository "first commit")) + (master2 (find-commit repository "second commit")) + (devel1 (find-commit repository "first devel commit")) + (devel2 (find-commit repository "second devel commit")) + (merge (find-commit repository "merge")) + (master3 (find-commit repository "third commit"))) + (authenticate-commits repository + (list master1 master2 devel1 devel2 + merge master3) + #:keyring-reference "master")))))) + +(test-end "git-authenticate") + -- cgit v1.2.3 From 831c1a32301c45bade7d932629bf6f35befca343 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 00:11:22 +0200 Subject: gnu: emacs-general: Update to a0b17d2. Fixes . Reported by bdju . * gnu/packages/emacs-xyz.scm (emacs-general): Update to a0b17d2. [arguments]: Remove unnecessary phase. Update #:test-command. --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a111cbb99b..6110374281 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18216,20 +18216,20 @@ (define-public emacs-annalist (license license:gpl3+)))) (define-public emacs-general - (let ((commit "f38fb2294bd29261374b772f765730f2fa168b3e") - (revision "3")) + (let ((commit "a0b17d207badf462311b2eef7c065b884462cb7c") + (revision "4")) (package (name "emacs-general") (version (git-version "0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/noctuid/general.el.git") - (commit commit))) - (sha256 - (base32 - "1aqi5axkwfng6rm52sblf738c7rffp10sqs69dvkh2fv3ps8q28i")) - (file-name (git-file-name name version)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/noctuid/general.el.git") + (commit commit))) + (sha256 + (base32 "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (native-inputs `(("emacs-buttercup" ,emacs-buttercup) @@ -18237,15 +18237,8 @@ (define-public emacs-general ("emacs-which-key" ,emacs-which-key) ("emacs-use-package" ,emacs-use-package))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-makefile - (lambda _ - (substitute* "Makefile" - (("cask exec ") "")) - #t))) - #:tests? #t - #:test-command '("make" "test"))) + `(#:tests? #t + #:test-command '("buttercup" "-L" "test/test-general.el"))) (home-page "https://github.com/noctuid/general.el") (synopsis "More convenient key definitions in emacs") (description "@code{general.el} provides a more convenient method for -- cgit v1.2.3 From f9bffb564ac720cb63d233cca048dfec75aa714d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 08:17:55 +0200 Subject: gnu: python-backports-csv: Update to 1.0.7. * gnu/packages/python-xyz.scm (python-backports-csv): Update to 1.0.7. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2e9f0d5632..bf0584326b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7336,14 +7336,13 @@ (define-public python2-backports-abc (define-public python-backports-csv (package (name "python-backports-csv") - (version "1.0.5") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "backports.csv" version)) (sha256 - (base32 - "1imzbrradkfn8s2m1qcimyn74dn1mz2p3j381jljn166rf2i6hlc")))) + (base32 "0vdx5jlhs91iizc8j8l8811nqprwvdx39pgkdc82w2qkfgzxyxqj")))) (build-system python-build-system) (home-page "https://github.com/ryanhiebert/backports.csv") (synopsis "Backport of Python 3's csv module for Python 2") -- cgit v1.2.3 From 6b490fff21b9c87f5ad5a0eda0e6eada32ccc681 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 02:51:39 +0200 Subject: gnu: fortune-mod: Update to 2.28.0. * gnu/packages/games.scm (fortune-mod): Update to 2.28.0. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fc3569e9ea..8a2ac9fcc5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6380,7 +6380,7 @@ (define-public rinutils (define-public fortune-mod (package (name "fortune-mod") - (version "2.22.0") + (version "2.28.0") (source (origin (method git-fetch) @@ -6389,8 +6389,7 @@ (define-public fortune-mod (commit (string-append "fortune-mod-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "17h2g35j8nzljsqaqhrsx75jakbmlqnsa150g2xw414fcbnjbyps")))) + (base32 "1ppzgnffgdcmq6fq4gmdq2ig10ip2bnfgklkb3i8nc6bdxm7pb89")))) (build-system cmake-build-system) (arguments `(#:test-target "check" -- cgit v1.2.3 From 893aca0993b93a8156b32cf76d9b57a097c13622 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 05:15:15 +0200 Subject: gnu: gpxsee: Update to 7.30. * gnu/packages/gps.scm (gpxsee): Update to 7.30. --- gnu/packages/gps.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index bb3ec345ba..38fa6bea47 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Vincent Legoll @@ -182,7 +182,7 @@ (define-public gama (define-public gpxsee (package (name "gpxsee") - (version "7.25") + (version "7.30") (source (origin (method git-fetch) (uri (git-reference @@ -191,7 +191,7 @@ (define-public gpxsee (file-name (git-file-name name version)) (sha256 (base32 - "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx")))) + "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 996b3f71594724392ee530e9d8b201b905f22726 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:04:21 +0200 Subject: gnu: mtpaint: Fix version numbering. * gnu/packages/image.scm (mtpaint): Remove let binding. [version]: Don't use GIT-VERSION. [source]: Specify the matching COMMIT directly. --- gnu/packages/image.scm | 90 +++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 48 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 94e6abe19f..36386537c3 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2075,54 +2075,48 @@ (define-public libavif license:expat)))) ; cJSON in the test suite (define-public mtpaint - (let ((commit "03b1b0938067b88d86d9f1b1088730f1934d411e") - (revision "1")) - (package - (name "mtpaint") - ;; The author neither releases tarballs nor uses git version tags. - ;; Instead, author puts version in git commit title. - (version (git-version "3.49.25" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wjaguar/mtPaint/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1")))) - (build-system gnu-build-system) - (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("which" ,which))) - (inputs - `(("imlib2" ,imlib2) - ("libtiff" ,libtiff) - ("libpng" ,libpng) - ("libungif", libungif) - ("libjpeg", libjpeg-turbo) - ("libwebp" ,libwebp) - ("openjpeg" ,openjpeg) - ("lcms" ,lcms) - ("zlib", zlib) - ("glib" ,glib) - ;; support for gtk3 is in testing stage - ("gtk+" ,gtk+-2))) - (arguments - `(#:configure-flags - (list - ;; internationalized version - "intl" - ;; install man page - "man") - ;; no check target - #:tests? #f)) - (home-page "http://mtpaint.sourceforge.net/") - (synopsis "Create pixel art and manipulate digital images") - (description - "Mtpaint is a graphic editing program which uses the GTK+ toolkit. + (package + (name "mtpaint") + ;; The author neither releases tarballs nor uses git version tags. + ;; Instead, author puts version in git commit title. + (version "3.49.25") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wjaguar/mtPaint") + (commit "03b1b0938067b88d86d9f1b1088730f1934d411e"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config) + ("which" ,which))) + (inputs + `(("imlib2" ,imlib2) + ("libtiff" ,libtiff) + ("libpng" ,libpng) + ("libungif", libungif) + ("libjpeg", libjpeg-turbo) + ("libwebp" ,libwebp) + ("openjpeg" ,openjpeg) + ("lcms" ,lcms) + ("zlib", zlib) + ("glib" ,glib) + ;; Support for gtk3 is in the testing stage. + ("gtk+" ,gtk+-2))) + (arguments + `(#:configure-flags + (list "intl" ; build internationalized version + "man") ; build the man page + #:tests? #f)) ; no test suite + (home-page "http://mtpaint.sourceforge.net/") + (synopsis "Create pixel art and manipulate digital images") + (description + "Mtpaint is a graphic editing program which uses the GTK+ toolkit. It can create and edit indexed palette or 24bit RGB images, offers basic painting and palette manipulation tools. It also handles JPEG, JPEG2000, GIF, TIFF, WEBP, BMP, PNG, XPM formats.") - (license license:gpl3+)))) + (license license:gpl3+))) -- cgit v1.2.3 From 6e13b0efce7e77d033a6585019f5821a577672ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:14:47 +0200 Subject: gnu: mtpaint: Update to 3.49.27. * gnu/packages/image.scm (mtpaint): Update to 3.49.27. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 36386537c3..495780246f 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2079,16 +2079,16 @@ (define-public mtpaint (name "mtpaint") ;; The author neither releases tarballs nor uses git version tags. ;; Instead, author puts version in git commit title. - (version "3.49.25") + (version "3.49.27") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/wjaguar/mtPaint") - (commit "03b1b0938067b88d86d9f1b1088730f1934d411e"))) + (commit "26751cd0336414e2f16cbe25c9fe2702f34e7b5c"))) (file-name (git-file-name name version)) (sha256 - (base32 "0izm2wvj26566fd8mqvypr7bmv7jnq8qhp4760m7z2wrc4y8pjn1")))) + (base32 "12mzai9pqvyb342m21rjz0jxiy75q24sjw6ax147pzy8frzkgd54")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 6f64a05ec920ed46a845ad399546170988d2e05d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:16:36 +0200 Subject: gnu: evince: Update to 3.36.1. * gnu/packages/gnome.scm (evince): Update to 3.36.1. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7335dc1cd6..6bcc36dec5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1668,7 +1668,7 @@ (define-public gnome-keyring (define-public evince (package (name "evince") - (version "3.34.2") + (version "3.36.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evince/" @@ -1676,7 +1676,7 @@ (define-public evince "evince-" version ".tar.xz")) (sha256 (base32 - "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w")))) + "1msbb66lasikpfjpkwsvi7h22hqmk275850ilpdqwbd0b39vzf4c")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--disable-nautilus" "--enable-introspection") @@ -1726,8 +1726,7 @@ (define-public evince ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) - (home-page - "https://www.gnome.org/projects/evince/") + (home-page "https://www.gnome.org/projects/evince/") (synopsis "GNOME's document viewer") (description "Evince is a document viewer for multiple document formats. It -- cgit v1.2.3 From 2bf0a5cbae96adfe97de5903f620d441a3106c07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:17:40 +0200 Subject: gnu: geoclue: Update to 2.5.6. * gnu/packages/gnome.scm (geoclue): Update to 2.5.6. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6bcc36dec5..592cab0b49 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4124,7 +4124,7 @@ (define-public colord (define-public geoclue (package (name "geoclue") - (version "2.5.5") + (version "2.5.6") (source (origin (method url-fetch) @@ -4132,8 +4132,7 @@ (define-public geoclue (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2")) (sha256 - (base32 - "1b7jqrsn4x7mxjxj8hvb2dl2cmhrpb9vibs4rvkkanky5nsx3sai")) + (base32 "0a833x5apzabxj80ywvsh8crd635vni2i9v9c1p095f6hvmfc45k")) (patches (search-patches "geoclue-config.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From df305cea48d769cc35e01a4d6d68f22d885520f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:24:00 +0200 Subject: gnu: mcelog: Fix unversioned DOCDIR. * gnu/packages/linux.scm (mcelog)[arguments]: VERSION DOCDIR. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 745370b8f8..9cc23609f1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5496,7 +5496,8 @@ (define-public mcelog #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "CC=gcc" (string-append "prefix=" out) - (string-append "DOCDIR=" out "/share/doc/mcelog") + (string-append "DOCDIR=" out "/share/doc/" + ,name "-" ,version) "etcprefix=$(DOCDIR)/examples")) ;; The tests will only run as root on certain supported CPU models. #:tests? #f)) -- cgit v1.2.3 From ed139ee733db52c6f364d07bb4dc72385cfe8818 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:26:04 +0200 Subject: gnu: mcelog: Update to 170. * gnu/packages/linux.scm (mcelog): Update to 170. --- 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 9cc23609f1..a9a281858e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5472,14 +5472,14 @@ (define-public module-init-tools (define-public mcelog (package (name "mcelog") - (version "168") + (version "170") (source (origin (method url-fetch) (uri (string-append "https://git.kernel.org/cgit/utils/cpu/mce/" "mcelog.git/snapshot/v" version ".tar.gz")) (sha256 (base32 - "1c4faayg1gcm3002b2fdrfnv76z92mvfzccvx8w9crjp0d17sp24")) + "1m11v1y7cvpm7hwsghj23z77ps1w5jzn8000iwiyxpb939h2km5l")) (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From de3825286ff91529c66a4d3847518e5d7cd45295 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:29:42 +0200 Subject: gnu: mcelog: Update description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I believe that nowadays rasdaemon is a/the recommended alternative. * gnu/packages/linux.scm (mcelog)[description]: Remove ‘required’. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a9a281858e..db03160085 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5505,10 +5505,10 @@ (define-public mcelog (home-page "https://mcelog.org/") (synopsis "Machine check monitor for x86 Linux systems") (description - "The mcelog daemon is required by the Linux kernel to log memory, I/O, CPU, -and other hardware errors on x86 systems. It can also perform user-defined -tasks, such as bringing bad pages off-line, when configurable error thresholds -are exceeded.") + "The mcelog daemon logs memory, I/O, CPU, and other hardware errors on x86 +systems running the kernel Linux. It can also perform user-defined tasks, such +as bringing bad pages off-line, when configurable error thresholds are +exceeded.") (license license:gpl2))) (define-public mtd-utils -- cgit v1.2.3 From b613842238af7c0164ae0df58190423a8b466f63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 00:07:13 +0200 Subject: gnu: libqmi: Update to 1.24.12. * gnu/packages/freedesktop.scm (libqmi): Update to 1.24.12. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 90154cbba9..9e84f30b5c 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1084,7 +1084,7 @@ (define-public libmbim (define-public libqmi (package (name "libqmi") - (version "1.24.4") + (version "1.24.12") (source (origin (method url-fetch) (uri (string-append @@ -1092,7 +1092,7 @@ (define-public libqmi "libqmi-" version ".tar.xz")) (sha256 (base32 - "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3")))) + "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd")))) (build-system gnu-build-system) (inputs `(("libgudev" ,libgudev))) -- cgit v1.2.3 From 51b25847b7bab85fde2a87d1a4eaf9fb08f1234f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 06:37:37 +0200 Subject: gnu: libavif: Mark up description. * gnu/packages/image.scm (libavif)[description]: Use @acronym{}. --- gnu/packages/image.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 495780246f..393ee7e08b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2067,9 +2067,9 @@ (define-public libavif `(("libaom" ,libaom) ("dav1d" ,dav1d))) (synopsis "Encode and decode AVIF files") - (description "Libavif is a C implementation of the AV1 Image File Format -(AVIF). It can encode and decode all YUV formats and bit depths supported by -AOM, including with alpha.") + (description "Libavif is a C implementation of @acronym{AVIF, the AV1 Image +File Format}. It can encode and decode all YUV formats and bit depths supported +by AOM, including with alpha.") (home-page "https://github.com/AOMediaCodec/libavif") (license (list license:bsd-2 ; libavif itself license:expat)))) ; cJSON in the test suite -- cgit v1.2.3 From 35f9af5f7d0d8d4252ebf46d4cec8ea75e821bda Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 12:19:55 +0200 Subject: gnu: emacs-websocket: Update to 1.12. * gnu/packages/emacs-xyz.scm (emacs-websocket): Update to 1.12. [source]: Use ELPA repository instead of GitHub. --- gnu/packages/emacs-xyz.scm | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6110374281..be7044de0f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11791,31 +11791,22 @@ (define-public emacs-pubmed (define-public emacs-websocket (package (name "emacs-websocket") - (version "1.10") + (version "1.12") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ahyatt/emacs-websocket.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "websocket-" version ".tar")) (sha256 - (base32 - "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52")))) + (base32 "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w")))) (build-system emacs-build-system) - (arguments - `(#:tests? #t - ;; TODO: also enable websocket-functional-test.el - #:test-command '("emacs" "--batch" - "-l" "websocket-test.el" - "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://elpa.gnu.org/packages/websocket.html") (synopsis "Emacs WebSocket client and server") - (description "This is an Elisp library for WebSocket clients to talk to -WebSocket servers, and for WebSocket servers to accept connections from -WebSocket clients. This library is designed to be used by other library -writers, to write applications that use WebSockets, and is not useful by -itself.") + (description + "This is an Elisp library for WebSocket clients to talk to WebSocket +servers, and for WebSocket servers to accept connections from WebSocket +clients. This library is designed to be used by other library writers, to +write applications that use WebSockets, and is not useful by itself.") (license license:gpl3+))) (define-public emacs-oauth2 -- cgit v1.2.3 From 8f21ddad41dcdc5356b5b4af0928e3f51fb6ec36 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 12:23:00 +0200 Subject: gnu: emacs-undo-tree: Update to 0.7.4. * gnu/packages/emacs-xyz.scm (emacs-undo-tree): Update to 0.7.4. [source]: Use GNU ELPA repository. --- gnu/packages/emacs-xyz.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be7044de0f..34e4babc27 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2675,20 +2675,19 @@ (define-public emacs-olivetti (define-public emacs-undo-tree (package (name "emacs-undo-tree") - (version "0.7.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "http://dr-qubit.org/git/undo-tree.git") - (commit (string-append "release/" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1nr0149y2nvrxj56gc12jqnfl01g6z9ypfsgl6pfg85cw73hnggk")))) + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "undo-tree-" version ".el")) + (sha256 + (base32 "018ixl802f076sfyf4gkacpgrdpybin88jd8vq9zgyvc6x2dalfa")))) (build-system emacs-build-system) (home-page "http://www.dr-qubit.org/emacs.php") (synopsis "Treat undo history as a tree") - (description "Tree-like interface to Emacs undo system, providing + (description + "Tree-like interface to Emacs undo system, providing graphical tree presentation of all previous states of buffer that allows easily move between them.") (license license:gpl3+))) -- cgit v1.2.3 From 96f0a465daa0402f87836e13c34980f8fd0d99e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:03:21 +0200 Subject: gnu: emacs-php-mode: Update to 1.23.0. * gnu/packages/emacs-xyz.scm (emacs-php-mode): Update to 1.23.0. --- gnu/packages/emacs-xyz.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 34e4babc27..02a4417417 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10236,25 +10236,25 @@ (define-public emacs-cnfonts (define-public emacs-php-mode (package (name "emacs-php-mode") - (version "1.22.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ejmr/php-mode.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1r4bpyavlndd4c78cv5cc97bc0gkd4cggiyz4kd2vg6zlyc1nld3")))) + (version "1.23.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ejmr/php-mode.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c")))) (build-system emacs-build-system) (home-page "https://github.com/ejmr/php-mode") (synopsis "Major mode for editing PHP code") - (description "@code{php-mode} is a major mode for editing PHP source -code. It's an extension of C mode; thus it inherits all C mode's navigation -functionality. But it colors according to the PHP grammar and indents -according to the PEAR coding guidelines. It also includes a couple handy -IDE-type features such as documentation search and a source and class -browser.") + (description + "PHP mode is a major mode for editing PHP source code. It's an extension +of C mode; thus it inherits all C mode's navigation functionality. But it +colors according to the PHP grammar and indents according to the PEAR coding +guidelines. It also includes a couple handy IDE-type features such as +documentation search and a source and class browser.") (license license:gpl3+))) (define-public emacs-pos-tip -- cgit v1.2.3 From 0d582c68eec944c12991a79f288a13c4d753f319 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:08:11 +0200 Subject: gnu: emacs-clojure-mode: Update to 5.11.0. * gnu/packages/emacs-xyz.scm (emacs-clojure-mode): Update to 5.11.0. [native-inputs]: Add emacs-buttercup, remove emacs-ert-runner. [arguments]: Update test command. [description]: Small typographic fixes. --- gnu/packages/emacs-xyz.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 02a4417417..0d912e7b70 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6570,7 +6570,7 @@ (define-public emacs-lpy (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") - (version "5.6.1") + (version "5.11.0") (source (origin (method git-fetch) @@ -6579,21 +6579,21 @@ (define-public emacs-clojure-mode (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y")))) + (base32 "1x1yszp6waa778ki6sw66w1pzcz389wd01gkcldfxxnd7z89ad5d")))) (build-system emacs-build-system) (native-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-s" ,emacs-s) - ("ert-runner" ,emacs-ert-runner))) + `(("emacs-buttercup" ,emacs-buttercup) + ("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s))) (arguments `(#:tests? #t - #:test-command '("ert-runner"))) + #:test-command '("buttercup"))) (home-page "https://github.com/clojure-emacs/clojure-mode") (synopsis "Major mode for Clojure code") (description "This Emacs package provides font-lock, indentation, navigation and basic refactoring for the @uref{http://clojure.org, Clojure programming language}. -It is recommended to use @code{clojure-mode} with paredit or smartparens.") +It is recommended to use @code{clojure-mode} with Paredit or Smartparens.") (license license:gpl3+))) (define-public emacs-epl -- cgit v1.2.3 From 22ba47551b62c080bb574a572e10dd607bb6f011 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:11:33 +0200 Subject: gnu: emacs-magit-popup: Update to 2.13.2. * gnu/packages/emacs-xyz.scm (emacs-magit-popup): Update to 2.13.2. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d912e7b70..3ad529de10 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -510,16 +510,16 @@ (define-public emacs-magit-svn (define-public emacs-magit-popup (package (name "emacs-magit-popup") - (version "2.12.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/magit-popup.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13riknyqr6vxqll80sfhvz165flvdz367rbd0pr5slb01bnfsi2i")))) + (version "2.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-popup.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From c160e5571c00edb8cb1748359cf958496557bc74 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:14:05 +0200 Subject: gnu: emacs-beginend: Update to 2.1.0. * gnu/packages/emacs-xyz.scm (emacs-beginend): Update to 2.1.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 3ad529de10..dbecb51c6d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14400,7 +14400,7 @@ (define-public emacs-company-lua (define-public emacs-beginend (package (name "emacs-beginend") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) @@ -14409,7 +14409,7 @@ (define-public emacs-beginend (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl")))) + (base32 "1ic5z3qb5sc3mjrjdlg0rqm2l59a43gwnakagns4cilln2a3xdg8")))) ;; TODO: Run tests. (build-system emacs-build-system) (inputs -- cgit v1.2.3 From 90eb9381cbeee58bd0251be9ab833d92573c656b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:15:52 +0200 Subject: gnu: emacs-cider: Update to 0.25.0. * gnu/packages/emacs-xyz.scm (emacs-cider): Update to 0.25.0. [propagated-inputs]: Reorder entries. Remove emacs-seq, built-in. --- gnu/packages/emacs-xyz.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dbecb51c6d..adadc99982 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8012,7 +8012,7 @@ (define-public emacs-helm-make (define-public emacs-cider (package (name "emacs-cider") - (version "0.23.0") + (version "0.25.0") (source (origin (method git-fetch) @@ -8021,20 +8021,18 @@ (define-public emacs-cider (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "05yjkqc6d4grq9z5pxmv3anqh4zlhfg4v46jlccp6ynh030g7axs")))) + (base32 "1sdd7vzw948q01kc8im1asiq1j06q0mnn2s8kj83f8sbdnfy0qbk")))) (build-system emacs-build-system) (arguments - '(#:exclude ; Don't exclude 'cider-test.el'. + '(#:exclude ;don't exclude 'cider-test.el' '("^\\.dir-locals\\.el$" "^test/"))) (propagated-inputs `(("emacs-clojure-mode" ,emacs-clojure-mode) - ("emacs-sesman" ,emacs-sesman) - ("emacs-seq" ,emacs-seq) - ("emacs-spinner" ,emacs-spinner) ("emacs-parseedn" ,emacs-parseedn) ("emacs-pkg-info" ,emacs-pkg-info) - ("emacs-queue" ,emacs-queue))) + ("emacs-queue" ,emacs-queue) + ("emacs-sesman" ,emacs-sesman) + ("emacs-spinner" ,emacs-spinner))) (home-page "https://cider.mx/") (synopsis "Clojure development environment for Emacs") (description -- cgit v1.2.3 From bed1d64ca46f9e5363ff0eebe4b525ca944cd8b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:17:43 +0200 Subject: gnu: emacs-darkroom: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-darkroom): Update to 0.3. --- 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 adadc99982..d5735c8111 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15206,14 +15206,14 @@ (define-public emacs-highlight-numbers (define-public emacs-darkroom (package (name "emacs-darkroom") - (version "0.2") - (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/darkroom-" - version ".el")) - (sha256 - (base32 - "1a528brhz4vckhp77n2c1phkyqdliykpj9kzk3f834f4rwnb5mp0")))) + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "darkroom-" version ".el")) + (sha256 + (base32 "0l1xg5kqmjw22k78qnsln0ifx2dx74xxqj0qp8xxcpqvzzx0xh86")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/darkroom.html") (synopsis "Remove visual distractions and focus on writing") -- cgit v1.2.3 From 3c47d838fa62a25c1f5a757431e4d608dd028fd1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:19:01 +0200 Subject: gnu: emacs-oauth2: Update to 0.13. * gnu/packages/emacs-xyz.scm (emacs-oauth2): Update to 0.13. --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d5735c8111..b8bbd1be96 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11809,15 +11809,14 @@ (define-public emacs-websocket (define-public emacs-oauth2 (package (name "emacs-oauth2") - (version "0.11") + (version "0.13") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/oauth2-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "oauth2-" version ".el")) (sha256 - (base32 - "0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp")))) + (base32 "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/oauth2.html") (synopsis "OAuth 2.0 authorization protocol implementation") -- cgit v1.2.3 From 73a148f325c4029dfe10f1d430a62250e8d14daa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:22:51 +0200 Subject: gnu: emacs-ghub: Update to 3.3.0. * gnu/packages/emacs-xyz.scm (emacs-ghub): Update to 3.3.0. --- gnu/packages/emacs-xyz.scm | 63 ++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b8bbd1be96..2726ac06dc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -650,42 +650,39 @@ (define-public emacs-graphql (license license:gpl3+))) (define-public emacs-ghub - ;; We need a newer commit to avoid problems in emacs-forge. - (let ((commit "e19cd86ca4768a6d89285123933baa3f1460d696") - (revision "2")) - (package - (name "emacs-ghub") - (version (git-version "3.2.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/ghub") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1d6f8sxlsl0fpkzwbpnaw77d1a5pkg63zfvf6a2fxir357lbdizx")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'install 'make-info - (lambda _ - (invoke "make" "info")))))) - (native-inputs - `(("texinfo" ,texinfo))) - (propagated-inputs - `(("dash" ,emacs-dash) - ("emacs-let-alist" ,emacs-let-alist) - ("treepy" ,emacs-treepy))) - (home-page "https://github.com/magit/ghub") - (synopsis "Emacs client libraries for the APIs of various Git forges") - (description - "Ghub provides basic support for using the APIs of various Git forges from + (package + (name "emacs-ghub") + (version "3.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/ghub") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1229g0d9f4ywwjndx32x4z5jdr0kzyi44hjxmy0sifwfmg9nn251")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'make-info + (lambda _ + (invoke "make" "info")))))) + (native-inputs + `(("texinfo" ,texinfo))) + (propagated-inputs + `(("dash" ,emacs-dash) + ("emacs-let-alist" ,emacs-let-alist) + ("treepy" ,emacs-treepy))) + (home-page "https://github.com/magit/ghub") + (synopsis "Emacs client libraries for the APIs of various Git forges") + (description + "Ghub provides basic support for using the APIs of various Git forges from Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab, Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a handful of functions that are not resource-specific.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-typit ;; Last release is from 2017. -- cgit v1.2.3 From ae08e0f963051d4b632ad0379091f1468f5ec6ed Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:23:54 +0200 Subject: gnu: emacs-jsonrpc: Update to 1.0.12. * gnu/packages/emacs-xyz.scm (emacs-jsonrpc): Update to 1.0.12. --- 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 2726ac06dc..63cbff5ee0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11037,14 +11037,14 @@ (define-public emacs-json-mode (define-public emacs-jsonrpc (package (name "emacs-jsonrpc") - (version "1.0.11") + (version "1.0.12") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "jsonrpc-" version ".el")) (sha256 - (base32 "04cy1mqd6y8k5lcpg076szjk9av9345mmsnzzh6vgbcw3dcgbr23")))) + (base32 "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/jsonrpc.html") (synopsis "JSON-RPC library") -- cgit v1.2.3 From 0e96514e7b2ad11c201fa06f57457c8e33054120 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 13:44:05 +0200 Subject: gnu: emacs-haskell-mode: Update to 17.1. * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.1. [arguments]: Add phase to skip failing tests. * gnu/packages/patches/haskell-mode-make-check.patch: * gnu/packages/patches/haskell-mode-unused-variables.patch: Delete files. * gnu/local.mk: Apply files removal. --- gnu/local.mk | 2 - gnu/packages/emacs-xyz.scm | 51 ++++++++++------------ gnu/packages/patches/haskell-mode-make-check.patch | 35 --------------- .../patches/haskell-mode-unused-variables.patch | 44 ------------------- 4 files changed, 23 insertions(+), 109 deletions(-) delete mode 100644 gnu/packages/patches/haskell-mode-make-check.patch delete mode 100644 gnu/packages/patches/haskell-mode-unused-variables.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5dc0909efd..5016d16d7a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1069,8 +1069,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ - %D%/packages/patches/haskell-mode-unused-variables.patch \ - %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 63cbff5ee0..3964891c7e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -822,26 +822,22 @@ (define-public emacs-unpackaged-el (define-public emacs-haskell-mode (package (name "emacs-haskell-mode") - (version "16.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/haskell/haskell-mode") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq")) - (patches - (search-patches ; backport test failure fixes - "haskell-mode-unused-variables.patch" - "haskell-mode-make-check.patch")))) - (inputs - `(("emacs-el-search" ,emacs-el-search) ; for tests - ("emacs-stream" ,emacs-stream))) ; for tests + (version "17.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/haskell/haskell-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0izcasi2v02zh08c863h43m8mmsldzy8pck43cllrfn0zf24v2qn")))) (propagated-inputs `(("emacs-dash" ,emacs-dash))) (native-inputs `(("emacs" ,emacs-minimal) + ("emacs-el-search" ,emacs-el-search) + ("emacs-stream" ,emacs-stream) ("texinfo" ,texinfo))) (build-system gnu-build-system) (arguments @@ -854,8 +850,7 @@ (define-public emacs-haskell-mode #:phases (modify-phases %standard-phases (delete 'configure) - (add-before - 'build 'pre-build + (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) (define (el-dir store-dir) (match (find-files store-dir "\\.el$") @@ -874,14 +869,17 @@ (define emacs-prefix? (cut string-prefix? "emacs-" <>)) (_ "")) inputs))) (substitute* (find-files "." "\\.el") (("/bin/sh") sh)) - ;; embed filename to fix test failure - (let ((file "tests/haskell-cabal-tests.el")) - (substitute* file - (("\\(buffer-file-name\\)") - (format #f "(or (buffer-file-name) ~s)" file)))) #t))) - (replace - 'install + (add-before 'check 'delete-failing-tests + ;; XXX: these tests require GHC executable, which would be a big + ;; native input. + (lambda _ + (with-directory-excursion "tests" + (for-each delete-file + '("haskell-customize-tests.el" + "inferior-haskell-tests.el"))) + #t)) + (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (el-dir (string-append out "/share/emacs/site-lisp")) @@ -898,9 +896,6 @@ (define (copy-to-dir dir files) (install-file "haskell-mode.info" info)) (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) (copy-to-dir el-dir (find-files "." "\\.elc?")) - ;; These are part of other packages. - (with-directory-excursion el-dir - (for-each delete-file '("dash.el" "ert.el"))) #t)))))) (home-page "https://github.com/haskell/haskell-mode") (synopsis "Haskell mode for Emacs") diff --git a/gnu/packages/patches/haskell-mode-make-check.patch b/gnu/packages/patches/haskell-mode-make-check.patch deleted file mode 100644 index a4d4d525f2..0000000000 --- a/gnu/packages/patches/haskell-mode-make-check.patch +++ /dev/null @@ -1,35 +0,0 @@ -Copied from upstream repository. -Hunk #2 is removed since it cannot be applied and it is not needed. - -From 7cead7137bf54851c1b7df5a3854351296d21276 Mon Sep 17 00:00:00 2001 -From: Vasantha Ganesh K -Date: Thu, 22 Jun 2017 23:38:40 +0530 -Subject: [PATCH] removed `check-conventions' from make - ---- - Makefile | 7 +- - tests/haskell-code-conventions.el | 165 ------------------------------ - 2 files changed, 1 insertion(+), 171 deletions(-) - delete mode 100644 tests/haskell-code-conventions.el - -diff --git a/Makefile b/Makefile -index b2c89d6..aa907c5 100644 ---- a/Makefile -+++ b/Makefile -@@ -79,12 +79,7 @@ build-$(EMACS_VERSION)/build-flag : build-$(EMACS_VERSION) $(patsubst %.el,build - check-%: tests/%-tests.el - $(BATCH) -l "$<" -f ert-run-tests-batch-and-exit; - --check: compile $(AUTOLOADS) check-ert check-conventions -- --check-conventions : -- $(BATCH) -l tests/haskell-code-conventions.el \ -- -f haskell-check-conventions-batch-and-exit -- @echo "conventions are okay" -+check: compile $(AUTOLOADS) check-ert - - check-ert: $(ELCHECKS) - $(BATCH) --eval "(when (= emacs-major-version 24) \ --- -2.18.0 - diff --git a/gnu/packages/patches/haskell-mode-unused-variables.patch b/gnu/packages/patches/haskell-mode-unused-variables.patch deleted file mode 100644 index b175fae28c..0000000000 --- a/gnu/packages/patches/haskell-mode-unused-variables.patch +++ /dev/null @@ -1,44 +0,0 @@ -Copied verbatim from upstream repository. - -From cee22450ee30e79952f594796721dc6b17798ee6 Mon Sep 17 00:00:00 2001 -From: Sascha Wilde -Date: Fri, 23 Sep 2016 15:35:59 +0200 -Subject: [PATCH] Removed unused lexical variables. - ---- - haskell-lexeme.el | 3 +-- - haskell-process.el | 4 +--- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/haskell-lexeme.el b/haskell-lexeme.el -index 4256a79..b832560 100644 ---- a/haskell-lexeme.el -+++ b/haskell-lexeme.el -@@ -138,8 +138,7 @@ When match is successful, match-data will contain: - (match-text 2) - whole qualified identifier - (match-text 3) - unqualified part of identifier - (match-text 4) - closing backtick" -- (let ((begin (point)) -- (match-data-old (match-data)) -+ (let ((match-data-old (match-data)) - first-backtick-start - last-backtick-start - qid-start -diff --git a/haskell-process.el b/haskell-process.el -index b4efba2..4f3f859 100644 ---- a/haskell-process.el -+++ b/haskell-process.el -@@ -160,9 +160,7 @@ HPTYPE is the result of calling `'haskell-process-type`' function." - (defun haskell-process-log (msg) - "Effective append MSG to the process log (if enabled)." - (when haskell-process-log -- (let* ((append-to (get-buffer-create "*haskell-process-log*")) -- (windows (get-buffer-window-list append-to t t)) -- move-point-in-windows) -+ (let* ((append-to (get-buffer-create "*haskell-process-log*"))) - (with-current-buffer append-to - ;; point should follow insertion so that it stays at the end - ;; of the buffer --- -2.18.0 - -- cgit v1.2.3 From d7c606818b0a9e79a70789b036f03c559f84e09f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 6 Jun 2020 14:16:30 +0200 Subject: gnu: Add cl-ascii-table. * gnu/packages/lisp-xyz.scm (sbcl-cl-ascii-table, cl-ascii-table, ecl-cl-ascii-table): New variables. --- 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 1bb6c4b55c..e92fd0ba1d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11898,3 +11898,32 @@ (define-public cl-1am (define-public ecl-1am (sbcl-package->ecl-package sbcl-1am)) + +(define-public sbcl-cl-ascii-table + (let ((commit "d9f5e774a56fad1b416e4dadb8f8a5b0e84094e2") + (revision "1")) + (package + (name "sbcl-cl-ascii-table") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/telephil/cl-ascii-table.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "125fdif9sgl7k0ngjhxv0wjas2q27d075025hvj2rx1b1x948z4s")))) + (build-system asdf-build-system/sbcl) + (synopsis "Library to make ascii-art tables") + (description + "This is a Common Lisp library to present tabular data in ascii-art +tables.") + (home-page "https://github.com/telephil/cl-ascii-table") + (license license:expat)))) + +(define-public cl-ascii-table + (sbcl-package->cl-source-package sbcl-cl-ascii-table)) + +(define-public ecl-cl-ascii-table + (sbcl-package->ecl-package sbcl-cl-ascii-table)) -- cgit v1.2.3 From a531168f5da6feb762c51c2f2ff88b0a5ee5cdc8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 14:53:38 +0200 Subject: gnu: emacs-edit-server: Update to 1.15. * gnu/packages/emacs-xyz.scm (emacs-edit-server): Update to 1.15. --- 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 3964891c7e..0d6e7d0843 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14107,7 +14107,7 @@ (define-public emacs-crux (define-public emacs-edit-server (package (name "emacs-edit-server") - (version "1.13") + (version "1.15") (source (origin (method git-fetch) @@ -14116,7 +14116,7 @@ (define-public emacs-edit-server (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn")))) + (base32 "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8312d6f0bc1854cbb4c88c90591b994e1c5aab91 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:00:15 +0200 Subject: gnu: emacs-multi-term: Update to 1.5.0.017c77c. * gnu/packages/emacs-xyz.scm (emacs-multi-term): Update to 1.5.0.017c77c. --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d6e7d0843..95d47046c1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20809,21 +20809,24 @@ (define-public emacs-org-redmine (license license:gpl3+)))) (define-public emacs-multi-term - (let ((commit "0804b11e52b960c80f5cd0712ee1e53ae70d83a4")) + ;; No upstream release. Extract version from main file. + (let ((commit "017c77c550115936860e2ea71b88e585371475d5") + (revision "0")) (package (name "emacs-multi-term") - (version "1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/manateelazycat/multi-term.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0apvidmvb7rv05qjnjhax42ma8wrimik5vxx620dlbv17svz7iyf")))) + (version (git-version "1.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/manateelazycat/multi-term.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "043dqd8i8h6hbcg11rzprxin2yq5lb902zlrb7mxah44vyp8wrdi")))) (build-system emacs-build-system) - (inputs `(("zsh" ,zsh))) + (inputs + `(("zsh" ,zsh))) (home-page "https://github.com/manateelazycat/multi-term") (synopsis "Manage multiple terminal buffers in Emacs") (description -- cgit v1.2.3 From dc81932ee5883c7c90e1bfd0f57b0321f4f183f9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:06:19 +0200 Subject: gnu: emacs-highlight-escape-sequences: Fix version number. * gnu/packages/emacs-xyz.scm (emacs-highlight-escape-sequences): Extract appropriate version number from main file. --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 95d47046c1..4ccbc14a23 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15637,12 +15637,12 @@ (define-public emacs-on-screen (license license:gpl3+))) (define-public emacs-highlight-escape-sequences + ;; No release upstream. Extract version from main file. (let ((commit "08d846a7aa748209d65fecead2b6a766c3e5cb41") - (revision "1")) + (revision "0")) (package (name "emacs-highlight-escape-sequences") - (version (string-append "0.0.1" "-" revision "." - (string-take commit 7))) + (version (git-version "0.4" revision commit)) (source (origin (method git-fetch) @@ -15651,8 +15651,7 @@ (define-public emacs-highlight-escape-sequences (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 - "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is")))) + (base32 "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is")))) (build-system emacs-build-system) (home-page "https://github.com/dgutov/highlight-escape-sequences") (synopsis "Highlight escape sequences in Emacs") -- cgit v1.2.3 From 7b32e7bfafe40f0ef9158f823a73e33173291ab8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:10:45 +0200 Subject: gnu: emacs-posframe: Update to 0.7.0. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 0.7.0. [source]: Use GNU Elpa repository instead of GitHub. --- gnu/packages/emacs-xyz.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4ccbc14a23..f207cebb71 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10322,20 +10322,18 @@ (define-public emacs-pyim (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.5.0") + (version "0.7.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tumashu/posframe") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "posframe-" version ".el")) (sha256 - (base32 - "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3")))) + (base32 "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9")))) (build-system emacs-build-system) - ;; emacs-minimal does not include the function font-info - (arguments `(#:emacs ,emacs)) + ;; emacs-minimal does not include the function font-info. + (arguments + `(#:emacs ,emacs)) (home-page "https://github.com/tumashu/posframe") (synopsis "Pop a posframe (a child frame) at point") (description "@code{emacs-posframe} can pop a posframe at point. A -- cgit v1.2.3 From 678248f5ea3d3d19bc2a5a41d90bb30e63e667e1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:14:25 +0200 Subject: gnu: emacs-stream: Update to 2.2.5. * gnu/packages/emacs-xyz.scm (emacs-stream): Update to 2.2.5. [source]: Use GNU ELPA repository instead of GitHub. [arguments]: Skip tests, which do not exist on ELPA. --- gnu/packages/emacs-xyz.scm | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f207cebb71..94d2620056 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9139,31 +9139,23 @@ (define-public emacs-nginx-mode (license license:gpl2+))) (define-public emacs-stream - (let ((commit "a3f3da155a49c133e2692bd8789b35492bfdc4f7") - (revision "1")) - (package - (name "emacs-stream") - (version (git-version "2.2.4" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Emacsmirror/stream.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0aig0yjb9z752ijh0mzildjmh44j051inchga8qll01dr8wf7332")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "tests/stream-tests.el" - "-f" "ert-run-tests-batch-and-exit"))) - (home-page "https://github.com/Emacsmirror/stream") - (synopsis "Implementation of streams for Emacs") - (description "This library provides an implementation of streams for Emacs. + (package + (name "emacs-stream") + (version "2.2.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "stream-" version ".tar")) + (file-name (git-file-name name version)) + (sha256 + (base32 "00c3n4gyxzv7vczqms0d62kl8zsmjfyxa92mwxn2snyx857a9jfw")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/stream.html") + (synopsis "Implementation of streams for Emacs") + (description "This library provides an implementation of streams for Emacs. Streams are implemented as delayed evaluation of cons cells.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-cl-print (let ((commit "1a70c553dfb04352afb5b8696fe0cef8acc8f991") -- cgit v1.2.3 From b68bf28c8fc896a0a388f8eeaf7c78bcd64557b8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:17:22 +0200 Subject: gnu: emacs-rainbow-mode: Update to 1.0.4. * gnu/packages/emacs-xyz.scm (emacs-rainbow-mode): Update to 1.0.4. --- gnu/packages/emacs-xyz.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 94d2620056..35827c056e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7512,20 +7512,20 @@ (define-public emacs-rainbow-identifiers (define-public emacs-rainbow-mode (package (name "emacs-rainbow-mode") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/rainbow-mode-" version ".el")) - (sha256 - (base32 - "1zfqj63sr07pdlwy7caz4fxsjhmbhh939n81z6jxq9xggm8ajxkd")))) + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "rainbow-mode-" version ".el")) + (sha256 + (base32 "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/rainbow-mode.html") (synopsis "Colorize color names in buffers") (description "This minor mode sets background color to strings that match color -names, e.g. #0000ff is displayed in white with a blue background.") +names, e.g., @samp{#0000ff} is displayed in white with a blue background.") (license license:gpl3+))) (define-public emacs-ryo-modal -- cgit v1.2.3 From c08a784c58bca8df048bc98276aa4fcf0d61d8b3 Mon Sep 17 00:00:00 2001 From: Steve Sprang Date: Fri, 5 Jun 2020 11:05:06 -0700 Subject: gnu: openscad: Add patch to fix build. * gnu/packages/patches/openscad-parser-boost-1.72.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/engineering.scm (openscad)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/engineering.scm | 4 +++- .../patches/openscad-parser-boost-1.72.patch | 26 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openscad-parser-boost-1.72.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5016d16d7a..92a2255893 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1326,6 +1326,7 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ + %D%/packages/patches/openscad-parser-boost-1.72.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2102f8d295..9d9c67b861 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2263,7 +2263,9 @@ (define-public openscad ".src.tar.gz")) (sha256 (base32 - "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")))) + "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")) + (patches (search-patches + "openscad-parser-boost-1.72.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) diff --git a/gnu/packages/patches/openscad-parser-boost-1.72.patch b/gnu/packages/patches/openscad-parser-boost-1.72.patch new file mode 100644 index 0000000000..35311e6173 --- /dev/null +++ b/gnu/packages/patches/openscad-parser-boost-1.72.patch @@ -0,0 +1,26 @@ +https://github.com/openscad/openscad/commit/b6c170cc5d.patch + +From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Fri, 25 Oct 2019 15:10:26 +0000 +Subject: [PATCH] Add missing header bootlegged by Boost < 1.72 + +src/parser.y:76:6: error: no template named 'stack' in namespace 'std' +std::stack scope_stack; +~~~~~^ +--- + src/parser.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/parser.y b/src/parser.y +index 7f4fd56ca7..4c77c989ea 100644 +--- a/src/parser.y ++++ b/src/parser.y +@@ -46,6 +46,7 @@ + #include "printutils.h" + #include "memory.h" + #include ++#include + #include + #include "boost-utils.h" + #include "feature.h" -- cgit v1.2.3 From 0bcf20e9491ae122942e8b210469ff4cd772a134 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:23:10 +0200 Subject: gnu: emacs-web-server: Update to 0.1.2. * gnu/packages/emacs-xyz.scm (emacs-web-server): Update to 0.1.2. [source]: Use GNU ELPA repository instead of GitHub. [native-inputs]: Remove unnecessary native inputs. [arguments]: Do not run tests, which do not exist in ELPA. --- gnu/packages/emacs-xyz.scm | 48 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 35827c056e..00cefb984f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19854,40 +19854,22 @@ (define-public emacs-prodigy-el (license license:gpl3+)))) (define-public emacs-web-server - (let ((commit "cafa5b7582c57252a0884b2c33da9b18fb678713") - (revision "1")) - (package - (name "emacs-web-server") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/eschulte/emacs-web-server/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1c0lfqmbs5hvz3fh3c8wgp6ipwmxrwx9xj264bjpj3phixd5419y")))) - (build-system emacs-build-system) - (native-inputs - `(("curl" ,curl))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-shell - ;; Setting the SHELL environment variable is required for the tests - ;; to find sh. - (lambda _ - (setenv "SHELL" (which "sh")) - #t))) - #:tests? #t - #:test-command '("make" "check"))) - (home-page "https://github.com/eschulte/emacs-web-server/") - (synopsis "Web server with handlers in Emacs Lisp") - (description "This package supports HTTP GET and POST requests with + (package + (name "emacs-web-server") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "web-server-" version ".tar")) + (sha256 + (base32 "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim")))) + (build-system emacs-build-system) + (home-page "https://github.com/eschulte/emacs-web-server/") + (synopsis "Web server with handlers in Emacs Lisp") + (description "This package supports HTTP GET and POST requests with url-encoded parameters, as well as web sockets.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-markdown-preview-mode (package -- cgit v1.2.3 From 5c5bd76f314924402c8a6d9323936cd187e20de5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Jun 2020 15:21:54 +0200 Subject: gnu: openconnect: Add a comment about the gnutls version. * gnu/packages/vpn.scm (openconnect): Add said comment. * gnu/packages/tls.scm (gnutls): Add backlink to optimise SEO. --- gnu/packages/tls.scm | 1 + gnu/packages/vpn.scm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index ec81b7bf07..8a644a3ef2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -165,6 +165,7 @@ (define-public p11-kit (define-public gnutls (package (name "gnutls") + ;; XXX Unversion openconnect's "gnutls" input when ungrafting. (replacement gnutls-3.6.13) (version "3.6.12") (source (origin diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 0f0157806c..5c38ac71e8 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -259,6 +259,8 @@ (define-public openconnect (build-system gnu-build-system) (propagated-inputs `(("libxml2" ,libxml2) + ;; XXX ‘DTLS is insecure in GnuTLS v3.6.3 through v3.6.12.’ + ;; See . ("gnutls" ,gnutls-3.6.13) ("zlib" ,zlib))) (inputs -- cgit v1.2.3 From 2a56b2cf867c49429a594b10bf39e71565d59326 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:29:02 +0200 Subject: gnu: emacs-exwm: Update to 0.24. * gnu/packages/emacs-xyz.scm (emacs-exwm): Update to 0.24. --- gnu/packages/emacs-xyz.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 00cefb984f..df5f47a495 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10448,15 +10448,15 @@ (define-public emacs-xelb (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.23") + (version "0.24") (synopsis "Emacs X window manager") - (source (origin - (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/exwm-" - version ".tar")) - (sha256 - (base32 - "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "exwm-" version ".tar")) + (sha256 + (base32 "0lj1a3cmbpf4h6x8k6x8cdm1qb51ca6filydnvi5zcda8zpl060s")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) @@ -10508,8 +10508,9 @@ (define-public emacs-exwm (chmod exwm-executable #o555) #t)))))) (home-page "https://github.com/ch11ng/exwm") - (description "EXWM is a full-featured tiling X window manager for Emacs -built on top of XELB.") + (description + "EXWM is a full-featured tiling X window manager for Emacs built on top +of XELB.") (license license:gpl3+))) (define-public emacs-switch-window -- cgit v1.2.3 From fa7bd13e5b143d6a6741a9672748782e0e6d0ee6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 4 Jun 2020 17:54:15 +0200 Subject: gnu: rcas-web: Use guile2.2 version of Guile-Redis. * gnu/packages/bioinformatics.scm (rcas-web)[inputs]: Change from GUILE-REDIS to GUILE2.2-REDIS. While at it, rename the GUILE input to "guile" instead of "guile-next". --- 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 54cdb353c1..550c0387e9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8747,9 +8747,9 @@ (define-public rcas-web (inputs `(("r-minimal" ,r-minimal) ("r-rcas" ,r-rcas) - ("guile-next" ,guile-2.2) + ("guile" ,guile-2.2) ("guile-json" ,guile-json-1) - ("guile-redis" ,guile-redis))) + ("guile-redis" ,guile2.2-redis))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/BIMSBbioinfo/rcas-web") -- cgit v1.2.3 From 8951b9496b5c390adb3b3292d234bb8ab9936c40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 15:00:42 +0200 Subject: gnu: GnuTLS: Update replacement to 3.6.14 [fixes CVE-2020-13777]. * gnu/packages/tls.scm (gnutls-3.6.13): Rename to ... (gnutls-3.6.14): ... this. Update to 3.6.14. (gnutls)[replacement]: Adjust accordingly. * gnu/packages/package-management.scm (guix)[propagated-inputs]: Likewise. * gnu/packages/vpn.scm (openconnect)[propagated-inputs]: Likewise. --- gnu/packages/package-management.scm | 2 +- gnu/packages/tls.scm | 10 +++++----- gnu/packages/vpn.scm | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ecaebac291..cc3a40cb93 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -371,7 +371,7 @@ (define code ("glibc-utf8-locales" ,glibc-utf8-locales))) (propagated-inputs - `(("gnutls" ,(if (%current-target-system) gnutls-3.6.13 guile3.0-gnutls)) + `(("gnutls" ,(if (%current-target-system) gnutls-3.6.14 guile3.0-gnutls)) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) ("guile-sqlite3" ,guile-sqlite3) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 8a644a3ef2..ec401416ce 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -166,7 +166,7 @@ (define-public gnutls (package (name "gnutls") ;; XXX Unversion openconnect's "gnutls" input when ungrafting. - (replacement gnutls-3.6.13) + (replacement gnutls-3.6.14) (version "3.6.12") (source (origin (method url-fetch) @@ -254,20 +254,20 @@ (define-public gnutls (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) -(define-public gnutls-3.6.13 +(define-public gnutls-3.6.14 (package (inherit gnutls) - (version "3.6.13") + (version "3.6.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnutls/v" (version-major+minor version) - "/gnutls-3.6.13.tar.xz")) + "/gnutls-" version ".tar.xz")) (patches (search-patches "gnutls-skip-trust-store-test.patch" "gnutls-cross.patch")) (sha256 (base32 - "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j")))) + "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n")))) (native-inputs `(,@(if (%current-target-system) ;for cross-build `(("guile" ,guile-3.0)) ;to create .go files diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 5c38ac71e8..e16ac81961 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -261,7 +261,7 @@ (define-public openconnect `(("libxml2" ,libxml2) ;; XXX ‘DTLS is insecure in GnuTLS v3.6.3 through v3.6.12.’ ;; See . - ("gnutls" ,gnutls-3.6.13) + ("gnutls" ,gnutls-3.6.14) ("zlib" ,zlib))) (inputs `(("lz4" ,lz4) -- cgit v1.2.3 From c125119204a0084c52b78fe902a6f0fb75869c7e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:47:57 +0200 Subject: gnu: emacs-ebdb: Update to 0.6.18. * gnu/packages/emacs-xyz.scm (emacs-ebdb): Update to 0.6.18. [source]: Use GNU ELPA repository instead of GitHub. --- gnu/packages/emacs-xyz.scm | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index df5f47a495..79dcddc60b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21033,30 +21033,25 @@ (define-public emacs-mastodon federated microblogging social network.") (license license:gpl3+))) -;; The last release tarball is for version 0.6. We pick a commit close to -;; version 0.6.10, which doesn't have a release tarball. (define-public emacs-ebdb - (let ((commit "2a87f5ed2a53e3a4e91e8c88ba5afc49f5e945df") - (revision "0")) - (package - (name "emacs-ebdb") - (version (git-version "0.6.10" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/girzel/ebdb.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fidy7z0c86dpqiss97sg5s92fd3fj4bdl8pqqdgg2m00jx4mrjz")))) - (build-system emacs-build-system) - (home-page "https://github.com/girzel/ebdb") - (synopsis "EIEIO port of BBDB, Emacs's contact-management package") - (description "EBDB is a contact management/addressbook package for -Emacs. It's a re-write of the Insidious Big Brother Database (BBDB) using -Emacs Lisp's (relatively new) EIEIO object oriented libraries.") - (license license:gpl3+)))) + (package + (name "emacs-ebdb") + (version "0.6.18") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "ebdb-" version ".tar")) + (sha256 + (base32 "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw")))) + (build-system emacs-build-system) + (home-page "https://github.com/girzel/ebdb") + (synopsis "EIEIO port of BBDB, Emacs's contact-management package") + (description + "EBDB is a contact management/addressbook package for Emacs. It's +a re-write of the Insidious Big Brother Database (BBDB) using Emacs +Lisp's (relatively new) EIEIO object oriented libraries.") + (license license:gpl3+))) (define-public emacs-refactor (package -- cgit v1.2.3 From 7239b05494686d8d407545b57b7d1f662c2215f1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:54:51 +0200 Subject: gnu: emacs-frog-menu: Update to 0.2.11. * gnu/packages/emacs-xyz.scm (emacs-frog-menu): Update to 0.2.11. [source]: Use GNU ELPA repository instead of GitHub. --- gnu/packages/emacs-xyz.scm | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 79dcddc60b..eb7b90bedf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12564,31 +12564,26 @@ (define-public emacs-exec-path-from-shell (license license:gpl3+))) (define-public emacs-frog-menu - (let ((commit "740bbc88b8535d31f783f3b2043a2a6683afbf31") - (revision "1")) - (package - (name "emacs-frog-menu") - (version (git-version "0.2.9" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clemera/frog-menu") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1g77424jwq62qj06rvld44s5hp0dw8rw2pwmmag6gd536zf65xrj")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-posframe" ,emacs-posframe) - ("emacs-avy" ,emacs-avy))) - (home-page "https://github.com/clemera/frog-menu") - (synopsis "Quickly pick items from ad hoc menus") - (description - "This package provides a popup offering a preview of a list of -candidates on which user-defined dispatch actions can act.") - (license license:gpl3+)))) + (package + (name "emacs-frog-menu") + (version "0.2.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "frog-menu-" version ".el")) + (sha256 + (base32 "06iw11z61fd0g4w3562k3smcmzaq3nivvvc6gzm8y8k5pcrqzdff")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-avy" ,emacs-avy) + ("emacs-posframe" ,emacs-posframe))) + (home-page "https://github.com/clemera/frog-menu") + (synopsis "Quickly pick items from ad hoc menus") + (description + "This package provides a popup offering a preview of a list of candidates +on which user-defined dispatch actions can act.") + (license license:gpl3+))) (define-public emacs-frog-jump-buffer (let ((commit "2d7b342785ae27d45f5d252272df6eb773c78e20") -- cgit v1.2.3 From 36b5cfdf0269b0b73aba8b7190e297e327ea6ead Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 15:59:04 +0200 Subject: gnu: emacs-howm: Update to 1.4.6. * gnu/packages/emacs-xyz.scm (emacs-howm): Update to 1.4.6. --- 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 eb7b90bedf..9509bfd0b4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1864,14 +1864,14 @@ (define-public emacs-autothemer (define-public emacs-howm (package (name "emacs-howm") - (version "1.4.5") + (version "1.4.6") (source (origin (method url-fetch) - (uri (string-append "https://howm.sourceforge.jp/a/howm-" - version ".tar.gz")) + (uri (string-append "https://howm.sourceforge.jp/a/" + "howm-" version ".tar.gz")) (sha256 - (base32 "1kvr5pxpc9rwhkza9025mdi0wvh0f0rpawl21rzirjk1x10903yi")))) + (base32 "17ihch1zbk08ih7gc232jlmbw7hax8ldb9glxp8d75k4asa98qh5")))) (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-minimal))) -- cgit v1.2.3 From 49b4a062f960b8299cd611e2fa6e922691405502 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 16:07:14 +0200 Subject: gnu: emacs-zones: Update to 2019.7.13. * gnu/packages/emacs-xyz.scm (emacs-zones): Update to 2019.7.13. [source]: Use GNU ELPA repository instead of GitHub. Remove unnecessary patch. * gnu/packages/patches/emacs-zones-called-interactively.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Apply file deletion. --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 47 +++++++++------------- .../patches/emacs-zones-called-interactively.patch | 43 -------------------- 3 files changed, 20 insertions(+), 71 deletions(-) delete mode 100644 gnu/packages/patches/emacs-zones-called-interactively.patch diff --git a/gnu/local.mk b/gnu/local.mk index 92a2255893..ae8a2275f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -895,7 +895,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-undohist-ignored.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ - %D%/packages/patches/emacs-zones-called-interactively.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9509bfd0b4..0871a14c64 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9311,33 +9311,26 @@ (define-public emacs-alert (license license:gpl2+))) (define-public emacs-zones - (let ((commit "3169815c323966ff8e252b44e3558d6d045243fe") - (revision "2")) - (package - (name "emacs-zones") - (version (git-version "0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacsmirror/zones.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "039msns5596rz0my7fxpanpxwg1lkhpiibm9ppnlzaajx1hszbzl")) - (patches - (search-patches - "emacs-zones-called-interactively.patch")))) - (build-system emacs-build-system) - (home-page "https://www.emacswiki.org/emacs/Zones") - (synopsis "Define and act on multiple zones of buffer text") - (description "Library @file{zones.el} lets you easily define and -subsequently act on multiple zones of buffer text. You can think of this as -enlarging the notion of region. In effect, it can remove the requirement of -target text being a contiguous sequence of characters. A set of buffer zones -is, in effect, a (typically) noncontiguous set of text.") - (license license:gpl3+)))) + (package + (name "emacs-zones") + (version "2019.7.13") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "zones-" version ".el")) + (sha256 + (base32 "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1")))) + (build-system emacs-build-system) + (home-page "https://www.emacswiki.org/emacs/Zones") + (synopsis "Define and act on multiple zones of buffer text") + (description + "Library @file{zones.el} lets you easily define and subsequently act on +multiple zones of buffer text. You can think of this as enlarging the notion +of region. In effect, it can remove the requirement of target text being +a contiguous sequence of characters. A set of buffer zones is, in effect, +a (typically) noncontiguous set of text.") + (license license:gpl3+))) (define-public emacs-mu4e-alert (package diff --git a/gnu/packages/patches/emacs-zones-called-interactively.patch b/gnu/packages/patches/emacs-zones-called-interactively.patch deleted file mode 100644 index eefcfdd12e..0000000000 --- a/gnu/packages/patches/emacs-zones-called-interactively.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81603e53ebaae0f0b23c4c52c7dab83e808964ec Mon Sep 17 00:00:00 2001 -From: Brian Leung -Date: Sun, 17 Mar 2019 01:32:04 +0100 -Subject: [PATCH] This patch silences the byte-compiler. - ---- - zones.el | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/zones.el b/zones.el -index ca88d48..594ea36 100644 ---- a/zones.el -+++ b/zones.el -@@ -1075,7 +1075,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - (defadvice narrow-to-defun (after zz-add-zone--defun activate) - "Push the defun limits to the current `zz-izones-var'. -@@ -1083,7 +1083,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - ;; Call `zz-add-zone' if interactive or `zz-add-zone-anyway-p'. - ;; -@@ -1093,7 +1093,7 @@ You can use `C-x n x' to widen to a previous buffer restriction. - - This is a destructive operation. The list structure of the variable - value can be modified." -- (zz-narrow-advice (interactive-p))) -+ (zz-narrow-advice (called-interactively-p 'interactive))) - - ;;(@* "General Commands") - --- -2.22.0 - -- cgit v1.2.3 From ba209becc617d23c308359d15b1c05c76ea3a103 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 16:17:04 +0200 Subject: gnu: emacs-mmm-mode: Update to 0.5.8. * gnu/packages/emacs-xyz.scm (emacs-mmm-mode): Update to 0.5.8. [source]: Use GNU ELPA repository instead of GitHub. [build-system]: Switch to emacs-build-system. [native-inputs]: Remove. --- gnu/packages/emacs-xyz.scm | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0871a14c64..7fa1ca5b49 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2247,28 +2247,20 @@ (define-public emacs-imenu-list (define-public emacs-mmm-mode (package (name "emacs-mmm-mode") - (version "0.5.7") + (version "0.5.8") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/purcell/mmm-mode.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/" + "mmm-mode-" version ".tar")) (sha256 - (base32 - "0lxd55yhz0ag7v1ydff55bg4h8snq5lbk8cjwxqpyq6gh4v7md1h")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("emacs" ,emacs-minimal) - ("texinfo" ,texinfo-5))) ;fails to build with Texinfo 6.7 + (base32 "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4")))) + (build-system emacs-build-system) (home-page "https://github.com/purcell/mmm-mode") (synopsis "Allow multiple major modes in an Emacs buffer") (description - "MMM Mode is a minor mode that allows multiple major modes to coexist in a -single buffer.") + "MMM Mode is a minor mode that allows multiple major modes to coexist in +a single buffer.") (license license:gpl3+))) (define-public emacs-mmt -- cgit v1.2.3 From 8ad05ef697bd239fd9115d9b5e6e69661dcfdca3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 16:21:26 +0200 Subject: gnu: emacs-nhexl-mode: Update to 1.5. * gnu/packages/emacs-xyz.scm (emacs-nhexl-mode): Update to 1.5. [description]: Remove trailing newline character. --- gnu/packages/emacs-xyz.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7fa1ca5b49..378fd20bf5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20427,15 +20427,14 @@ (define-public emacs-semantic-refactor (define-public emacs-nhexl-mode (package (name "emacs-nhexl-mode") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) - (uri (string-append - "https://elpa.gnu.org/packages/nhexl-mode-" - version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/" + "nhexl-mode-" version ".el")) (sha256 - (base32 "1c2q4w6hkvc7z4026hiqdcsm2scd6q35x7b0dk80h8qicsbi14c8")))) + (base32 "0qvxfg7sv4iqyjxzaim6b4v9k5hav36qd4vkf9jwzw6p5fri8w8d")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/nhexl-mode.html") (synopsis "Minor mode to edit files via hex-dump format") @@ -20459,7 +20458,7 @@ (define-public emacs-nhexl-mode existing text, but commands like `yank' and @command{kill-region} as well. @item It overrides @code{C-u} to use hexadecimal, so you can do @code{C-u a 4 C-f} to advance by #xa4 characters. -@end itemize\n") +@end itemize") (license license:gpl3+))) (define-public emacs-helm-wikipedia -- cgit v1.2.3 From a2ebb515dbd6e363ddf8cd0f42afa7233d7036f5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Jun 2020 20:03:10 +0200 Subject: gnu: emacs-with-editor: Update to 2.9.2. * gnu/packages/emacs-xyz.scm (emacs-with-editor): Update to 2.9.2. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 378fd20bf5..23876932ac 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -297,16 +297,16 @@ (define-public git-modes (define-public emacs-with-editor (package (name "emacs-with-editor") - (version "2.9.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/with-editor.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sjb3qqrn1rhmpkrn14l8rya6c3gwxwmgw74n779s54kvl9gn7a9")))) + (version "2.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/with-editor.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m8bm8q5zakfjdkd0662gbkvzmcrlkxy1856xns2nfiflrkpw88b")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) -- cgit v1.2.3 From 50580fd44db2a89a37608994a491db4aef4f9538 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 5 Jun 2020 19:35:40 +0300 Subject: gnu: rust-rpassword-4: Update to 4.0.5. * gnu/packages/crates-io.scm (rust-rpassword-4): Update to 4.0.5. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 20f0567c51..788ec02654 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18967,14 +18967,14 @@ (define-public rust-rspec-1 (define-public rust-rpassword-4 (package (name "rust-rpassword") - (version "4.0.3") + (version "4.0.5") (source (origin (method url-fetch) (uri (crate-uri "rpassword" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0jnl8wzmdazkpzqs0vsw0n0vm0v4b8chqifd6s84nl9w2ybhx7ym")))) + (base32 "17z99xazhhbaczw0ib1vnnq450j0zacdn8b2zcbdir68sdbicdwr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 75c5d360d9b285433f22bb8b826622ecb236bc11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 3 Jun 2020 23:35:27 +0200 Subject: gnu: grantlee: Correct license. * gnu/packages/qt.scm (grantlee)[license]: Set to LGPL2.1+. --- gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c312efa1f9..cd5b38d74c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -142,7 +142,7 @@ (define-public grantlee (description "Grantlee Templates can be used for theming and generation of other text such as code. The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee.") - (license license:lgpl2.0+))) + (license license:lgpl2.1+))) (define-public qt-4 (package -- cgit v1.2.3 From 6ecdb8dc5ea0dffcf4e42d034368536c368ead04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 15:47:39 +0200 Subject: gnu: akonadi-search: Enable tests. * gnu/packages/kde-pim.scm (akonadi-search)[native-inputs]: Add DBUS. [arguments]: Add #:phases. --- gnu/packages/kde-pim.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index cb24f0efbf..0d6ab36c15 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019, 2020 Hartmut Goebel +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -308,7 +309,10 @@ (define-public akonadi-search (base32 "16qzs2cs4nxwrpwcdgwry95qn6wmg8s1p4w3qajx1ahkgwmsh11s")))) (build-system qt-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) + `(("extra-cmake-modules" ,extra-cmake-modules) + + ;; For tests. + ("dbus" ,dbus))) (inputs `(("akonadi" ,akonadi) ("akonadi-mime" ,akonadi-mime) @@ -327,7 +331,19 @@ (define-public akonadi-search ("qtbase" ,qtbase) ("xapian" ,xapian))) (arguments - `(#:tests? #f)) ;; TODO: needs dbus + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: This test fails because it fails to establish + ;; a socket connection, seemingly due to failure during + ;; DBus communication. + (substitute* "agent/autotests/CMakeLists.txt" + ((".*schedulertest\\.cpp.*") + "")) + #t)) + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest")))))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/akonadi/html/") (synopsis "Akonadi search library") (description "This package provides a library used to search in the -- cgit v1.2.3 From 32a4c032be404168157824adf13e312f8dff4a6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 16:12:16 +0200 Subject: gnu: kdevelop: Update to 5.5.2. * gnu/packages/kde.scm (kdevelop): Update to 5.5.2. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c52feb5725..c978504793 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -209,7 +209,7 @@ (define-public kdenlive (define-public kdevelop (package (name "kdevelop") - (version "5.5.1") + (version "5.5.2") (source (origin (method url-fetch) @@ -217,7 +217,7 @@ (define-public kdevelop "/" version "/src/kdevelop-" version ".tar.xz")) (sha256 - (base32 "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy")))) + (base32 "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2")))) (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From 9c0fd3d34cab839411ba47312eba6b659d5213ae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 20:56:54 +0200 Subject: gnu: KContacts: Propagate required inputs. * gnu/packages/kde-frameworks.scm (kcontacts)[inputs]: Move KCODECS, KCOREADDONS, KCONFIG, and KI18N ... [propagated-inputs]: ... here. New field. --- gnu/packages/kde-frameworks.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0c31709329..d8a1e5262c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1561,11 +1561,13 @@ (define-public kcontacts `(("extra-cmake-modules" ,extra-cmake-modules) ("xorg-server" ,xorg-server))) ; for the tests (inputs - `(("kcodecs" ,kcodecs) + `(("qtbase" ,qtbase))) + (propagated-inputs + `(;; As required by KF5ContactsConfig.cmake. + ("kcodecs" ,kcodecs) ("kconfig" ,kconfig) ("kcoreaddons" ,kcoreaddons) - ("ki18n" ,ki18n) - ("qtbase" ,qtbase))) + ("ki18n" ,ki18n))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From b69ca4d234db8fe2750e9b0d6b6139a5a89a4da6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jun 2020 20:57:50 +0200 Subject: gnu: Add kpeoplevcard. * gnu/packages/kde-pim.scm (kpeoplevcard): New public variable. --- gnu/packages/kde-pim.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 0d6ab36c15..569ac43d91 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1595,6 +1595,37 @@ (define-public korganizer (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public kpeoplevcard + (package + (name "kpeoplevcard") + (version "0.1") + (source (origin + (method url-fetch) + (uri (string-append "https://download.kde.org/stable/kpeoplevcard/" + version "/kpeoplevcard-" version ".tar.xz")) + (sha256 + (base32 + "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd")))) + (build-system qt-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check-setup + (lambda _ + (setenv "HOME" "/tmp") + #t))))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcontacts" ,kcontacts) + ("kpeople" ,kpeople) + ("qtbase" ,qtbase))) + (home-page "https://invent.kde.org/pim/kpeoplevcard") + (synopsis "Expose vCard contacts to KPeople") + (description + "This plugins adds support for vCard (also known as @acronym{VCF, +Virtual Contact File}) files to the KPeople contact management library.") + (license license:lgpl2.1+))) + (define-public kpimcommon (package (name "kpimcommon") -- cgit v1.2.3