From 083809229bf199399c33b072056be77dbfd75555 Mon Sep 17 00:00:00 2001 From: João Pedro Simas Date: Fri, 12 Mar 2021 19:42:02 -0300 Subject: gnu: gnuradio: Update to 3.9.0.0. * gnu/packages/radio.scm (gnuradio): Update to 3.9.0.0. [source]: Remove snippet deleting the included copy of volk, as it is not included anymore. [native-inputs]: Replace swig with pybind11. [inputs]: Add sdl (for dtv). [arguments]: Remove 'configure-flags". Disable broken tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/radio.scm | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 3378b36adb..233af9c287 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Charlie Ritter ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 João Pedro Simas ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +68,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) + #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) @@ -286,32 +288,26 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (define-public gnuradio (package (name "gnuradio") - (version "3.8.0.0") + (version "3.9.0.0") (source (origin (method url-fetch) (uri (string-append "https://www.gnuradio.org/releases/gnuradio/" "gnuradio-" version ".tar.xz")) (sha256 - (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled volk to use the shared one. - (delete-file-recursively "volk") - #t)))) + (base32 "1jvm9xd0l2pz1fww4zii6hl7ccnvy256nrf70ljb594n7j9j49ha")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) ("ghostscript" ,ghostscript) ("orc" ,orc) ("pkg-config" ,pkg-config) + ("pybind11" ,pybind11) ("python-cheetah" ,python-cheetah) ("python-mako" ,python-mako) ("python-pyzmq" ,python-pyzmq) ("python-scipy" ,python-scipy) ("python-sphinx" ,python-sphinx) - ("swig" ,swig) ("texlive" ,(texlive-union (list texlive-amsfonts texlive-latex-amsmath ;; TODO: Add newunicodechar. @@ -343,6 +339,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("python-pyyaml" ,python-pyyaml) ("qtbase" ,qtbase) ("qwt" ,qwt) + ("sdl" ,sdl) ("volk" ,volk) ("zeromq" ,zeromq))) (arguments @@ -354,8 +351,6 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") #:imported-modules (,@%cmake-build-system-modules (guix build glib-or-gtk-build-system) (guix build python-build-system)) - #:configure-flags - '("-DENABLE_INTERNAL_VOLK=OFF") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths @@ -371,8 +366,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (substitute* "cmake/Modules/GrPython.cmake" (("dist-packages") "site-packages")) - (substitute* '("gr-vocoder/swig/vocoder_swig.i" - "gr-vocoder/include/gnuradio/vocoder/codec2.h" + (substitute* '("gr-vocoder/include/gnuradio/vocoder/codec2.h" "gr-vocoder/include/gnuradio/vocoder/freedv_api.h") (("string (parallel-job-count)) + "1") + "--output-on-failure" + ;;disable broken tests + "-E" (string-join + '(;; https://github.com/gnuradio/gnuradio/issues/3871 + "qa_header_payload_demux" + ;; https://github.com/gnuradio/gnuradio/issues/4348 + "qa_packet_headerparser_b") + "|")))) (add-after 'install 'wrap-python (assoc-ref python:%standard-phases 'wrap)) (add-after 'wrap-python 'wrap-glib-or-gtk -- cgit v1.2.3 From d3e7f1eeacf3c852b8997c30f4d8e87df87162ae Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 24 Mar 2021 11:51:21 +0100 Subject: gnu: gnuradio: Add missing inputs. * gnu/packages/radio.scm (gnuradio)[native-inputs]: Add js-mathjax. [inputs]: Add libsndfile. [arguments]: Add 'configure-flags' to find mathjax. --- gnu/packages/radio.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 233af9c287..e2e96afbe2 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages javascript) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages logging) @@ -300,6 +301,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (native-inputs `(("doxygen" ,doxygen) ("ghostscript" ,ghostscript) + ("js-mathjax" ,js-mathjax) ("orc" ,orc) ("pkg-config" ,pkg-config) ("pybind11" ,pybind11) @@ -325,6 +327,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("gsm" ,gsm) ("gtk+" ,gtk+) ("jack" ,jack-1) + ("libsndfile" ,libsndfile) ("log4cpp" ,log4cpp) ("pango" ,pango) ("portaudio" ,portaudio) @@ -351,6 +354,10 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") #:imported-modules (,@%cmake-build-system-modules (guix build glib-or-gtk-build-system) (guix build python-build-system)) + #:configure-flags + (list (string-append "-DMATHJAX2_ROOT=" + (assoc-ref %build-inputs "js-mathjax") + "/share/javascript/mathjax")) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths -- cgit v1.2.3 From 50e33007a5f00860aa06e4f4715c293266ce1612 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 24 Mar 2021 10:18:22 +0100 Subject: gnu: gnuradio-iqbalance: Update to 0.38.2-0.fbee239. * gnu/packages/radio.scm (gnuradio-iqbalance): Update to 0.38.2-0.fbee239. [native-inputs]: Replace swig by pybind11. --- gnu/packages/radio.scm | 67 ++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index e2e96afbe2..eb46803719 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -518,36 +518,39 @@ primitives for SDR (Software Defined Radio).") (license license:gpl2+))) (define-public gnuradio-iqbalance - (package - (name "gnuradio-iqbalance") - (version "0.38.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.osmocom.org/gr-iqbal") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ksagwz05p3b0702q7ljq7013xmp0ijp30my9z6s3p7ja8dj42s3")))) - (build-system cmake-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("python-numpy" ,python-numpy) - ("python-six" ,python-six) - ("swig" ,swig))) - (inputs - `(("boost" ,boost) - ("fftwf" ,fftwf) - ("gmp" ,gmp) - ("gnuradio" ,gnuradio) - ("libosmo-dsp" ,libosmo-dsp) - ("log4cpp" ,log4cpp) - ("volk" ,volk))) - (synopsis "GNU Radio block to correct IQ imbalance") - (description + ;; No tag for version supporting Gnuradio 3.9; use commit. + (let ((commit "fbee239a6fb36dd2fb564f6e6a0d393c4bc844db") + (revision "0")) + (package + (name "gnuradio-iqbalance") + (version (git-version "0.38.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osmocom.org/gr-iqbal") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12p193ngcs65nd3lynry119nhv40mikamqkw37wdln7lawx3nw7p")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config) + ("pybind11" ,pybind11) + ("python" ,python) + ("python-numpy" ,python-numpy) + ("python-six" ,python-six))) + (inputs + `(("boost" ,boost) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gnuradio" ,gnuradio) + ("libosmo-dsp" ,libosmo-dsp) + ("log4cpp" ,log4cpp) + ("volk" ,volk))) + (synopsis "GNU Radio block to correct IQ imbalance") + (description "This is a GNU Radio block to correct IQ imbalance in quadrature receivers. It's composed of two main block: @itemize @@ -555,8 +558,8 @@ receivers. It's composed of two main block: @item Optimize: Attempts to auto-detect the phase and amplitude error to feed to the fix block above. @end itemize") - (home-page "https://git.osmocom.org/gr-iqbal/") - (license license:gpl3+))) + (home-page "https://git.osmocom.org/gr-iqbal/") + (license license:gpl3+)))) (define-public gqrx (package -- cgit v1.2.3 From f1df119224f467eb05bb8c2abde96a0fea453aa7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 24 Mar 2021 10:27:24 +0100 Subject: gnu: gnuradio-osmosdr: Update to 0.2.3-0.a100eb0. * gnu/packages/radio.scm (gnuradio-osmosdr): Update to 0.2.3-0.a100eb0. [native-inputs]: Replace swig by pybind11. [inputs]: Add libsndfile. --- gnu/packages/radio.scm | 70 ++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index eb46803719..14ac598ebb 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -438,40 +438,44 @@ environment.") (license license:gpl3+))) (define-public gnuradio-osmosdr - (package - (name "gnuradio-osmosdr") - (version "0.2.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.osmocom.org/gr-osmosdr") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1aqj5cylipmmjh1x1kb2j8262hxq6mi86dgb2zphj94wvsab2ghx")))) - (build-system cmake-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("python-mako" ,python-mako) - ("python-six" ,python-six) - ("swig" ,swig))) - (inputs - `(("boost" ,boost) - ("fftwf" ,fftwf) - ("gmp" ,gmp) - ("gnuradio" ,gnuradio) - ("hackrf" ,hackrf) - ("log4cpp" ,log4cpp) - ("rtl-sdr" ,rtl-sdr) - ("volk" ,volk))) - (synopsis "GNU Radio block for interfacing with various radio hardware") - (description "This is a block for GNU Radio allowing to use a common API + ;; No tag for version supporting Gnuradio 3.9; use commit. + (let ((commit "a100eb024c0210b95e4738b6efd836d48225bd03") + (revision "0")) + (package + (name "gnuradio-osmosdr") + (version (git-version "0.2.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osmocom.org/gr-osmosdr") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pk5gnyznfyy510lbqzg9ijcb1fnhmn547n24aiqyrxd6i6vv1ki")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config) + ("pybind11" ,pybind11) + ("python" ,python) + ("python-mako" ,python-mako) + ("python-six" ,python-six))) + (inputs + `(("boost" ,boost) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gnuradio" ,gnuradio) + ("hackrf" ,hackrf) + ("libsndfile" ,libsndfile) + ("log4cpp" ,log4cpp) + ("rtl-sdr" ,rtl-sdr) + ("volk" ,volk))) + (synopsis "GNU Radio block for interfacing with various radio hardware") + (description "This is a block for GNU Radio allowing to use a common API to access different radio hardware.") - (home-page "https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR") - (license license:gpl3+))) + (home-page "https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR") + (license license:gpl3+)))) (define-public libosmo-dsp (package -- cgit v1.2.3 From da80d4e6a7bd9fc42f94006152c4762dbbc1f509 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 24 Mar 2021 12:00:46 +0100 Subject: gnu: gqrx: Add missing input. * gnu/packages/radio.scm (gqrx)[inputs]: Add libsndfile. --- gnu/packages/radio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 14ac598ebb..c10c91fd99 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -590,6 +590,7 @@ to the fix block above. ("gnuradio-iqbalance" ,gnuradio-iqbalance) ("gnuradio-osmosdr" ,gnuradio-osmosdr) ("jack" ,jack-1) + ("libsndfile" ,libsndfile) ("log4cpp" ,log4cpp) ("portaudio" ,portaudio) ("pulseaudio" ,pulseaudio) -- cgit v1.2.3 From 3f944e62044e7afd35b03f06525f04157f05f05d Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 22 Mar 2021 19:52:23 +0000 Subject: gnu: ccache: Update to 4.2. * gnu/packages/ccache.scm (ccache): Update to 4.2. [build-system]: Switch to cmake-build-system. [inputs]: Add zstd:lib. [arguments]: Move substitution before change of directory and add phase to set HOME variable. Signed-off-by: Efraim Flashner --- gnu/packages/ccache.scm | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index c5b9790f27..112f613c88 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,7 @@ #:use-module (guix packages) #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (guix download) - #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages perl) #:use-module (gnu packages compression)) @@ -30,25 +31,32 @@ (define-public ccache (package (name "ccache") - (version "3.7.12") + (version "4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "005liq8csgxdn7m9hj2ah07hishww855p8sc96y1hrnwc21lwbx0")))) - (build-system gnu-build-system) + (base32 "0kx9ggbbm899zwyyxvm4dgzn1b95zi1niz0l734pi5y3i0cb251g")))) + (build-system cmake-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) - (inputs `(("zlib" ,zlib))) + (inputs `(("zlib" ,zlib) + ("zstd" ,zstd "lib"))) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'check 'setup-tests - (lambda _ - (substitute* '("unittest/test_hashutil.c" "test/suites/base.bash") - (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t))))) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'setup-tests + (lambda _ + (substitute* '("unittest/test_hashutil.cpp" "test/suites/base.bash") + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t)) + ;; tests require a writable HOME + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) + #t))))) (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description -- cgit v1.2.3 From 55685e45be072b8b688f5a2bda4fc68147febd3f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 24 Mar 2021 14:14:10 +0100 Subject: gnu: Add python-pylibacl. * gnu/packages/acl.scm (python-pylibacl): New variable. --- gnu/packages/acl.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index be4b079b04..abeafeef88 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,13 +27,15 @@ #:use-module (guix licenses) #:use-module (gnu packages attr) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages hurd) #:use-module (gnu packages gettext) #:use-module (gnu packages perl) #:use-module (guix packages) #:use-module (guix download) #:use-module (gnu packages) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python)) (define-public acl (package @@ -93,3 +96,41 @@ (description "Library and tools for manipulating access control lists.") (license (list gpl2+ lgpl2.1+)))) + +(define-public python-pylibacl + (package + (name "python-pylibacl") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pylibacl" version)) + (sha256 + (base32 + "1zyrk2m20p5b6bdwxhrwib273i6i71zyr5hzssbxfqis5qra9848")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-tests + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; These tests operate on real files, but our tempfs does not support + ;; ACLs + (substitute* "tests/test_acls.py" + (("( *)def test_applyto(_extended(_mixed)?)?" match indent) + (string-append indent "@pytest.mark.skip(reason=\"guix\")\n" match))) + #t)) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests")) + #t))))) + (inputs `(("acl" ,acl))) + (native-inputs `(("python-pytest" ,python-pytest))) + (home-page "https://pylibacl.k1024.org/") + (synopsis "POSIX.1e ACLs for python") + (description "Python 3.4+ extension module that allows you to manipulate +the POSIX.1e Access Control Lists present in some OS/file-systems +combinations.") + (license lgpl2.1+))) -- cgit v1.2.3 From d999fc689e27569698d72d5e77eba986a9b016d7 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 24 Mar 2021 19:22:43 +0100 Subject: gnu: guile-mastodon: Update to 0.0.1-1.74b75bc. * gnu/packages/guile-xyz.scm (guile-mastodon): Update to 0.0.1-1.74b75bc. [source]: Remove Guile-3.0 snippet since this new release brings Guile-3.0 support. --- gnu/packages/guile-xyz.scm | 65 +++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 461b9e04bf..c798bed817 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1313,44 +1313,37 @@ Scheme by using Guile’s foreign function interface.") (deprecated-package "guile3.0-newt" guile-newt)) (define-public guile-mastodon - (package - (name "guile-mastodon") - (version "0.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://framagit.org/prouby/guile-mastodon.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^PKG_CHECK.*") "") - (("^GUILE_PKG.*") - "GUILE_PKG([3.0 2.2])\n")) - #t)))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("emacs" ,emacs-minimal) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs - `(("guile" ,guile-3.0) - ("gnutls" ,gnutls) - ("guile-json" ,guile-json-4))) - (home-page "https://framagit.org/prouby/guile-mastodon") - (synopsis "Guile Mastodon REST API module") - (description "This package provides Guile modules to access the + (let ((commit "74b75bcf547df92acee1e0466ecd7ec07f775392") + (revision "1")) + (package + (name "guile-mastodon") + (version (git-version "0.0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/prouby/guile-mastodon.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1wx5h6wa9c0na8mrnr2nv1nzjvq68zyrly8yyp11dsskhaw4y33h")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("emacs" ,emacs-minimal) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (inputs + `(("guile" ,guile-3.0) + ("gnutls" ,gnutls) + ("guile-json" ,guile-json-4))) + (home-page "https://framagit.org/prouby/guile-mastodon") + (synopsis "Guile Mastodon REST API module") + (description "This package provides Guile modules to access the @uref{https://docs.joinmastodon.org/api/, REST API of Mastodon}, a federated microblogging service.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public guile-parted (package -- cgit v1.2.3 From 03bf951f7032c6592b576001c8800e7cbe056580 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 24 Mar 2021 19:26:00 +0100 Subject: gnu: guile-mastodon-dev: Remove it. * gnu/packages/ci.scm (guile-mastodon-dev): Remove it. (cuirass): Update it. --- gnu/packages/ci.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index e0c7238f2b..bafe997c82 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,24 +47,6 @@ #:use-module (gnu packages xml) #:use-module (guix build-system gnu)) -(define-public guile-mastodon-dev - (let ((commit "88115d85221876b1baea4accb7c76995da32f479") - (revision "1")) - (package - (inherit guile-mastodon) - (name "guile-mastodon") - (version (git-version "0.0.1" revision commit)) - (home-page "https://framagit.org/mothacehe/guile-mastodon.git") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (sha256 - (base32 - "04dgxliz9bmhn0f7h1n0dj0r5h0fzhg80nxl1rpbxh4zs1yw9qvj")) - (file-name (string-append name "-" version "-checkout"))))))) - (define-public cuirass (let ((commit "6f4a203a0bb2d441d091d561c1735fbe2d170cf7") (revision "2")) @@ -158,7 +140,7 @@ ("guile-squee" ,guile-squee) ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) - ("guile-mastodon" ,guile-mastodon-dev) + ("guile-mastodon" ,guile-mastodon) ("gnutls" ,gnutls) ("mailutils" ,mailutils) ;; FIXME: this is propagated by "guile-git", but it needs to be among -- cgit v1.2.3 From 650bb580df3c9b1654a0e7ad97fe750350546198 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Mar 2021 21:06:44 +0200 Subject: gnu: ddrescue: Support cross compiling. * gnu/packages/disk.scm (ddrescue)[arguments]: Add configure-flag to fix cross compiling. --- gnu/packages/disk.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index ed112f2ec2..b89da87967 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018–2021 Tobias Geerinckx-Rice -;;; Copyright © 2016, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2017 Marius Bakke @@ -363,6 +363,8 @@ scheme.") (sha256 (base32 "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags (list (string-append "CXX=" ,(cxx-for-target))))) (home-page "https://www.gnu.org/software/ddrescue/ddrescue.html") (synopsis "Data recovery utility") (native-inputs `(("lzip" ,lzip))) -- cgit v1.2.3 From 534bcb6b286af0c2fef6638378194ded876c2d10 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Mar 2021 21:09:19 +0100 Subject: gnu: r-textshape: Use HTTPS home page URI. * gnu/packages/cran.scm (r-textshape)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b9842ca954..96a2aee766 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27600,7 +27600,7 @@ in same length matches).") `(("r-data-table" ,r-data-table) ("r-slam" ,r-slam) ("r-stringi" ,r-stringi))) - (home-page "http://github.com/trinker/textshape") + (home-page "https://github.com/trinker/textshape") (synopsis "Tools for Reshaping Text") (description "Tools that can be used to reshape and restructure text data.") -- cgit v1.2.3 From 92d231847a3bdd632e40c3cc963069e71d50737c Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Wed, 24 Mar 2021 21:51:51 +0100 Subject: gnu: Add emacs-vterm-toggle. * gnu/packages/emacs-xyz.scm (emacs-vterm-toggle): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a147e81289..84fe776f3b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21470,6 +21470,31 @@ stored playlists.") display a terminal in an Emacs buffer.") (license license:gpl3+)))) +(define-public emacs-vterm-toggle + ;; There have been no releases. + (let ((commit "d10239b7bb89b78dddb82f66ac2286bc0b02747b") + (revision "1")) + (package + (name "emacs-vterm-toggle") + (version (git-version "0.0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jixiuf/vterm-toggle") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r9n23wg9cfy10h5f9zqr8jpkvw34f9rylri3nxq870awjab7rqi")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-vterm" ,emacs-vterm))) + (home-page "https://github.com/jixiuf/vterm-toggle") + (synopsis "Toggle between a vterm buffer and other buffers") + (description + "This package provides a DWIM way to switch from an Emacs buffer to +a vterm buffer and back again.") + (license license:gpl3+)))) + (define-public emacs-simple-mpc ;; There have been no releases. (let ((commit "bee8520e81292b4c7353e45b193f9a13b482f5b2") -- cgit v1.2.3 From c420cec69bf5b24540e86cef8d521d51e0ee6631 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Wed, 24 Mar 2021 19:34:44 +0100 Subject: gnu: emacs-git-gutter: Update to 0.91. * gnu/packages/emacs-xyz.scm (emacs-git-gutter): Update to 0.91. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 84fe776f3b..f45507c647 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3535,7 +3535,7 @@ representation.") (define-public emacs-git-gutter (package (name "emacs-git-gutter") - (version "0.90") + (version "0.91") (source (origin (method git-fetch) @@ -3544,7 +3544,7 @@ representation.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5")))) + (base32 "0zc9f73app1d7j4yb10sy4xidh5252ncyxlvr5kh0kiqk88ck6j9")))) (build-system emacs-build-system) (home-page "https://github.com/syohex/emacs-git-gutter") (synopsis "See and manage hunks of text in a version control system") -- cgit v1.2.3 From ab170124a327b4b359fc440796b18fadb0516f3c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Mar 2021 23:30:49 -0300 Subject: gnu: Add drawing. * gnu/packages/gnome.scm (drawing): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnome.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6661942eb5..09e62d7897 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4256,6 +4256,57 @@ engineering.") ;; Dual licensed under GPLv2 or GPLv3 (both without "or later") (list license:gpl2 license:gpl3)))) +(define-public drawing + (package + (name "drawing") + (version "0.6.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/maoschanz/drawing") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kfgmalakifcvzhzss9zhmqjbdk24zr22c5xwkkahlvfcafp13wn")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/drawing")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("pango" ,pango) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject))) + (home-page "https://maoschanz.github.io/drawing/") + (synopsis "Basic image editor for GNOME") + (description + "Drawing is a basic image editor aiming at the GNOME desktop.") + (license license:gpl3+))) + (define-public gnome-themes-standard (package (name "gnome-themes-standard") -- cgit v1.2.3 From 86dd54f2307b1f984f599c218843f49b57ac6173 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Mar 2021 22:45:53 -0300 Subject: gnu: Add gsequencer. * gnu/packages/music.scm (gsequencer): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/music.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f02c7f2c21..98cd3583cc 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Leo Prikler +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,6 +153,7 @@ #:use-module (gnu packages video) #:use-module (gnu packages vim) ;for 'xxd' #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -4784,6 +4786,67 @@ list view, and a score editor. MusE aims to be a complete multitrack virtual studio.") (license license:gpl2+))) +(define-public gsequencer + (package + (name "gsequencer") + (version "3.7.48") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/gsequencer.git/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pqaj09x3lzcj0zbbkqpyaky9i1w462bhhvg1akh73nzwvyy46zd")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'prepare-x-for-test + (lambda _ + (system "Xvfb &") + (setenv "DISPLAY" ":0") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("cunit" ,cunit) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("libtool" ,libtool) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("dssi" ,dssi) + ("fftw" ,fftw) + ("gst-plugins-base" ,gst-plugins-base) + ("gstreamer" ,gstreamer) + ("gtk+" ,gtk+) + ("jack" ,jack-1) + ("ladspa" ,ladspa) + ("libinstpatch" ,libinstpatch) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) + ("libsoup" ,libsoup) + ("libuuid" ,util-linux "lib") + ("libxml2" ,libxml2) + ("lv2" ,lv2) + ("pulseaudio" ,pulseaudio) + ("webkitgtk" ,webkitgtk))) + (home-page "https://nongnu.org/gsequencer/") + (synopsis "Advanced Gtk+ Sequencer") + (description + "GSequencer allows you to play, capture and create music. There is a piano +roll, automation and wave form editor. It has machines for playing drum samples, +Soundfont2 sound containers and synthesizers. They usually can be connected to a +MIDI input source (instrument). It has support for various audio backends like +ALSA, Pulseaudio, JACK, OSSv4 and CoreAudio.") + (license license:gpl3+))) + (define-public dssi (package (name "dssi") -- cgit v1.2.3 From b0eb525ddba77420ff8c0930b9173b10f9ae342d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Mar 2021 23:41:05 +0100 Subject: gnu: guix: Update to 86dd54f. * gnu/packages/package-management.scm (guix): Update to 86dd54f. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 888f54322d..c82ba3e213 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") - (revision 17)) + (commit "86dd54f2307b1f984f599c218843f49b57ac6173") + (revision 18)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) + "1vp3k4l7qs4s6irr4ylf9yk3yyq07bppvlz4z4c84s6qq5972m6i")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 4dc13760c2bf60654a0922a696314876c49be809 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:50:29 -0400 Subject: gnu: linux-libre: Update to 5.11.9. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.9. (linux-libre-5.11-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ac137f448d..3840f14c05 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.8") +(define-public linux-libre-5.11-version "5.11.9") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "17y8q0gy4b00rms6pgglzmzz4msvmn2frqvln9vac39m78k3kyci"))) + (hash (base32 "0dcqn6s85sd4zl7rv8ay88p5z12xvy2rma0dx6g6b480rg68sxal"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit v1.2.3 From 1daef9052f9d4ab75461b6932aad6a48283785f6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:51:02 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.108. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.108. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3840f14c05..84ff653b51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.107") +(define-public linux-libre-5.4-version "5.4.108") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0q3m4d96d0hhhzn71aarh314i4cx9h3qvhhi5hrmcsrnbxafyg0w"))) + (hash (base32 "0wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From e5918b8c5e8895b7958da14c3ae38aae053ed027 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:51:20 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.183. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.183. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 84ff653b51..427f3d4a55 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.182") +(define-public linux-libre-4.19-version "4.19.183") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0r93mgvjypmj0glg0912vfq9zbagi59w4d88ynz5gm8sl05pbnq5"))) + (hash (base32 "1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 153bc03830e585bb8fc8a3d40be524b9f4fb0aca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:51:40 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.227. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.227. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 427f3d4a55..f01f1b8b9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.226") +(define-public linux-libre-4.14-version "4.14.227") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s"))) + (hash (base32 "1iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From a802989ce8984d923116dc5a7da2a143bbd21837 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:52:14 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.263. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.263. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f01f1b8b9b..3d14932387 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.262") +(define-public linux-libre-4.9-version "4.9.263") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj"))) + (hash (base32 "1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From da00a3a477775ce3996b15861059b3227a6bf5a3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:52:31 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.263. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.263. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3d14932387..cf193bc0b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.262") +(define-public linux-libre-4.4-version "4.4.263") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j"))) + (hash (base32 "1qqh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 27d967dfa44aaffd610bed29d88a7161ef144119 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 25 Mar 2021 02:31:42 +0100 Subject: Revert "gnu: guix: Update to 86dd54f." A test failure (tests/print) was uncovered so revert until we fix it. This reverts commit b0eb525ddba77420ff8c0930b9173b10f9ae342d. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c82ba3e213..888f54322d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "86dd54f2307b1f984f599c218843f49b57ac6173") - (revision 18)) + (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") + (revision 17)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1vp3k4l7qs4s6irr4ylf9yk3yyq07bppvlz4z4c84s6qq5972m6i")) + "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From f445407df67b7c1ead0cae1456a619c24db1a874 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 25 Mar 2021 10:35:55 +0100 Subject: gnu: Add html-template. * gnu/packages/lisp-xyz.scm (cl-html-template, ecl-html-template, sbcl-html-template): New variables. --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5682daee3f..c40995491f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15342,3 +15342,40 @@ numbers in Common Lisp.") (define-public cl-computable-reals (sbcl-package->cl-source-package sbcl-computable-reals)) + +(define-public sbcl-html-template + (package + (name "sbcl-html-template") + (version "0.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/edicl/html-template") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wz3czvjsn4x971dsiia9f9nvvcmbkablcl75zsvxndkimc93wxb")))) + (build-system asdf-build-system/sbcl) + (home-page "https://edicl.github.io/html-template/") + (synopsis "HTML templates from Common Lisp") + (description + "HTML-TEMPLATE is a Common Lisp library which can be used to fill +templates with arbitrary (string) values at runtime. The result does not have +to be HTML. + +It is loosely modeled after the Perl module @code{HTML::Template} and +partially compatible with a its syntax, though both libraries contain some +extensions that the other does not support. + +HTML-TEMPLATE translates templates into efficient closures which can be +re-used as often as needed. It uses a cache mechanism so you can update +templates while your program is running and have the changes take effect +immediately.") + (license license:bsd-2))) + +(define-public ecl-html-template + (sbcl-package->ecl-package sbcl-html-template)) + +(define-public cl-html-template + (sbcl-package->cl-source-package sbcl-html-template)) -- cgit v1.2.3 From 8ee6bb91c126799c2a0ac23df1ecb4ab5a0ceb1d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 25 Mar 2021 10:36:05 +0100 Subject: gnu: Add quickproject. * gnu/packages/lisp-xyz.scm (cl-quickproject, ecl-quickproject, sbcl-quickproject): New variables. --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c40995491f..d4bf75b231 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15379,3 +15379,36 @@ immediately.") (define-public cl-html-template (sbcl-package->cl-source-package sbcl-html-template)) + +(define-public sbcl-quickproject + (package + (name "sbcl-quickproject") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xach/quickproject") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1szs8p2wr1yr9mjmj3h3557l6wxzzga0iszimb68z0hb1jj3lva6")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-fad" ,sbcl-cl-fad) + ("html-template" ,sbcl-html-template))) + (arguments + '(#:asd-files '("quickproject.asd"))) + (home-page "https://xach.com/lisp/quickproject/") + (synopsis "Create Common Lisp project skeletons") + (description + "Quickproject provides a quick way to make a Common Lisp project. After +creating a project, it extends the ASDF registry so the project may be +immediately loaded.") + (license license:expat))) + +(define-public ecl-quickproject + (sbcl-package->ecl-package sbcl-quickproject)) + +(define-public cl-quickproject + (sbcl-package->cl-source-package sbcl-quickproject)) -- cgit v1.2.3 From 6b3b72fb600a949e492a9c487e15f6b59da7d6b0 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:51:20 +0100 Subject: gnu: xfce4-battery-plugin: Update to 1.1.4. * gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.4. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index dc65567835..eb934de4cf 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -463,7 +463,7 @@ applications menu, workspace switcher and more.") (define-public xfce4-battery-plugin (package (name "xfce4-battery-plugin") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -471,7 +471,7 @@ applications menu, workspace switcher and more.") name "-" version ".tar.bz2")) (sha256 (base32 - "18s0s004nidii8cc3ldp5n3jajc18vwn9vhkhmhy3lbbs520mghj")))) + "08n2cig9r2lccwvmk6v9vjiz0xqcp6x30m5b3q702v0m6ylg4z8h")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) -- cgit v1.2.3 From 71ee5a640db4c1aa16a79591ae319e6db83350f4 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:51:49 +0100 Subject: gnu: xfce4-systemload-plugin: Update to 1.3.1. * gnu/packages/xfce.scm (xfce4-systemload-plugin): Update to 1.3.1. [inputs]: Add libgtop. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index eb934de4cf..3dd42d7e1b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1916,7 +1916,7 @@ freedesktop.org specification.") (define-public xfce4-systemload-plugin (package (name "xfce4-systemload-plugin") - (version "1.2.4") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1925,13 +1925,14 @@ freedesktop.org specification.") "/xfce4-systemload-plugin-" version ".tar.bz2")) (sha256 (base32 - "0dcqg13phlcri4i4g9752m4zfkcmidiqpjv4s3l3pfiwjbgvhc85")))) + "0lknh5l30qs5c69wwjcblbyhczvdbxs59fqkb8mpqbfm05w01lan")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("libxfce4ui" ,libxfce4ui) + `(("libgtop" ,libgtop) + ("libxfce4ui" ,libxfce4ui) ("xfce4-panel" ,xfce4-panel))) (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin") -- cgit v1.2.3 From be27d36640ca12b88f96c0dce27b194b918a1243 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:52:18 +0100 Subject: gnu: thunar: Update to 4.16.6. * gnu/packages/xfce.scm (thunar): Update to 4.16.6. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 3dd42d7e1b..5560772fa7 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -765,7 +765,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "4.16.3") + (version "4.16.6") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -773,7 +773,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "0wpzs7r79aayg4zbxy514fbkabac1hhvw522cjjr453gva4xq92m")))) + "1dq238m2bh938gpb058cr2xmhy6f3qkyyya9l0ya95kiwqzislyb")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From d8235685d883b1a71b90fc20df347745725a4523 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:52:33 +0100 Subject: gnu: exo: Update to 4.16.1. * gnu/packages/xfce.scm (exo): Update to 4.16.1. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 5560772fa7..c8f0a0b7dd 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -313,7 +313,7 @@ upstream occasionally.") (define-public exo (package (name "exo") - (version "4.16.0") + (version "4.16.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -321,7 +321,7 @@ upstream occasionally.") "exo-" version ".tar.bz2")) (sha256 (base32 - "1k5sfm9cmg8k5zzzv0wb2cciqwwklnpfzcpak7wa32lsxl7b0x8r")))) + "0fxm2aczzbi0z4y6x24934964y9jg4cl4frvlnjc5zqmccjsr3aj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 3f1b2bd322b6cdba99a43d08e5e8464f7424cbc5 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:52:49 +0100 Subject: gnu: xfce4-netload-plugin: Update to 1.4.0. * gnu/packages/xfce.scm (xfce4-netload-plugin): Update to 1.4.0. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c8f0a0b7dd..e0ace027fb 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1761,7 +1761,7 @@ mounted or when unmounting fails.") (define-public xfce4-netload-plugin (package (name "xfce4-netload-plugin") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1770,7 +1770,7 @@ mounted or when unmounting fails.") "/xfce4-netload-plugin-" version ".tar.bz2")) (sha256 (base32 - "0p91875n6s8n88l7wb4w9prqly3wvkyilnr7zq0ppq71rwjh9r12")))) + "036pvhfv1iynvj75va0xl8hpvnfckabyqm9jv56pb40p2072cxkc")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 10cbf042e13c328559de3bfd8e42ceb8f8f51d10 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 25 Mar 2021 17:51:47 +0100 Subject: gnu: openssl: Update to 1.1.1k [security fixes]. Fixes CVE-2021-3450 and CVE-2021-3449. * gnu/packages/tls.scm (openssl/fixed): Update to 1.1.1k. --- gnu/packages/tls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c10975ed52..2a8c69a68c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -434,7 +434,7 @@ required structures.") (define-public openssl/fixed (package (inherit openssl) - (version "1.1.1j") + (version "1.1.1k") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -447,7 +447,7 @@ required structures.") (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma")))))) + "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9")))))) (define-public openssl-1.0 (package -- cgit v1.2.3 From a172def55ad762b2a9e796531b88da33a74ccce7 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 12 Mar 2021 06:33:26 +0100 Subject: gnu: gcc: Fix comment about gfortran. Added by: cb4805e34c9997edca14743516b9a0fde6303d1c Fixes: 0681f05486d901c92637c098bb7afddef35068b0 * gnu/packages/gcc.scm (gcc): Fix comment about gfortran. Signed-off-by: Christopher Baines --- gnu/packages/gcc.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3ea8695cf1..5f84d28551 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -595,8 +595,7 @@ It also includes runtime support libraries for these languages."))) "gcc-5.0-libvtv-runpath.patch")))))) ;; Note: When changing the default gcc version, update -;; the gcc-toolchain-* definitions and the gfortran definition -;; accordingly. +;; the gcc-toolchain-* definitions. (define-public gcc gcc-7) (define-public (make-libstdc++ gcc) -- cgit v1.2.3 From 0098fcecf0c196fd645c1dc44d2897ef1d58c730 Mon Sep 17 00:00:00 2001 From: Rafa Gálvez Date: Fri, 12 Mar 2021 16:16:13 +0100 Subject: gnu: synapse: Update to 1.29.0. * gnu/packages/matrix.scm (synapse): Update to 1.29.0. --- gnu/packages/matrix.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 8a3a1283fa..a8d9d66ee7 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -61,13 +61,13 @@ an LDAP server.") (define-public synapse (package (name "synapse") - (version "1.25.0") + (version "1.29.0") (source (origin (method url-fetch) (uri (pypi-uri "matrix-synapse" version)) (sha256 (base32 - "0382qcsmgvg24p0xvb37kn3y1kd3bn363kblgwg58iy92df0pga4")))) + "0if2yhpz8psg0661401mvxznldbfhk2j9rhbs25jdaqm9jsv6907")))) (build-system python-build-system) ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. (propagated-inputs -- cgit v1.2.3 From af3bf6b481b1cd134c02fecc9dc221bd045e65f8 Mon Sep 17 00:00:00 2001 From: Benoit Joly Date: Tue, 9 Mar 2021 00:27:55 -0500 Subject: gnu: Add go-gitlab.com-shackra-goimapnotify. * gnu/packages/mail.scm (go-gitlab.com-shackra-goimapnotify): New variable. Signed-off-by: Christopher Baines --- gnu/packages/mail.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b2a66f8513..a1168872ba 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 divoplade ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Benoit Joly ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) + #:use-module (gnu packages golang) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages groff) @@ -155,6 +157,7 @@ #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system go) #:use-module (guix build-system gnu) #:use-module (guix build-system guile) #:use-module (guix build-system perl) @@ -317,6 +320,37 @@ software.") ;; Libraries are under LGPLv3+, and programs under GPLv3+. (list license:gpl3+ license:lgpl3+)))) +(define-public go-gitlab.com-shackra-goimapnotify + (let ((commit "832bc7112db9b28e28d69e90b91ea6c005244c9b") + (revision "0")) + (package + (name "go-gitlab.com-shackra-goimapnotify") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/shackra/goimapnotify") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h27kshx4vwl5k6vc2szsq3d701fzs4gczjypz907f8hj0lrnjmy")))) + (build-system go-build-system) + (arguments + `(#:import-path "gitlab.com/shackra/goimapnotify")) + (propagated-inputs + `(("go-github-com-emersion-go-imap" ,go-github-com-emersion-go-imap) + ("go-github-com-emersion-go-imap-idle" ,go-github-com-emersion-go-imap-idle) + ("go-github-com-emersion-go-sasl" ,go-github-com-emersion-go-sasl) + ("go-github-com-sirupsen-logrus" ,go-github-com-sirupsen-logrus) + ("go-golang-org-x-text" ,go-golang-org-x-text))) + (synopsis "Execute scripts on IMAP mailbox changes.") + (description + "Script to execute scripts on IMAP mailbox changes (new/deleted/updated +messages) using IDLE. Implemented in Go.") + (home-page "https://gitlab.com/shackra/goimapnotify") + (license license:gpl3+)))) + (define-public guile2.2-mailutils (package (inherit mailutils) -- cgit v1.2.3 From ac29d37e2ffd7a85adfcac9be4d5bce018289bec Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 25 Mar 2021 18:34:01 +0100 Subject: gnu: cuirass: Update to 1.0.0-3.f5a2eea. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-3.f5a2eea. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index bafe997c82..c1305a781f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "6f4a203a0bb2d441d091d561c1735fbe2d170cf7") - (revision "2")) + (let ((commit "f5a2eeae18ec02043107199047ddffd83e76d620") + (revision "3")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "120cnnjy4j2dinfmas1ddmqzzc7ikj9c76sl4li6g6dn8g7s8f69")))) + "1jnm67zhfsbd7b0ns8llmlp7idahw1gcsg09ffrpx77yyr5xhyzg")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From f5ef08c4373995aa7ba271f0d3110421f922d436 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:03:39 +0100 Subject: gnu: emacs: Update to 27.2. * gnu/packages/emacs.scm (emacs): Update to 27.2. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 98061c93ae..7447cfe33a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Mathieu Othacehe -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jesse John Gildersleve ;;; Copyright © 2019 Valentin Ignatev ;;; Copyright © 2019 Leo Prikler @@ -76,14 +76,14 @@ (define-public emacs (package (name "emacs") - (version "27.1") + (version "27.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 - "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a")) + "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl")) (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-ignore-empty-xim-styles.patch" -- cgit v1.2.3 From 846a6aadd6b7ec80115dfc0d23990ce3108e4d3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:03:55 +0100 Subject: gnu: libinstpatch: Update to 1.1.6. * gnu/packages/audio.scm (libinstpatch): Update to 1.1.6. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f1346208a2..29ef0266ce 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4922,7 +4922,7 @@ minimum.") (define-public libinstpatch (package (name "libinstpatch") - (version "1.1.5") + (version "1.1.6") (source (origin (method git-fetch) @@ -4931,7 +4931,7 @@ minimum.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb")))) + (base32 "1w3nk0vvd1cxic70n45zjip0bdsrja969myvyvkhq3ngbarbykir")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;there are no tests -- cgit v1.2.3 From 23f964a62c6040b4d0ff34d9e69c9ad67a6033a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:04:07 +0100 Subject: gnu: doctest: Update to 2.4.6. * gnu/packages/check.scm (doctest): Update to 2.4.6. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 21514d1bc4..c27f347819 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -561,7 +561,7 @@ and it supports a very flexible form of test discovery.") (define-public doctest (package (name "doctest") - (version "2.4.5") + (version "2.4.6") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -569,7 +569,7 @@ and it supports a very flexible form of test discovery.") (file-name (git-file-name name version)) (sha256 (base32 - "1pc34dvpgdzx3paqdf0khgs87kvjncx27yn434f5ic33r1lwr9r4")))) + "14m3q6d96zg6d99x1152jkly50gdjrn5ylrbhax53pfgfzzc5yqx")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description -- cgit v1.2.3 From 6bce6469b9f386bfe938d992ec122f842efbdbf2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:04:22 +0100 Subject: gnu: wla-dx: Update to 9.12. * gnu/packages/assembly.scm (wla-dx): Update to 9.12. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 9db1834d27..dbed33bb3d 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -342,7 +342,7 @@ package for the Game Boy and Game Boy Color. It consists of: (define-public wla-dx (package (name "wla-dx") - (version "9.11") + (version "9.12") (source (origin (method git-fetch) (uri (git-reference @@ -351,7 +351,7 @@ package for the Game Boy and Game Boy Color. It consists of: (file-name (git-file-name name version)) (sha256 (base32 - "0i8pxvyaih79pqnyvqyqd9rwdid91pna76cap0k1n5zhg8xswf2f")))) + "1wlbqv2rgk9q6m9an1mi0i29250zl8lw7zipki2bbi9mczpyczli")))) (build-system cmake-build-system) (native-inputs `(("sphinx" ,python-sphinx))) ; to generate man pages -- cgit v1.2.3 From a4739f3742eb8a919f530bb4707a89a1b1cf5ec0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:04:40 +0100 Subject: gnu: youtube-dl: Update to 2021.03.25. * gnu/packages/video.scm (youtube-dl): Update to 2021.03.25. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b5a2aca980..bd8fddf9b4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.03.14") + (version "2021.03.25") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3")) + "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit v1.2.3 From 43f82eecf52c300698f19dee3927573dc8abbcb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:05:01 +0100 Subject: gnu: spdlog: Update to 1.8.3. * gnu/packages/logging.scm (spdlog): Update to 1.8.3. --- gnu/packages/logging.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index eafc23b2e6..09e9d59ed5 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Eric Bavier -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Marius Bakke @@ -190,7 +190,7 @@ output in multiple windows in a terminal.") (define-public spdlog (package (name "spdlog") - (version "1.8.2") + (version "1.8.3") (source (origin (method git-fetch) @@ -199,8 +199,7 @@ output in multiple windows in a terminal.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "03vmwbi9v7r3v8kzd0lj10fchp54kxbxwzfx7dp6qzkxjrvmx2dx")))) + (base32 "1qcabdc3yrm30vapn7g7lf3bwjissl15y66mpmx2w0gjjc6aqdd1")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit v1.2.3 From cc33f50d0e2a7835e99913226cb4c4b0e9e961ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:07:39 +0100 Subject: gnu: vips: Update to 8.10.6. * gnu/packages/image-processing.scm (vips): Update to 8.10.6. --- gnu/packages/image-processing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 26f6faea8c..7205336d53 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018 Lprndn ;;; Copyright © 2019, 2021 Efraim Flashner @@ -556,7 +556,7 @@ vision algorithms. It can be used to do things like: (define-public vips (package (name "vips") - (version "8.10.5") + (version "8.10.6") (source (origin (method url-fetch) @@ -564,7 +564,7 @@ vision algorithms. It can be used to do things like: "https://github.com/libvips/libvips/releases/download/v" version "/vips-" version ".tar.gz")) (sha256 - (base32 "1n6gw7cw66rfn1wdb92ydpkv7gfmjiinsg6d6gqxpdja6gsz5vm4")))) + (base32 "0vjsh3i0861f6h9as3bch956cidz824zz499pvhjs3lfjn6hhs14")))) (build-system gnu-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit v1.2.3 From 52e1bab6cf6929882d9a6d7e69d75df44608a617 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Mar 2021 15:48:35 -0400 Subject: gnu: linux-libre: Update to 5.11.10. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.10. (linux-libre-5.11-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cf193bc0b6..469b62dbc4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.9") +(define-public linux-libre-5.11-version "5.11.10") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "0dcqn6s85sd4zl7rv8ay88p5z12xvy2rma0dx6g6b480rg68sxal"))) + (hash (base32 "07fw48sy8p17jmm24x3rl99cwxiwhwjrxnmy3g542w9kzawaqwnk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit v1.2.3 From 6205f9521732f3d69820b2eb1ce2a735762c20b2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Mar 2021 15:51:37 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.26. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.26. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 469b62dbc4..5e7542d50b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.25") +(define-public linux-libre-5.10-version "5.10.26") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk"))) + (hash (base32 "10hlc020imxxh71nvxhnnmd66bcxndfyi78v7wv7y5mcy4rjhlzw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From bc8554ecb1c132629640f1e61dd2a7e7c9a92027 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Mar 2021 18:54:49 -0400 Subject: gnu: ircii: Update to 20210314 [security fixes]. See this message for more information about the security issues fixed in ircii 20210314: https://seclists.org/oss-sec/2021/q1/262 * gnu/packages/irc.scm (ircii): Update to 20210314. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index a595b40594..5fba72b576 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -282,14 +282,14 @@ for the IRCv3 protocol.") (define-public ircii (package (name "ircii") - (version "20151120") + (version "20210314") (source (origin (method url-fetch) (uri (string-append "https://ircii.warped.com/" name "-" version ".tar.gz")) (sha256 (base32 - "178dc279f5j894qvp96dzz7c0jpryqlcqw5g0dc9yaxg9kgw1lqm")))) + "04jczayv1vdn21fcf5zkfaa98sy7d6ydrv2sns2i67gvya2z28j3")))) (build-system gnu-build-system) ;; TODO: We should package a small socks4/5 library/server to configure ;; ircii with socks client. `ghc-socks' pulls in lots of haskell, which -- cgit v1.2.3 From a801c7379a534a2896a03a1a6f8b47eb92691b00 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 15:52:39 -0500 Subject: gnu: Remove QT 4. For more information, see: https://lists.gnu.org/archive/html/guix-devel/2016-02/msg00596.html https://bugs.gnu.org/45704 * gnu/packages/qt.scm (qt-4, python2-pyqt-4): Remove variables. * gnu/packages/engineering.scm (qucs, qucs-s): Remove variables. * gnu/packages/messaging.scm (pybitmessage): Remove variable. * gnu/packages/password-utils.scm (keepassx): Remove variable. * gnu/packages/pdf.scm (poppler-qt4): Remove variable. --- gnu/packages/engineering.scm | 250 --------------------------------------- gnu/packages/messaging.scm | 93 --------------- gnu/packages/password-utils.scm | 31 ----- gnu/packages/pdf.scm | 7 -- gnu/packages/qt.scm | 251 ---------------------------------------- 5 files changed, 632 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f3c6e6f3cd..8d7ba9c1da 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2016,256 +2016,6 @@ parallel computing platforms. It also supports serial execution.") (license (list license:gpl2+ license:lgpl2.0+)))) ; freehdl's libraries -(define-public qucs - ;; Qucs 0.0.19 segfaults when using glibc-2.26. Temporarily build from git. - ;; TODO: When qucs-0.0.20 is released, revert the commit that introduced this - ;; comment and update the package. - (let ((commit "b4f27d9222568066cd59e4c387c51a35056c99d8") - (revision "0")) - (package - (name "qucs") - (version (git-version "0.0.19" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Qucs/qucs") - (commit commit))) - (sha256 - (base32 "10bclay9xhkffmsh4j4l28kj1qpxx0pnxja5vx6305cllnq4r3gb")) - (file-name (string-append name "-" version "-checkout")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'patch-bootstrap - (lambda _ - (for-each patch-shebang - '("bootstrap" - "qucs/bootstrap" - "qucs-doc/bootstrap" - "qucs-core/bootstrap")) - #t)) - (add-before 'configure 'patch-configure - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/configure" - (("\\$QTDIR") (assoc-ref inputs "qt4"))) - #t)) - (add-after 'patch-configure 'patch-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("qucs/qucs/qucsdigi" - "qucs/qucs/qucsdigilib" - "qucs/qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref outputs "out") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp ")) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtool")) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iverilog")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp"))) - #t)) - (add-before 'check 'pre-check - (lambda _ - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t)) - (add-after 'install 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; 'qucs' directly invokes gcc, hence this wrapping. - (wrap-program (string-append out "/bin/qucs") - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("ADMSXMLBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "adms") "/bin"))) - `("ASCOBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "asco") "/bin"))) - `("QUCS_OCTAVE" ":" prefix - (,(string-append (assoc-ref inputs "octave") "/bin/octave"))))) - #t))) - #:parallel-build? #f ; race condition - #:configure-flags '("--disable-doc"))) ; we need octave-epstk - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("libtool-native" ,libtool) - ("pkg-config" ,pkg-config) - ("python" ,python-2) ; for tests - ("matplotlib" ,python2-matplotlib) ; for tests - ("numpy" ,python2-numpy) ; for tests - ("xorg-server" ,xorg-server-for-tests))) ; for tests - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("sed" ,sed))) - (home-page "http://qucs.sourceforge.net/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs is a circuit simulator with graphical user interface. The software -aims to support all kinds of circuit simulation types---e.g. DC, AC, -S-parameter, transient, noise and harmonic balance analysis. Pure digital -simulations are also supported.") - (license license:gpl2+)))) - -(define-public qucs-s - (package - (name "qucs-s") - (version "0.0.21") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ra3xdh/qucs_s/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "12m1jwhb9qwvb141qzyskbxnw3wn1x22d02z4b4862p7xvccl5h7")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-scripts - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("qucs/qucsdigi" - "qucs/qucsdigilib" - "qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref inputs "qucs") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp ")) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtool")) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iverilog")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp"))) - #t)) - (add-after 'patch-scripts 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/main.cpp" - (((string-append "QucsSettings\\.Qucsator = QucsSettings\\.BinDir " - "\\+ \"qucsator\" \\+ executableSuffix")) - (string-append "}{ QucsSettings.Qucsator = \"" - (assoc-ref inputs "qucs") "/bin/qucsator\"")) - (((string-append "QucsSettings\\.XyceExecutable = " - "\"/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce")) - (string-append "}{ QucsSettings.XyceExecutable = \"" - (assoc-ref inputs "xyce-serial") "/bin/Xyce")) - (((string-append "else QucsSettings\\.XyceParExecutable = " - "\"mpirun -np %p /usr/local" - "/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce")) - (string-append "QucsSettings.XyceParExecutable = \"" - (assoc-ref inputs "mpi") "/bin/mpirun -np %p " - (assoc-ref inputs "xyce-parallel") "/bin/Xyce")) - (("else QucsSettings\\.NgspiceExecutable = \"ngspice\"") - (string-append "QucsSettings.NgspiceExecutable = " "\"" - (assoc-ref inputs "ngspice") "/bin/ngspice\""))) - (substitute* "qucs/extsimkernels/ngspice.cpp" - (("share/qucs/xspice_cmlib") "share/qucs-s/xspice_cmlib")) - (substitute* "qucs/qucs_actions.cpp" - (("qucstrans") - (string-append (assoc-ref inputs "qucs") "/bin/qucstrans")) - (("qucsattenuator") - (string-append (assoc-ref inputs "qucs") "/bin/qucsattenuator")) - (("qucsrescodes") - (string-append (assoc-ref inputs "qucs") "/bin/qucsrescodes"))) - #t)) - (add-after 'install 'install-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (lambda (script) - (let ((file (string-append "../qucs_s-" ,version - "/qucs/" script)) - (out (assoc-ref outputs "out"))) - (install-file file (string-append out "/bin")) - (chmod (string-append out "/bin/" script) #o555))) - '("qucsdigi" "qucsdigilib" "qucsveri")) - #t)) - (add-after 'install-scripts 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/bin/qucs-s")) - (qucs (assoc-ref inputs "qucs")) - (qucsator (string-append qucs "/bin/qucsator"))) - (wrap-program file - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("QUCSATOR" ":" prefix (,qucsator)) - `("QUCSCONV" ":" prefix (,(string-append qucsator "/bin/qucsconv"))) - `("ADMSXMLBINDIR" ":" prefix (,(string-append (assoc-ref inputs "adms") - "/bin"))) - `("ASCOBINDIR" ":" prefix (,(string-append (assoc-ref inputs "asco") - "/bin"))) - `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref inputs "octave") - "/bin/octave")))) - (symlink qucsator (string-append out "/bin/qucsator")) - #t)))))) - (native-inputs - `(("libtool-native" ,libtool))) - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("mpi" ,openmpi) - ("ngspice" ,ngspice) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("qucs" ,qucs) - ("sed" ,sed) - ("xyce-serial" ,xyce-serial) - ("xyce-parallel" ,xyce-parallel))) - (home-page "https://ra3xdh.github.io/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs-S is a spin-off of the Qucs cross-platform circuit simulator. -The S letter indicates SPICE. The purpose of the Qucs-S subproject is to use -free SPICE circuit simulation kernels with the Qucs GUI. It provides the -simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") - (license license:gpl2+))) - (define-public librepcb (package (name "librepcb") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a967ac31c2..5c55e08fb2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1616,99 +1616,6 @@ guidelines. It provides an easy to use application that allows you to connect with friends and family without anyone else listening in.") (license license:gpl3+))) -(define-public pybitmessage - (package - (name "pybitmessage") - (version "0.6.3.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Bitmessage/PyBitmessage") - (commit version))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35")))) - (propagated-inputs - ;; TODO: - ;; Package "pyopencl", required in addition to numpy for OpenCL support. - ;; Package "gst123", required in addition to alsa-utils and - ;; mpg123 for sound support. - `(("python2-msgpack" ,python2-msgpack) - ("python2-pythondialog" ,python2-pythondialog) - ("python2-pyqt-4" ,python2-pyqt-4) - ("python2-sip" ,python2-sip) - ("python2-pysqlite" ,python2-pysqlite) - ("python2-pyopenssl" ,python2-pyopenssl))) - (native-inputs - `(("openssl" ,openssl))) - (build-system python-build-system) - (arguments - `(#:modules ((guix build python-build-system) - (guix build utils)) - #:tests? #f ;no test target - #:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-unmatched-python-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/bitmessagemain.py" - (("#!/usr/bin/env python2.7") - (string-append "#!" (which "python")))) - (substitute* "src/bitmessagecli.py" - (("#!/usr/bin/env python2.7.x") - (string-append "#!" (which "python")))) - #t)) - (add-after 'unpack 'fix-depends - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/depends.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so"))) - #t)) - (add-after 'unpack 'fix-local-files-in-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/proofofwork.py" - (("bitmsghash.so") - (string-append (assoc-ref outputs "out") - "/lib/bitmsghash.so"))) - #t)) - (add-after 'unpack 'fix-pyelliptic - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/pyelliptic/openssl.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so")) - (("libssl.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libssl.so"))) - #t)) - (add-after 'unpack 'noninteractive-build - ;; This applies upstream commit 4c597d3f7cf9f83a763472aa165a1a4292019f20 - (lambda _ - (substitute* "setup.py" - (("except NameError") - "except EOFError, NameError")) - #t)) - ;; XXX: python setup.py does not build and install bitmsghash, - ;; without it PyBitmessage tries to compile it at first run - ;; in the store, which due to obvious reasons fails. Do it - ;; and place it in /lib. - (add-after 'unpack 'build-and-install-bitmsghash - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "src/bitmsghash" - (system* "make") - (install-file "bitmsghash.so" - (string-append (assoc-ref outputs "out") "/lib"))) - #t))))) - (license license:expat) - (description - "Distributed and trustless peer-to-peer communications protocol -for sending encrypted messages to one person or many subscribers.") - (synopsis "Distributed peer-to-peer communication") - (home-page "https://bitmessage.org/"))) - (define-public ytalk (package (name "ytalk") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0d86a3d69e..d7942a0f8b 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -179,37 +179,6 @@ algorithms AES or Twofish.") ;; the combined work falls under the GPLv3. (license license:gpl3))) -(define-public keepassx - (package - (name "keepassx") - (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.keepassx.org/releases/" version - "/keepassx-" version ".tar.gz")) - (sha256 - (base32 - "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3")))) - (build-system cmake-build-system) - (inputs - `(("libgcrypt" ,libgcrypt) - ("libxi" ,libxi) - ("libxtst" ,libxtst) - ("qt" ,qt-4))) - (native-inputs - `(("zlib" ,zlib))) - (home-page "https://www.keepassx.org") - (synopsis "Password manager") - (description "KeePassX is a password manager or safe which helps you to -manage your passwords in a secure way. You can put all your passwords in one -database, which is locked with one master key or a key-file which can be stored -on an external storage device. The databases are encrypted using the -algorithms AES or Twofish.") - ;; Non functional parts use various licences. - (license license:gpl3) - (properties `((superseded . ,keepassxc))))) - (define-public pwsafe (package (name "pwsafe") diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 437000b7c0..00468fa814 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -299,13 +299,6 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (license (list license:bsd-3 license:gpl2)))) -(define-public poppler-qt4 - (package/inherit poppler - (name "poppler-qt4") - (inputs `(("qt-4" ,qt-4) - ,@(package-inputs poppler))) - (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) - (define-public poppler-qt5 (package/inherit poppler (name "poppler-qt5") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d718b520bd..21ccf15dc3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -277,210 +277,6 @@ 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.1+))) -(define-public qt-4 - (package - (name "qt") - (version "4.8.7") - (source (origin - (method url-fetch) - (uri (string-append "http://download.qt-project.org/archive/qt/" - (string-copy version 0 (string-rindex version #\.)) - "/" version - "/qt-everywhere-opensource-src-" - version ".tar.gz")) - (sha256 - (base32 - "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) - (patches (search-patches "qt4-ldflags.patch")) - (modules '((guix build utils))) - (snippet - ;; Remove webkit module, which is not built. - '(begin (delete-file-recursively "src/3rdparty/webkit") - #t)))) - (build-system gnu-build-system) - (propagated-inputs - `(("mesa" ,mesa))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("bluez" ,bluez) - ("cups" ,cups) - ("dbus" ,dbus) - ("double-conversion" ,double-conversion) - ("expat" ,expat) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("icu4c" ,icu4c) - ("jasper" ,jasper) - ("libinput" ,libinput-minimal) - ("libmng" ,libmng) - ("libpci" ,pciutils) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("libxslt" ,libxslt) - ("libxtst" ,libxtst) - ("mtdev" ,mtdev) - ("mariadb-dev" ,mariadb "dev") - ("nss" ,nss) - ("postgresql" ,postgresql) - ("pulseaudio" ,pulseaudio) - ("pcre2" ,pcre2) - ("sqlite" ,sqlite) - ("udev" ,eudev) - ("unixodbc" ,unixodbc) - ("wayland" ,wayland) - ("xcb-util" ,xcb-util) - ("xcb-util-image" ,xcb-util-image) - ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-wm" ,xcb-util-wm) - ("zlib" ,zlib) - ("libjpeg" ,libjpeg-turbo) - ("libsm" ,libsm) - ("openssl" ,openssl-1.0))) - (native-inputs - `(;; XXX: The JavaScriptCore engine does not build with the C++11 standard. - ;; We could build it with -std=gnu++98, but then we'll get in trouble with - ;; ICU later. Just keep using GCC 5 for now. - ("gcc@5" ,gcc-5) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-2) - ("ruby" ,ruby) - ("which" ,(@ (gnu packages base) which)))) - ;; Note: there are 37 MiB of examples and a '-exampledir' configure flags, - ;; but we can't make them a separate output because "out" and "examples" - ;; would refer to each other. - (outputs '("out" ;112MiB core + 37MiB examples - "doc")) ;280MiB of HTML + code - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'set-paths 'hide-default-gcc - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent - ;; conflicts with the GCC 5 input. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) - ":")) - #t))) - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (substitute* '("configure") - (("/bin/pwd") (which "pwd"))) - (substitute* "src/corelib/global/global.pri" - (("/bin/ls") (which "ls"))) - - (invoke - "./configure" - "-verbose" - "-prefix" out - "-nomake" "examples demos" - ;; Note: Don't pass '-docdir' since 'qmake' and - ;; libQtCore would record its value, thereby defeating - ;; the whole point of having a separate output. - "-datadir" (string-append out "/share/qt-" ,version - "/data") - "-importdir" (string-append out "/lib/qt-4" - "/imports") - "-plugindir" (string-append out "/lib/qt-4" - "/plugins") - "-translationdir" (string-append out "/share/qt-" ,version - "/translations") - "-demosdir" (string-append out "/share/qt-" ,version - "/demos") - "-examplesdir" (string-append out "/share/qt-" ,version - "/examples") - "-opensource" - "-confirm-license" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; Skip the webkit module; it fails to build on armhf - ;; and, apart from that, may pose security risks. - "-no-webkit" - ;; don't use the precompiled headers - "-no-pch" - ;; drop special machine instructions not supported - ;; on all instances of the target - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-mmx" - "-no-3dnow" - "-no-sse" - "-no-sse2")) - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx")))) - (add-after - 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - ;; Because of qt4-documentation-path.patch, documentation ends up - ;; being installed in OUT. Move it to the right place. - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (olddoc (string-append out "/doc")) - (docdir (string-append doc "/share/doc/qt-" ,version))) - (mkdir-p (dirname docdir)) - - ;; Note: We can't use 'rename-file' here because OUT and DOC are - ;; different "devices" due to bind-mounts. - (copy-recursively olddoc docdir) - (delete-file-recursively olddoc) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "QMAKEPATH") - (files '("lib/qt5"))) - (search-path-specification - (variable "QML2_IMPORT_PATH") - (files '("lib/qt5/qml"))) - (search-path-specification - (variable "QT_PLUGIN_PATH") - (files '("lib/qt5/plugins"))) - (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - (search-path-specification - (variable "XDG_CONFIG_DIRS") - (files '("etc/xdg"))))) - (home-page "https://www.qt.io/") - (synopsis "Cross-platform GUI library") - (description "Qt is a cross-platform application and UI framework for -developers using C++ or QML, a CSS & JavaScript like language.") - (license (list license:lgpl2.1 license:lgpl3)) - - ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; - ;; see . - ;; Qt 5: assembler error; see . - (supported-systems (delete "mips64el-linux" %supported-systems)))) - (define (qt5-urls component version) "Return a list of URLs for VERSION of the Qt5 COMPONENT." ;; We can't use a mirror:// scheme because these URLs are not exact copies: @@ -2286,53 +2082,6 @@ itself.") ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))))) -(define-public python2-pyqt-4 - (package (inherit python-pyqt) - (name "python2-pyqt") - (version "4.12.3") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/PyQt4/" - "PyQt-" version "/PyQt4_gpl_x11-" - version ".tar.gz")) - (sha256 - (base32 - "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0")))) - (native-inputs - `(("qt" ,qt-4))) - (inputs `(("python" ,python-2))) - (propagated-inputs - `(("python-sip" ,python2-sip))) - (arguments - `(#:tests? #f ; no check target - #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (sip (string-append out "/share/sip")) - (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) - ".")) - (lib (string-append out "/lib/python" - python-major+minor - "/site-packages"))) - (invoke "python" "configure.py" - "--confirm-license" - "--bindir" bin - "--destdir" lib - "--sipdir" sip))))))) - (license (list license:gpl2 license:gpl3)))) ; choice of either license - (define-public python-qtpy (package (name "python-qtpy") -- cgit v1.2.3 From 52c8d07a4f7033534a71ac7efeec21a65d35c125 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 25 Mar 2021 11:55:10 +0100 Subject: gnu: mariadb: Fix CVE-2021-27928. * gnu/packages/patches/mariadb-CVE-2021-27928.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/databases.scm (mariadb/fixed): New variable. Apply patch. (mariadb)[replacement]: Graft. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 8 + gnu/packages/patches/mariadb-CVE-2021-27928.patch | 642 ++++++++++++++++++++++ 3 files changed, 651 insertions(+) create mode 100644 gnu/packages/patches/mariadb-CVE-2021-27928.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 14d228cfa4..40956598db 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1380,6 +1380,7 @@ dist_patch_DATA = \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/mailutils-fix-uninitialized-variable.patch \ %D%/packages/patches/make-impure-dirs.patch \ + %D%/packages/patches/mariadb-CVE-2021-27928.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 83b6a13892..20069f9383 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -734,6 +734,7 @@ Language.") (append (find-files "extra/wolfssl") (find-files "zlib"))) #t)))) + (replacement mariadb/fixed) (build-system cmake-build-system) (outputs '("out" "lib" "dev")) (arguments @@ -969,6 +970,13 @@ Language.") as a drop-in replacement of MySQL.") (license license:gpl2))) +(define mariadb/fixed + (package + (inherit mariadb) + (source (origin + (inherit (package-source mariadb)) + (patches (search-patches "mariadb-CVE-2021-27928.patch")))))) + (define-public mariadb-connector-c (package (name "mariadb-connector-c") diff --git a/gnu/packages/patches/mariadb-CVE-2021-27928.patch b/gnu/packages/patches/mariadb-CVE-2021-27928.patch new file mode 100644 index 0000000000..39a023c159 --- /dev/null +++ b/gnu/packages/patches/mariadb-CVE-2021-27928.patch @@ -0,0 +1,642 @@ +From 7580701e6279900fec40822952a3b874732289cf Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik +Date: Thu, 18 Feb 2021 14:20:48 +0100 +Subject: [PATCH] make @@wsrep_provider and @@wsrep_notify_cmd read-only + +this should simplify run-time cluster management +--- + mysql-test/suite/galera/disabled.def | 2 + + .../galera/include/galera_load_provider.inc | 19 -------- + .../galera/include/galera_unload_provider.inc | 3 +- + .../suite/galera/r/galera_ist_rsync.result | 2 +- + .../galera/r/galera_sst_mysqldump.result | 2 +- + .../suite/galera/r/mysql-wsrep#33.result | 2 +- + .../suite/sys_vars/r/sysvars_wsrep.result | 4 +- + .../sys_vars/r/wsrep_notify_cmd_basic.result | 47 ------------------- + .../sys_vars/r/wsrep_provider_basic.result | 40 ---------------- + .../r/wsrep_provider_options_basic.result | 46 ------------------ + .../sys_vars/t/wsrep_notify_cmd_basic.test | 43 ----------------- + .../sys_vars/t/wsrep_provider_basic.test | 39 --------------- + .../t/wsrep_provider_options_basic.test | 41 ---------------- + mysql-test/suite/wsrep/disabled.def | 2 + + mysql-test/suite/wsrep/r/variables.result | 12 ++--- + mysql-test/suite/wsrep/t/variables.test | 32 +++---------- + sql/sys_vars.cc | 8 ++-- + 17 files changed, 25 insertions(+), 319 deletions(-) + delete mode 100644 mysql-test/suite/sys_vars/r/wsrep_notify_cmd_basic.result + delete mode 100644 mysql-test/suite/sys_vars/r/wsrep_provider_basic.result + delete mode 100644 mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result + delete mode 100644 mysql-test/suite/sys_vars/t/wsrep_notify_cmd_basic.test + delete mode 100644 mysql-test/suite/sys_vars/t/wsrep_provider_basic.test + delete mode 100644 mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test + +diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def +index d940c702d54..83f26e81636 100644 +--- a/mysql-test/suite/galera/disabled.def ++++ b/mysql-test/suite/galera/disabled.def +@@ -49,3 +49,5 @@ partition : MDEV-19958 Galera test failure on galera.partition + query_cache: MDEV-15805 Test failure on galera.query_cache + sql_log_bin : MDEV-21491 galera.sql_log_bin + versioning_trx_id : MDEV-18590 galera.versioning_trx_id ++galera_wsrep_provider_unset_set: wsrep_provider is read-only for security reasons ++pxc-421: wsrep_provider is read-only for security reasons +diff --git a/mysql-test/suite/galera/include/galera_load_provider.inc b/mysql-test/suite/galera/include/galera_load_provider.inc +index 0f843597d9c..28010cc5b71 100644 +--- a/mysql-test/suite/galera/include/galera_load_provider.inc ++++ b/mysql-test/suite/galera/include/galera_load_provider.inc +@@ -1,25 +1,6 @@ + --echo Loading wsrep provider ... + + --disable_query_log +---eval SET GLOBAL wsrep_provider = '$wsrep_provider_orig'; +- +-# +-# count occurences of successful node starts in error log +-# +-perl; +- use strict; +- my $test_log=$ENV{'LOG_FILE'} or die "LOG_FILE not set"; +- my $test_log_copy=$test_log . '.copy'; +- if (-e $test_log_copy) { +- unlink $test_log_copy; +- } +- +-EOF +---copy_file $LOG_FILE $LOG_FILE.copy +- +-# +-# now join to the cluster +-# + --eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig'; + + --enable_query_log +diff --git a/mysql-test/suite/galera/include/galera_unload_provider.inc b/mysql-test/suite/galera/include/galera_unload_provider.inc +index cd841f51fbc..ed7e9bc41f0 100644 +--- a/mysql-test/suite/galera/include/galera_unload_provider.inc ++++ b/mysql-test/suite/galera/include/galera_unload_provider.inc +@@ -1,7 +1,6 @@ + --echo Unloading wsrep provider ... + + --let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address` +---let $wsrep_provider_orig = `SELECT @@wsrep_provider` + --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options` + --let $wsrep_error_log_orig = `SELECT @@log_error` + if(!$wsrep_log_error_orig) +@@ -12,4 +11,4 @@ if(!$wsrep_log_error_orig) + } + --let LOG_FILE= $wsrep_log_error_orig + +-SET GLOBAL wsrep_provider = 'none'; ++SET GLOBAL wsrep_cluster_address = ''; +diff --git a/mysql-test/suite/galera/r/galera_ist_rsync.result b/mysql-test/suite/galera/r/galera_ist_rsync.result +index 13f7d898a59..70a87c73df7 100644 +--- a/mysql-test/suite/galera/r/galera_ist_rsync.result ++++ b/mysql-test/suite/galera/r/galera_ist_rsync.result +@@ -23,7 +23,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Unloading wsrep provider ... +-SET GLOBAL wsrep_provider = 'none'; ++SET GLOBAL wsrep_cluster_address = ''; + connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; +diff --git a/mysql-test/suite/galera/r/galera_sst_mysqldump.result b/mysql-test/suite/galera/r/galera_sst_mysqldump.result +index 4ed679ba477..145b3a94775 100644 +--- a/mysql-test/suite/galera/r/galera_sst_mysqldump.result ++++ b/mysql-test/suite/galera/r/galera_sst_mysqldump.result +@@ -30,7 +30,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Unloading wsrep provider ... +-SET GLOBAL wsrep_provider = 'none'; ++SET GLOBAL wsrep_cluster_address = ''; + connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; +diff --git a/mysql-test/suite/galera/r/mysql-wsrep#33.result b/mysql-test/suite/galera/r/mysql-wsrep#33.result +index fb0b593cc96..45c6a3f660a 100644 +--- a/mysql-test/suite/galera/r/mysql-wsrep#33.result ++++ b/mysql-test/suite/galera/r/mysql-wsrep#33.result +@@ -32,7 +32,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Unloading wsrep provider ... +-SET GLOBAL wsrep_provider = 'none'; ++SET GLOBAL wsrep_cluster_address = ''; + connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; +diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +index 4b6abf85434..f73bfbd13e7 100644 +--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +@@ -403,7 +403,7 @@ NUMERIC_MIN_VALUE NULL + NUMERIC_MAX_VALUE NULL + NUMERIC_BLOCK_SIZE NULL + ENUM_VALUE_LIST NULL +-READ_ONLY NO ++READ_ONLY YES + COMMAND_LINE_ARGUMENT REQUIRED + GLOBAL_VALUE_PATH NULL + VARIABLE_NAME WSREP_ON +@@ -463,7 +463,7 @@ NUMERIC_MIN_VALUE NULL + NUMERIC_MAX_VALUE NULL + NUMERIC_BLOCK_SIZE NULL + ENUM_VALUE_LIST NULL +-READ_ONLY NO ++READ_ONLY YES + COMMAND_LINE_ARGUMENT REQUIRED + GLOBAL_VALUE_PATH NULL + VARIABLE_NAME WSREP_PROVIDER_OPTIONS +diff --git a/mysql-test/suite/sys_vars/r/wsrep_notify_cmd_basic.result b/mysql-test/suite/sys_vars/r/wsrep_notify_cmd_basic.result +deleted file mode 100644 +index 056ff8c817b..00000000000 +--- a/mysql-test/suite/sys_vars/r/wsrep_notify_cmd_basic.result ++++ /dev/null +@@ -1,47 +0,0 @@ +-# +-# wsrep_notify_cmd +-# +-call mtr.add_suppression("WSREP: Failed to get provider options"); +-# save the initial value +-SET @wsrep_notify_cmd_global_saved = @@global.wsrep_notify_cmd; +-# default +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +- +- +-# scope +-SELECT @@session.wsrep_notify_cmd; +-ERROR HY000: Variable 'wsrep_notify_cmd' is a GLOBAL variable +-SET @@global.wsrep_notify_cmd='notify_cmd'; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-notify_cmd +- +-# valid values +-SET @@global.wsrep_notify_cmd='command'; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-command +-SET @@global.wsrep_notify_cmd='hyphenated-command'; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-hyphenated-command +-SET @@global.wsrep_notify_cmd=default; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +- +-SET @@global.wsrep_notify_cmd=NULL; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-NULL +- +-# invalid values +-SET @@global.wsrep_notify_cmd=1; +-ERROR 42000: Incorrect argument type to variable 'wsrep_notify_cmd' +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-NULL +- +-# restore the initial value +-SET @@global.wsrep_notify_cmd = @wsrep_notify_cmd_global_saved; +-# End of test +diff --git a/mysql-test/suite/sys_vars/r/wsrep_provider_basic.result b/mysql-test/suite/sys_vars/r/wsrep_provider_basic.result +deleted file mode 100644 +index 3e4ac8ca883..00000000000 +--- a/mysql-test/suite/sys_vars/r/wsrep_provider_basic.result ++++ /dev/null +@@ -1,40 +0,0 @@ +-# +-# wsrep_provider +-# +-# save the initial value +-SET @wsrep_provider_global_saved = @@global.wsrep_provider; +-# default +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +- +-# scope +-SELECT @@session.wsrep_provider; +-ERROR HY000: Variable 'wsrep_provider' is a GLOBAL variable +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +- +-# valid values +-SET @@global.wsrep_provider=default; +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +- +-# invalid values +-SET @@global.wsrep_provider='/invalid/libgalera_smm.so'; +-ERROR 42000: Variable 'wsrep_provider' can't be set to the value of '/invalid/libgalera_smm.so' +-SET @@global.wsrep_provider=NULL; +-ERROR 42000: Variable 'wsrep_provider' can't be set to the value of 'NULL' +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +-SET @@global.wsrep_provider=1; +-ERROR 42000: Incorrect argument type to variable 'wsrep_provider' +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +- +-# restore the initial value +-SET @@global.wsrep_provider = @wsrep_provider_global_saved; +-# End of test +diff --git a/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result b/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result +deleted file mode 100644 +index 15949a14e39..00000000000 +--- a/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result ++++ /dev/null +@@ -1,46 +0,0 @@ +-# +-# wsrep_provider_options +-# +-call mtr.add_suppression("WSREP: Failed to get provider options"); +-# default +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +- +-# scope +-SELECT @@session.wsrep_provider_options; +-ERROR HY000: Variable 'wsrep_provider_options' is a GLOBAL variable +-SET @@global.wsrep_provider_options='option1'; +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +- +-# valid values +-SET @@global.wsrep_provider_options='name1=value1;name2=value2'; +-ERROR HY000: WSREP (galera) not started +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +-SET @@global.wsrep_provider_options='hyphenated-name:value'; +-ERROR HY000: WSREP (galera) not started +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +-SET @@global.wsrep_provider_options=default; +-ERROR HY000: WSREP (galera) not started +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +- +-# invalid values +-SET @@global.wsrep_provider_options=1; +-ERROR 42000: Incorrect argument type to variable 'wsrep_provider_options' +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +-SET @@global.wsrep_provider_options=NULL; +-Got one of the listed errors +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +-# End of test +diff --git a/mysql-test/suite/sys_vars/t/wsrep_notify_cmd_basic.test b/mysql-test/suite/sys_vars/t/wsrep_notify_cmd_basic.test +deleted file mode 100644 +index 6d1535ba148..00000000000 +--- a/mysql-test/suite/sys_vars/t/wsrep_notify_cmd_basic.test ++++ /dev/null +@@ -1,43 +0,0 @@ +---source include/have_wsrep.inc +- +---echo # +---echo # wsrep_notify_cmd +---echo # +- +-call mtr.add_suppression("WSREP: Failed to get provider options"); +- +---echo # save the initial value +-SET @wsrep_notify_cmd_global_saved = @@global.wsrep_notify_cmd; +- +---echo # default +-SELECT @@global.wsrep_notify_cmd; +- +---echo +---echo # scope +---error ER_INCORRECT_GLOBAL_LOCAL_VAR +-SELECT @@session.wsrep_notify_cmd; +-SET @@global.wsrep_notify_cmd='notify_cmd'; +-SELECT @@global.wsrep_notify_cmd; +- +---echo +---echo # valid values +-SET @@global.wsrep_notify_cmd='command'; +-SELECT @@global.wsrep_notify_cmd; +-SET @@global.wsrep_notify_cmd='hyphenated-command'; +-SELECT @@global.wsrep_notify_cmd; +-SET @@global.wsrep_notify_cmd=default; +-SELECT @@global.wsrep_notify_cmd; +-SET @@global.wsrep_notify_cmd=NULL; +-SELECT @@global.wsrep_notify_cmd; +- +---echo +---echo # invalid values +---error ER_WRONG_TYPE_FOR_VAR +-SET @@global.wsrep_notify_cmd=1; +-SELECT @@global.wsrep_notify_cmd; +- +---echo +---echo # restore the initial value +-SET @@global.wsrep_notify_cmd = @wsrep_notify_cmd_global_saved; +- +---echo # End of test +diff --git a/mysql-test/suite/sys_vars/t/wsrep_provider_basic.test b/mysql-test/suite/sys_vars/t/wsrep_provider_basic.test +deleted file mode 100644 +index 1190ab41bb0..00000000000 +--- a/mysql-test/suite/sys_vars/t/wsrep_provider_basic.test ++++ /dev/null +@@ -1,39 +0,0 @@ +---source include/have_wsrep.inc +- +---echo # +---echo # wsrep_provider +---echo # +- +---echo # save the initial value +-SET @wsrep_provider_global_saved = @@global.wsrep_provider; +- +---echo # default +-SELECT @@global.wsrep_provider; +- +---echo +---echo # scope +---error ER_INCORRECT_GLOBAL_LOCAL_VAR +-SELECT @@session.wsrep_provider; +-SELECT @@global.wsrep_provider; +- +---echo +---echo # valid values +-SET @@global.wsrep_provider=default; +-SELECT @@global.wsrep_provider; +- +---echo +---echo # invalid values +---error ER_WRONG_VALUE_FOR_VAR +-SET @@global.wsrep_provider='/invalid/libgalera_smm.so'; +---error ER_WRONG_VALUE_FOR_VAR +-SET @@global.wsrep_provider=NULL; +-SELECT @@global.wsrep_provider; +---error ER_WRONG_TYPE_FOR_VAR +-SET @@global.wsrep_provider=1; +-SELECT @@global.wsrep_provider; +- +---echo +---echo # restore the initial value +-SET @@global.wsrep_provider = @wsrep_provider_global_saved; +- +---echo # End of test +diff --git a/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test b/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test +deleted file mode 100644 +index 6eb3a94b6a4..00000000000 +--- a/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test ++++ /dev/null +@@ -1,41 +0,0 @@ +---source include/have_wsrep.inc +- +---echo # +---echo # wsrep_provider_options +---echo # +- +-call mtr.add_suppression("WSREP: Failed to get provider options"); +- +---echo # default +-SELECT @@global.wsrep_provider_options; +- +---echo +---echo # scope +---error ER_INCORRECT_GLOBAL_LOCAL_VAR +-SELECT @@session.wsrep_provider_options; +---error 0,ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options='option1'; +-SELECT @@global.wsrep_provider_options; +- +---echo +---echo # valid values +---error ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options='name1=value1;name2=value2'; +-SELECT @@global.wsrep_provider_options; +---error ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options='hyphenated-name:value'; +-SELECT @@global.wsrep_provider_options; +---error ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options=default; +-SELECT @@global.wsrep_provider_options; +- +---echo +---echo # invalid values +---error ER_WRONG_TYPE_FOR_VAR +-SET @@global.wsrep_provider_options=1; +-SELECT @@global.wsrep_provider_options; +---error ER_WRONG_ARGUMENTS,ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options=NULL; +-SELECT @@global.wsrep_provider_options; +- +---echo # End of test +diff --git a/mysql-test/suite/wsrep/disabled.def b/mysql-test/suite/wsrep/disabled.def +index 11577bfe8b0..3d204db6945 100644 +--- a/mysql-test/suite/wsrep/disabled.def ++++ b/mysql-test/suite/wsrep/disabled.def +@@ -10,3 +10,5 @@ + # + ############################################################################## + ++ ++mdev_6832: wsrep_provider is read-only for security reasons +diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result +index a9988fd1628..e57440125ee 100644 +--- a/mysql-test/suite/wsrep/r/variables.result ++++ b/mysql-test/suite/wsrep/r/variables.result +@@ -14,7 +14,6 @@ SET SESSION wsrep_replicate_myisam= ON; + ERROR HY000: Variable 'wsrep_replicate_myisam' is a GLOBAL variable and should be set with SET GLOBAL + SET GLOBAL wsrep_replicate_myisam= ON; + SET GLOBAL wsrep_replicate_myisam= OFF; +-SET GLOBAL wsrep_provider=none; + # + # MDEV#5790: SHOW GLOBAL STATUS LIKE does not show the correct list of + # variables when using "_" +@@ -151,7 +150,6 @@ wsrep_local_state_comment # + # Should show nothing. + SHOW STATUS LIKE 'x'; + Variable_name Value +-SET GLOBAL wsrep_provider=none; + + SHOW STATUS LIKE 'wsrep_local_state_uuid'; + Variable_name Value +@@ -160,7 +158,6 @@ wsrep_local_state_uuid # + SHOW STATUS LIKE 'wsrep_last_committed'; + Variable_name Value + wsrep_last_committed # +-SET GLOBAL wsrep_provider=none; + + # + # MDEV#6206: wsrep_slave_threads subtracts from max_connections +@@ -174,7 +171,7 @@ SELECT @@global.wsrep_slave_threads; + 1 + SELECT @@global.wsrep_cluster_address; + @@global.wsrep_cluster_address +- ++gcomm:// + SELECT @@global.wsrep_on; + @@global.wsrep_on + 1 +@@ -183,14 +180,14 @@ Variable_name Value + Threads_connected 1 + SHOW STATUS LIKE 'wsrep_thread_count'; + Variable_name Value +-wsrep_thread_count 0 ++wsrep_thread_count 2 + + SELECT @@global.wsrep_provider; + @@global.wsrep_provider + libgalera_smm.so + SELECT @@global.wsrep_cluster_address; + @@global.wsrep_cluster_address +- ++gcomm:// + SELECT @@global.wsrep_on; + @@global.wsrep_on + 1 +@@ -199,11 +196,10 @@ Variable_name Value + Threads_connected 1 + SHOW STATUS LIKE 'wsrep_thread_count'; + Variable_name Value +-wsrep_thread_count 0 ++wsrep_thread_count 2 + + # Setting wsrep_cluster_address triggers the creation of + # applier/rollbacker threads. +-SET GLOBAL wsrep_cluster_address= 'gcomm://'; + # Wait for applier thread to get created 1. + # Wait for applier thread to get created 2. + SELECT VARIABLE_VALUE AS EXPECT_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count'; +diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test +index f2c3a0a3b78..fd352b61a3a 100644 +--- a/mysql-test/suite/wsrep/t/variables.test ++++ b/mysql-test/suite/wsrep/t/variables.test +@@ -23,7 +23,7 @@ SET GLOBAL wsrep_replicate_myisam= ON; + + # Reset it back. + SET GLOBAL wsrep_replicate_myisam= OFF; +-SET GLOBAL wsrep_provider=none; ++#SET GLOBAL wsrep_provider=none; + + --echo # + --echo # MDEV#5790: SHOW GLOBAL STATUS LIKE does not show the correct list of +@@ -32,9 +32,6 @@ SET GLOBAL wsrep_provider=none; + + CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*"); + +---disable_query_log +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +---enable_query_log + + --replace_column 2 # + SHOW GLOBAL STATUS LIKE 'wsrep%'; +@@ -50,11 +47,9 @@ SHOW GLOBAL STATUS LIKE 'wsrep_local_state_comment'; + SHOW STATUS LIKE 'x'; + + # Reset it back. +-SET GLOBAL wsrep_provider=none; ++#SET GLOBAL wsrep_provider=none; + +---disable_query_log +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +---enable_query_log ++#evalp SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; + + # The following 2 variables are used by mariabackup + # SST. +@@ -66,7 +61,7 @@ SHOW STATUS LIKE 'wsrep_local_state_uuid'; + SHOW STATUS LIKE 'wsrep_last_committed'; + + # Reset it back. +-SET GLOBAL wsrep_provider=none; ++#SET GLOBAL wsrep_provider=none; + + --echo + --echo # +@@ -74,9 +69,7 @@ SET GLOBAL wsrep_provider=none; + --echo # + call mtr.add_suppression("WSREP: Failed to get provider options"); + +---disable_query_log +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +---enable_query_log ++#evalp SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; + + --replace_regex /.*libgalera_smm.*/libgalera_smm.so/ + SELECT @@global.wsrep_provider; +@@ -87,9 +80,7 @@ SHOW STATUS LIKE 'threads_connected'; + SHOW STATUS LIKE 'wsrep_thread_count'; + --echo + +---disable_query_log +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +---enable_query_log ++#evalp SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; + + --replace_regex /.*libgalera_smm.*/libgalera_smm.so/ + SELECT @@global.wsrep_provider; +@@ -101,7 +92,7 @@ SHOW STATUS LIKE 'wsrep_thread_count'; + + --echo # Setting wsrep_cluster_address triggers the creation of + --echo # applier/rollbacker threads. +-SET GLOBAL wsrep_cluster_address= 'gcomm://'; ++#SET GLOBAL wsrep_cluster_address= 'gcomm://'; + + --echo # Wait for applier thread to get created 1. + --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count'; +@@ -162,15 +153,6 @@ SET @@global.wsrep_sst_auth= NULL; + SELECT @@global.wsrep_sst_auth; + SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved; + +-# Reset (for mtr internal checks) +- +---disable_query_log +-SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved; +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +-SET GLOBAL wsrep_cluster_address= @wsrep_cluster_address_saved; +-SET GLOBAL wsrep_provider_options= @wsrep_provider_options_saved; +---enable_query_log +- + --source include/galera_wait_ready.inc + + --echo # End of test. +diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc +index 64040243df0..8c67a4d432a 100644 +--- a/sql/sys_vars.cc ++++ b/sql/sys_vars.cc +@@ -5669,8 +5669,8 @@ static Sys_var_tz Sys_time_zone( + + static Sys_var_charptr_fscs Sys_wsrep_provider( + "wsrep_provider", "Path to replication provider library", +- PREALLOCATED GLOBAL_VAR(wsrep_provider), CMD_LINE(REQUIRED_ARG), +- DEFAULT(WSREP_NONE), ++ PREALLOCATED READ_ONLY GLOBAL_VAR(wsrep_provider), CMD_LINE(REQUIRED_ARG), ++ DEFAULT(WSREP_NONE), + NO_MUTEX_GUARD, NOT_IN_BINLOG, + ON_CHECK(wsrep_provider_check), ON_UPDATE(wsrep_provider_update)); + +@@ -5886,8 +5886,8 @@ static Sys_var_ulong Sys_wsrep_max_ws_rows ( + + static Sys_var_charptr Sys_wsrep_notify_cmd( + "wsrep_notify_cmd", "", +- GLOBAL_VAR(wsrep_notify_cmd),CMD_LINE(REQUIRED_ARG), +- DEFAULT("")); ++ READ_ONLY GLOBAL_VAR(wsrep_notify_cmd), CMD_LINE(REQUIRED_ARG), ++ DEFAULT("")); + + static Sys_var_mybool Sys_wsrep_certify_nonPK( + "wsrep_certify_nonPK", "Certify tables with no primary key", +-- +2.31.0 + -- cgit v1.2.3 From 6e7ba45357078b31a369b23f8a9f38302dfcbb10 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 18 Mar 2021 07:09:10 +0100 Subject: gnu: sqlite: Update to 3.32.3 [security fixes]. Fixes CVE-2020-11655, CVE-2020-11656, CVE-2020-13434, CVE-2020-13435, CVE-2020-13630, CVE-2020-13631, CVE-2020-13632, CVE-2020-15358 and CVE-2020-9327. * gnu/packages/sqlite.scm (sqlite/fixed): New variable. (sqlite)[replacement]: Graft. --- gnu/packages/sqlite.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index eeb77749d8..a48d724488 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -65,6 +65,7 @@ (sha256 (base32 "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32")))) + (replacement sqlite/fixed) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (native-inputs (if (hurd-target?) @@ -122,6 +123,27 @@ widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license license:public-domain))) +(define-public sqlite/fixed + (package + (inherit sqlite) + (version "3.32.3") + (source (origin + (method url-fetch) + (uri (let ((numeric-version + (match (string-split version #\.) + ((first-digit other-digits ...) + (string-append first-digit + (string-pad-right + (string-concatenate + (map (cut string-pad <> 2 #\0) + other-digits)) + 6 #\0)))))) + (string-append "https://sqlite.org/2020/sqlite-autoconf-" + numeric-version ".tar.gz"))) + (sha256 + (base32 + "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3")))))) + ;; Column metadata support was added to the regular 'sqlite' package with ;; commit fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7. (define-public sqlite-with-column-metadata -- cgit v1.2.3 From f21075f039be2afb86f0735f151b94050a3d41bd Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 26 Mar 2021 05:42:48 +0100 Subject: gnu: guix: Update to 6e7ba45. * gnu/packages/package-management.scm (guix): Update to 6e7ba45. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 888f54322d..5d761df47d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") - (revision 17)) + (commit "6e7ba45357078b31a369b23f8a9f38302dfcbb10") + (revision 18)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) + "14zzhjdd7igkc8vpv06hn375085n10mljv8wwpnk6r4a6r8qg5d3")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 4c56620555a7f1235ef4e6f5b9ad2cfe87403c55 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Mar 2021 02:25:11 -0400 Subject: gnu: libaom: Update to 3.0.0. * gnu/packages/video.scm (libaom): Update to 3.0.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bd8fddf9b4..6e4303c6f0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -772,7 +772,7 @@ television and DVD. It is also known as AC-3.") (define-public libaom (package (name "libaom") - (version "2.0.2") + (version "3.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -781,7 +781,7 @@ television and DVD. It is also known as AC-3.") (file-name (git-file-name name version)) (sha256 (base32 - "0f3i983s9yvh9zc6mpy1ck5sjcg9l09lpw9v4md3mv8gbih9f0z0")))) + "178rq1d7i9q4lg40bipkyhdrk18j9wi5k5avpa5bls0zm7g5ifsx")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) -- cgit v1.2.3 From f0357df8c54e3a4232476211b0fb8f71cf1df7a8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Mar 2021 02:30:47 -0400 Subject: gnu: SVT-AV1: Update URLs. * gnu/packages/video.scm (svt-av1)[source, home-page]: Update URLs. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6e4303c6f0..4bb8e2a63d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4757,7 +4757,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AOMediaCodec/SVT-AV1") + (url "https://gitlab.com/AOMediaCodec/SVT-AV1.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4783,7 +4783,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (description "SVT-AV1 is an AV1 codec implementation. The encoder is a work-in-progress, aiming to support video-on-demand and live streaming applications. It only supports Intel-compatible CPUs (x86).") - (home-page "https://github.com/AOMediaCodec/SVT-AV1") + (home-page "https://gitlab.com/AOMediaCodec/SVT-AV1") (license license:bsd-2))) (define-public svt-vp9 -- cgit v1.2.3 From 6665f0fa589b6f3639414602900147aa6a57c178 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Mar 2021 02:28:22 -0400 Subject: gnu: SVT-HEVC: Update to 1.5.0. * gnu/packages/video.scm (svt-hevc): Update to 1.5.0. [license]: Specify the license. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4bb8e2a63d..02096dc7a4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -286,7 +286,7 @@ video and audio streams from a DVD.") (define-public svt-hevc (package (name "svt-hevc") - (version "1.4.3") + (version "1.5.0") (source (origin (method git-fetch) @@ -296,7 +296,7 @@ video and audio streams from a DVD.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sqh3dciqm2p1b66kngcpxqy5fx3ramxlxy8gfcbdwn2i3rsqhs7")))) + (base32 "038r3x3axil895vh2dq6223623ybrc45vn58vfmfb7cikz68sy23")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Test script is stand-alone -- cgit v1.2.3 From ac7250f8baf501af3f051bf558992d3e84e4303c Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 26 Mar 2021 09:50:24 +0100 Subject: gnu: r-suppdists: Update hash. * gnu/packages/cran.scm (r-suppdists)[source]: Update hash. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 96a2aee766..44ae65c359 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3792,7 +3792,7 @@ statistics/methods are implemented.") (uri (cran-uri "SuppDists" version)) (sha256 (base32 - "01j6p94m1g363nph2158fq2rmd6z3h5dvcv6aidh2d6syw131xak")))) + "1i3iq12a5x5k49ac01mikzcrrq9gc148xq3m08h4xm07bha6f2v8")))) (properties `((upstream-name . "SuppDists"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/SuppDists") -- cgit v1.2.3 From 80cd6a1b6376a12e0f0bc09b3ab8f24bd1f2f39f Mon Sep 17 00:00:00 2001 From: Tim Howes Date: Sun, 14 Feb 2021 21:44:36 -0800 Subject: gnu: Add r-gsa. * gnu/packages/cran.scm (r-gsa): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 44ae65c359..3038ca9ab4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2020 Magali Lemes ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 Aniket Patil +;;; Copyright © 2021 Tim Howes ;;; ;;; This file is part of GNU Guix. ;;; @@ -28280,3 +28281,24 @@ functionalities for displaying text co-occurrence networks, text correlation networks, dependency relationships as well as text clustering. Feel free to join the effort of providing interesting text visualisations.") (license license:gpl2))) + +(define-public r-gsa + (package + (name "r-gsa") + (version "1.03.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "GSA" version)) + (sha256 + (base32 + "05x9wspah1cdznjpncqam1iawsxdiigyl8v2anyhss2k7wwd94p1")))) + (properties `((upstream-name . "GSA"))) + (build-system r-build-system) + (home-page "https://statweb.stanford.edu/~tibs/GSA/") + (synopsis "Gene set analysis") + (description "This package lets you determine the significance of +pre-defined sets of genes with respect to an outcome variable, such as a group +indicator, a quantitative variable or a survival time.") + ;; Any version of the LGPL + (license license:lgpl3+))) -- cgit v1.2.3 From e9741ad623db22afa46f809b862685c26e67318a Mon Sep 17 00:00:00 2001 From: Tim Howes Date: Fri, 26 Mar 2021 10:12:03 +0100 Subject: gnu: Add r-samr. * gnu/packages/cran.scm (r-samr): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3038ca9ab4..e90e2b3363 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28302,3 +28302,32 @@ pre-defined sets of genes with respect to an outcome variable, such as a group indicator, a quantitative variable or a survival time.") ;; Any version of the LGPL (license license:lgpl3+))) + +(define-public r-samr + (package + (name "r-samr") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "samr" version)) + (sha256 + (base32 + "01km0f7qgm73x19vbvsxl083hs1dq4dj8qm5h64cxbf20b08my15")))) + (properties `((upstream-name . "samr"))) + (build-system r-build-system) + (propagated-inputs + `(("r-gsa" ,r-gsa) + ("r-impute" ,r-impute) + ("r-matrixstats" ,r-matrixstats) + ("r-openxlsx" ,r-openxlsx) + ("r-shiny" ,r-shiny) + ("r-shinyfiles" ,r-shinyfiles))) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://statweb.stanford.edu/~tibs/SAM/") + (synopsis "Significance analysis of Microarrays") + (description + "This is a package for significance analysis of Microarrays for +differential expression analysis, RNAseq data and related problems.") + ;; Any version of the LGPL + (license license:lgpl3+))) -- cgit v1.2.3 From 635622e54185c9bc5a0695f4e8de40c605e59aef Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 26 Mar 2021 10:12:24 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-26.410f58c. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-26.410f58c. [inputs]: Use newer PostgreSQL and guile-json packages, and switch to non-deprecated variants of other packages. --- gnu/packages/web.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1e93308fb0..ae41588037 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4709,8 +4709,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "b7ba8d0c2ca3aca9ba5b5f9f27b9778ee949d20e") - (revision "25")) + (let ((commit "410f58cb43f083623885a430700c6818a187cadc") + (revision "26")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4722,7 +4722,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0brv64bsqysl7dncz067blwvmqrlx99c2kwrgpz6k0nqv8nzsa28")))) + "1jvxn3w6gwlvm52raf6zkjwg7bvfvbznsb9ch8ha0fcc6ccx7r60")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -4781,15 +4781,15 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") #t))) (delete 'strip)))) ; As the .go files aren't compatible (inputs - `(("guix" ,guile3.0-guix) - ("guile-fibers" ,guile3.0-fibers) - ("guile-json" ,guile3.0-json) - ("guile-email" ,guile3.0-email) + `(("guix" ,guix) + ("guile-fibers" ,guile-fibers) + ("guile-json" ,guile-json-4) + ("guile-email" ,guile-email) ("guile-prometheus" ,guile-prometheus) - ("guile-squee" ,guile3.0-squee) + ("guile-squee" ,guile-squee) ("ephemeralpg" ,ephemeralpg) ("util-linux" ,util-linux) - ("postgresql" ,postgresql-11) + ("postgresql" ,postgresql-13) ("sqitch" ,sqitch))) (native-inputs `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) -- cgit v1.2.3 From 87547517bceaddb9d67146a1e286d1d0c5017d0c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 26 Mar 2021 10:15:23 +0000 Subject: gnu: guix-build-coordinator: Update to 0-21.6e7e63f. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-21.6e7e63f. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5d761df47d..de549fd094 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1049,8 +1049,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "1f79fc38a17ceda30f378efd4e7f80f252c99b4d") - (revision "20")) + (let ((commit "6e7e63f356cb88e3e5fe1a55a0390a1366205c9c") + (revision "21")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1061,7 +1061,7 @@ environments.") (commit commit))) (sha256 (base32 - "0d5zr5mv07pi195vva2fhclfgyzrgbk9vlnwrmy7z1jcw2p1d2zp")) + "01l4f0h9r864dbq4fg38fr2pdm5c7q2dysxcv8bx1clxilm58kd5")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 0dc9ad898180bd37aadfa23d23806b595e600c83 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 12 Mar 2021 18:55:41 +0100 Subject: gnu: eolie: Add missing inputs. This fixes errors observed directly at launch of Eolie inside pure environments. (See for more information.) It is still not possible to launch Eolie inside a container, however. (See also .) * gnu/packages/gnome.scm (eolie)[inputs]: Add libhandy and gnome-settings-daemon. --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 09e62d7897..7702510eb4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6712,9 +6712,11 @@ almost all of them.") ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) ("python-pycrypto" ,python-pycrypto) + ("libhandy" ,libhandy) ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gnome-settings-daemon" ,gnome-settings-daemon) ; desktop-schemas are not enough ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") -- cgit v1.2.3 From a0dbf1bafc016a9fa96e4b4220d20a537f3a8fa0 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 26 Mar 2021 14:23:39 +0100 Subject: gnu: cuirass: Update to 1.0.0-4.ff3f25d. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-4.ff3f25d. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index c1305a781f..5afa4e28b2 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "f5a2eeae18ec02043107199047ddffd83e76d620") - (revision "3")) + (let ((commit "ff3f25d28782a85841b5e604335fc1118ef93f01") + (revision "4")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1jnm67zhfsbd7b0ns8llmlp7idahw1gcsg09ffrpx77yyr5xhyzg")))) + "0sykgmh12llkk5qb63542wb7ywjiirscqmlvrsskfkqlgs7scsgg")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From 2e9cdb6a65aa0260f01110d26e83080e898ea0a5 Mon Sep 17 00:00:00 2001 From: qblade Date: Fri, 26 Mar 2021 01:33:42 +0000 Subject: gnu: Add hikari. * gnu/packages/wm.scm (hikari): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/wm.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3d85392394..a637bce602 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2400,3 +2400,55 @@ for wayland conceptually based on the X11 window manager (description "libucl implements a configuration language that is easy to read and write, and compatible with JSON.") (license license:bsd-2))) + +(define-public hikari + (package + (name "hikari") + (version "2.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hikari.acmelabs.space/releases/hikari-" + version ".tar.gz")) + (sha256 + (base32 + "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (build-system gnu-build-system) + (native-inputs + `(("bmake" ,bmake) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) + (inputs + `(("wayland" ,wayland) + ("wlroots" ,wlroots) + ("libinput" ,libinput) + ("cairo" ,cairo) + ("pango" ,pango) + ("libxkbcommon" ,libxkbcommon) + ("libucl" ,libucl) + ("pam" ,linux-pam))) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CC=" ,(cc-for-target)) + "WITH_XWAYLAND=YES" + "WITH_SCREENCOPY=YES" + "WITH_LAYERSHELL=YES" + "WITH_VIRTUAL_INPUT=YES") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs outputs make-flags #:allow-other-keys) + (apply invoke "bmake" make-flags))) + (replace 'install + (lambda* (#:key inputs outputs make-flags #:allow-other-keys) + (apply invoke "bmake" "install" make-flags)))))) + (home-page "https://hikari.acmelabs.space/") + (synopsis "Stacking Wayland compositor with additional tiling capabilities") + (description "Stacking Wayland compositor with additional tiling +capabilities, it is heavily inspired by the Calm Window manager(cwm)") + (license license:bsd-2))) -- cgit v1.2.3 From 636caba168bf06a17c10ca583e374793e7c7b1cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Mar 2021 14:47:55 +0100 Subject: gnu: hikari: Improve package. * gnu/packages/wm.scm (hikari)[inputs]: Sort alphabetically. [synopsis]: Shorten a bit. [description]: Use full sentences. --- gnu/packages/wm.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a637bce602..6105a98f14 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2408,28 +2408,26 @@ read and write, and compatible with JSON.") (source (origin (method url-fetch) - (uri (string-append - "https://hikari.acmelabs.space/releases/hikari-" - version ".tar.gz")) + (uri (string-append "https://hikari.acmelabs.space/releases/" + "hikari-" version ".tar.gz")) (sha256 - (base32 - "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (base32 "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) (build-system gnu-build-system) (native-inputs `(("bmake" ,bmake) ("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols))) (inputs - `(("wayland" ,wayland) - ("wlroots" ,wlroots) + `(("cairo" ,cairo) ("libinput" ,libinput) - ("cairo" ,cairo) - ("pango" ,pango) - ("libxkbcommon" ,libxkbcommon) ("libucl" ,libucl) - ("pam" ,linux-pam))) + ("libxkbcommon" ,libxkbcommon) + ("pam" ,linux-pam) + ("pango" ,pango) + ("wayland" ,wayland) + ("wlroots" ,wlroots))) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) @@ -2448,7 +2446,8 @@ read and write, and compatible with JSON.") (lambda* (#:key inputs outputs make-flags #:allow-other-keys) (apply invoke "bmake" "install" make-flags)))))) (home-page "https://hikari.acmelabs.space/") - (synopsis "Stacking Wayland compositor with additional tiling capabilities") - (description "Stacking Wayland compositor with additional tiling -capabilities, it is heavily inspired by the Calm Window manager(cwm)") + (synopsis "Stacking Wayland compositor with tiling capabilities") + (description + "Hikari is a stacking Wayland compositor with additional tiling +capabilities. It is heavily inspired by the Calm Window manager(cwm).") (license license:bsd-2))) -- cgit v1.2.3 From 8dea0a52e0b1b5f2d14cd5c455df9753e251d726 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 26 Mar 2021 02:35:49 -0300 Subject: gnu: emacs-all-the-icons-dired: Update to 1.0-2-fc2dfa1. * gnu/packages/emacs-xyz.scm (emacs-all-the-icons-dired): Update to 1.0-2-fc2dfa1. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f45507c647..a226a8324c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22833,9 +22833,9 @@ based on diff output.") (license license:gpl3+)))) (define-public emacs-all-the-icons-dired - (let ((commit "980b7747d6c4a7992a1ec56afad908956db0a519") + (let ((commit "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5") (version "1.0") - (revision "1")) + (revision "2")) (package (name "emacs-all-the-icons-dired") (version (git-version version revision commit)) @@ -22848,7 +22848,7 @@ based on diff output.") (file-name (git-file-name name version)) (sha256 (base32 - "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy")))) + "0zhyhz4lhx0d8wwh1xxxf7ck4s621fk9757ql2ypxbr4iqh7sjlp")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-all-the-icons" ,emacs-all-the-icons))) -- cgit v1.2.3 From 11488907f793309aec4b7f52f4c155fb2bdd289f Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Thu, 25 Mar 2021 14:39:41 +0100 Subject: gnu: Add emacs-nice-citation. * gnu/packages/emacs-xyz.scm (emacs-nice-citation): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a226a8324c..7ff8232476 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21335,6 +21335,33 @@ DBI, and provides DB-accessing API and the simple management UI.") to open SQLite databases.") (license license:gpl3+)))) +(define-public emacs-nice-citation + (let ((commit "1013b56d9d1495a335f40a5f76203034dc5fa0ea") + (revision "0")) + (package + (name "emacs-nice-citation") + (version (git-version "0.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/damiencollard/nice-citation") + (commit commit))) + (sha256 + (base32 "00xqr7haca5vd0bzd043lc6x4fjb903z96frz9b8cbd7spp63z7q")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/damiencollard/nice-citation") + (synopsis "Depth-colored citations for Gnus") + (description + "This package replaces the traditional chevron citation marks @samp{>} +with a Unicode vertical bar with the same color as the text it is quoting. + +It is purely presentation: the underlying text is unchanged. In particular, +if you send a message containing a citation, it will contain the traditional +chevron marks.") + (license license:gpl3+)))) + (define-public emacs-nix-mode (package (name "emacs-nix-mode") -- cgit v1.2.3 From e0495951d5e8544c0f6d2e5a8a83b3c3e419bb3a Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Tue, 23 Mar 2021 13:54:03 +0300 Subject: gnu: emacs-imenu-list: Update to 0.9-0.b502223. * gnu/packages/emacs-xyz.scm (emacs-imenu-list): Update to 0.9-0.b502223. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7ff8232476..a51a36616c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2675,9 +2675,9 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.") (license license:gpl2+))) (define-public emacs-imenu-list - (let ((commit "46008738f8fef578a763c308cf6695e5b4d4aa77") + (let ((commit "b50222378412fbe321622a84cb2b036e084c697a") (revision "0") - (version "0.8")) + (version "0.9")) (package (name "emacs-imenu-list") (version (git-version version revision commit)) @@ -2690,7 +2690,7 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "14l3yw9y1nk103s7z5i1fmd6kvlb2p6ayi6sf9l1x1ydg9glrpl8")))) + (base32 "1936dd41fa05ndzf2bwhllvjz97iz0rflkazjipr7dvz5q072wj2")))) (build-system emacs-build-system) (home-page "https://github.com/bmag/imenu-list") (synopsis -- cgit v1.2.3 From 45556111cb6a4e82df6003c4e172b619afe89e6d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Mar 2021 15:34:24 +0100 Subject: gnu: emacs-imenu-list: Bump revision. * gnu/packages/emacs-xyz.scm (emacs-imenu-list): Bump revision. This is a followup to e0495951d5e8544c0f6d2e5a8a83b3c3e419bb3a. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a51a36616c..ea2bd347c3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2676,7 +2676,7 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.") (define-public emacs-imenu-list (let ((commit "b50222378412fbe321622a84cb2b036e084c697a") - (revision "0") + (revision "1") (version "0.9")) (package (name "emacs-imenu-list") -- cgit v1.2.3 From 078dbd22f5e2331f69d24cb1bcaee75cb76b920b Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 7 Feb 2021 13:11:47 +0100 Subject: gnu: tzdata: Update to 2021a. * gnu/packages/base.scm (tzdata): Update to 2021a. [inputs]: Update tzcode. Signed-off-by: Leo Famulari --- gnu/packages/base.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f0f9353398..ea2e102c15 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1274,7 +1274,9 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2020f") + ;; This package should be kept in sync with python-pytz in (gnu packages + ;; time). + (version "2021a") (source (origin (method url-fetch) (uri (string-append @@ -1282,7 +1284,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j")))) + "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr")))) (build-system gnu-build-system) (arguments `(#:tests? #f @@ -1342,7 +1344,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng")))))) + "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) -- cgit v1.2.3 From b05edb8c14900822ae9c1bb3fde78743cc32e279 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Mar 2021 00:44:50 -0400 Subject: gnu: python-pytzdata: Update to 2020.1. * gnu/packages/time.scm (python-pytzdata): Update to 2020.1. --- gnu/packages/time.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index be37ea980e..20a7ad114f 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -97,14 +97,14 @@ expressions.") (define-public python-pytzdata (package (name "python-pytzdata") - (version "2019.3") + (version "2020.1") (source (origin (method url-fetch) (uri (pypi-uri "pytzdata" version)) (sha256 (base32 - "0ppfc6kz4p41mxyqxq1g1zp6gvns99g6b344qj6ih0x9vxy6zh7s")))) + "0h0md0ldhb8ghlwjslkzh3wcj4fxg3n43bj5sghqs2m06nri7yiy")))) (build-system python-build-system) ;; XXX: The PyPI distribution contains no tests, and the upstream ;; repository lacks a setup.py! How to build from git? -- cgit v1.2.3 From e8337f1e45b57035c6e5d45133aa9412d4e5e882 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Mar 2021 00:45:08 -0400 Subject: gnu: python-pytz: Update to 2021.1. * gnu/packages/time.scm (python-pytz): Update to 2021.1. --- gnu/packages/time.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 20a7ad114f..d6ebb59a1e 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -123,14 +123,15 @@ expressions.") (define-public python-pytz (package (name "python-pytz") - (version "2020.4") + ;; This package should be kept in sync with tzdata in (gnu packages base). + (version "2021.1") (source (origin (method url-fetch) (uri (pypi-uri "pytz" version)) (sha256 (base32 - "0s72lz9q7rm2xgl2in0nvhn5cp0cyrxa257fpj2919g0s797ssry")))) + "1nn459q7zg20n75akxl3ljkykgw1ydc8nb05rx1y4f5zjh4ak943")))) (build-system python-build-system) (home-page "http://pythonhosted.org/pytz") (synopsis "Python timezone library") -- cgit v1.2.3 From 9d72295827f1e9c82add42b1cbf2e740fb9109e5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 26 Mar 2021 21:13:06 +0100 Subject: gnu: cuirass: Fix version generation. * gnu/packages/ci.scm (cuirass)[arguments]: Add a 'fix-version-gen phase. --- gnu/packages/ci.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 5afa4e28b2..f7f4bf4dc1 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -65,7 +65,7 @@ "0sykgmh12llkk5qb63542wb7ywjiirscqmlvrsskfkqlgs7scsgg")))) (build-system gnu-build-system) (arguments - '(#:modules ((guix build utils) + `(#:modules ((guix build utils) (guix build gnu-build-system) (ice-9 rdelim) (ice-9 popen)) @@ -73,6 +73,13 @@ #:parallel-tests? #f #:phases (modify-phases %standard-phases + (add-before 'bootstrap 'fix-version-gen + (lambda _ + (patch-shebang "build-aux/git-version-gen") + + (call-with-output-file ".tarball-version" + (lambda (port) + (display ,version port))))) (add-before 'check 'set-PATH-for-tests (lambda* (#:key inputs #:allow-other-keys) (let ((pg (assoc-ref inputs "ephemeralpg")) -- cgit v1.2.3 From f9e2f6ec1d93eb97b59af60066059d5afdeb3e6a Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 26 Mar 2021 21:38:12 +0100 Subject: gnu: rust: Add Rust 1.51 * gnu/packages/rust.scm (rust-1.51): New variable. --- gnu/packages/rust.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c7840e1a20..3952a17908 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1460,5 +1460,9 @@ move around." (rust-bootstrapped-package rust-1.49 "1.50.0" "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm")) +(define-public rust-1.51 + (rust-bootstrapped-package rust-1.50 "1.51.0" + "0ixqkqglv3isxbvl4ldr4byrkx692wghsz3fasy1pn5kr2prnsvs")) + ;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.45) -- cgit v1.2.3 From 1d8e6eb06ef661a515d233ffce98a8c5aa161526 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Fri, 26 Mar 2021 22:11:28 +0100 Subject: gnu: Add emacs-relative-buffers. * gnu/packages/emacs-xyz.scm (emacs-relative-buffers): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ea2bd347c3..645ccb8c36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1525,6 +1525,46 @@ reformat the current buffer using a command-line program, together with an optional minor mode which can apply this command automatically on save.") (license license:gpl3+))) +(define-public emacs-relative-buffers + (let ((release "0.0.1") + (revision "0") + (commit "9762fe268e9ff150dcec2e2e45d862d82d5c4008")) + (package + (name "emacs-relative-buffers") + (version (git-version release revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsattic/relative-buffers") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fzhwbpyndwrmxip9zlcwkrr675l5pzwcygi45hv7w1hn39w0hxp")) + (snippet + '(begin + ;; Delete the Cask test runners. + (for-each delete-file '("Cask" "test/test-helper.el")) + #t)))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("ert-runner"))) + (native-inputs + `(("ert-runner" ,emacs-ert-runner))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/emacsattic/relative-buffers") + (synopsis "Minor mode to rename buffers by project structure") + (description + "This package provides a minor mode for renaming buffers according to +project structure. For Python buffers, that will be the whole module name. +For temporary files and directories, that will be the relative path from the +project root.") + (license license:gpl3+)))) + (define-public emacs-relint (package (name "emacs-relint") -- cgit v1.2.3 From 147b86ad30bb574e0d3b4e30486b70ae31fd16c3 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Fri, 26 Mar 2021 22:16:41 +0100 Subject: gnu: Add emacs-cascading-dir-locals. * gnu/packages/emacs-xyz.scm (emacs-cascading-dir-locals): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 645ccb8c36..ead2144b42 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23391,6 +23391,39 @@ Dash docsets.") through Dash docsets.") (license license:expat)))) +(define-public emacs-cascading-dir-locals + (let ((release "0.1") + (revision "0") + (commit "efdf5e6d62b955ee0ca3c170eae1d388799f9fa0")) + (package + (name "emacs-cascading-dir-locals") + (version (git-version release revision commit)) + (home-page "https://github.com/fritzgrabo/cascading-dir-locals") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jwd99kk5l588n7wwi1x3b4bgimm66x1icna3n20pwaj49kf0zy8")))) + (build-system emacs-build-system) + (synopsis "Apply all @file{.dir-locals.el} from root to current directory") + (description + "This package provides a global minor mode that changes how Emacs +handles the lookup of applicable dir-locals files (@file{.dir-locals.el}): +instead of starting at the directory of the visited file and moving up the +directory tree only until a first dir-locals file is found, collect and apply +all (!) dir-locals files found from the current directory up to the root one. + +Values specified in files nearer to the current directory take precedence over +values in files farther away from it. + +You might want to use this to globally set dir-local variables that apply to +all of your projects, then override or add variables on a per-project basis.") + (license license:gpl3+)))) + (define-public emacs-calibredb (package (name "emacs-calibredb") -- cgit v1.2.3 From 53dd99bc0b2e23c5463b4cb95546fd438a72d229 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 26 Mar 2021 22:51:14 +0100 Subject: gnu: upx: Fix CVE-2021-20285. * gnu/packages/patches/upx-CVE-2021-20285.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/compression.scm (upx): Apply patch. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 3 +- gnu/packages/patches/upx-CVE-2021-20285.patch | 76 +++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/upx-CVE-2021-20285.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 40956598db..f8c4e73402 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1765,6 +1765,7 @@ dist_patch_DATA = \ %D%/packages/patches/unzip-zipbomb-part2.patch \ %D%/packages/patches/unzip-zipbomb-part3.patch \ %D%/packages/patches/unzip-32bit-zipbomb-fix.patch \ + %D%/packages/patches/upx-CVE-2021-20285.patch \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2d065046ee..ef73e6038b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2100,7 +2100,8 @@ decompression is a little bit slower.") version "/upx-" version "-src.tar.xz")) (sha256 (base32 - "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7")))) + "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7")) + (patches (search-patches "upx-CVE-2021-20285.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) diff --git a/gnu/packages/patches/upx-CVE-2021-20285.patch b/gnu/packages/patches/upx-CVE-2021-20285.patch new file mode 100644 index 0000000000..1d47b2a8bb --- /dev/null +++ b/gnu/packages/patches/upx-CVE-2021-20285.patch @@ -0,0 +1,76 @@ +From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 +From: John Reiser +Date: Fri, 11 Dec 2020 13:38:18 -0800 +Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ + +https://github.com/upx/upx/issues/421 + modified: p_lx_elf.cpp +--- + src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- + 1 file changed, 29 insertions(+), 5 deletions(-) + +diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp +index 182db192..3a4101cf 100644 +--- a/src/p_lx_elf.cpp ++++ b/src/p_lx_elf.cpp +@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() + int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; + if (z_rel && z_rsz) { + unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); ++ if ((unsigned)file_size <= rel_off) { ++ char msg[70]; snprintf(msg, sizeof(msg), ++ "bad Elf32_Dynamic[DT_REL] %#x\n", ++ rel_off); ++ throwCantPack(msg); ++ } + Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; + unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); ++ if ((unsigned)file_size <= relsz) { ++ char msg[70]; snprintf(msg, sizeof(msg), ++ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", ++ relsz); ++ throwCantPack(msg); ++ } + Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); + for (; rp < last; ++rp) { + unsigned r_va = get_te32(&rp->r_offset); +@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() + int z_rel = dt_table[Elf64_Dyn::DT_RELA]; + int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; + if (z_rel && z_rsz) { +- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); ++ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); ++ if ((u64_t)file_size <= rel_off) { ++ char msg[70]; snprintf(msg, sizeof(msg), ++ "bad Elf64_Dynamic[DT_RELA] %#llx\n", ++ rel_off); ++ throwCantPack(msg); ++ } + Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; +- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); ++ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); ++ if ((u64_t)file_size <= relsz) { ++ char msg[70]; snprintf(msg, sizeof(msg), ++ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", ++ relsz); ++ throwCantPack(msg); ++ } + Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); + for (; rp < last; ++rp) { +- unsigned r_va = get_te64(&rp->r_offset); ++ upx_uint64_t r_va = get_te64(&rp->r_offset); + if (r_va == user_init_ava) { // found the Elf64_Rela +- unsigned r_info = get_te64(&rp->r_info); ++ upx_uint64_t r_info = get_te64(&rp->r_info); + unsigned r_type = ELF64_R_TYPE(r_info); + if (Elf64_Ehdr::EM_AARCH64 == e_machine + && R_AARCH64_RELATIVE == r_type) { +@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() + } + else { + char msg[50]; snprintf(msg, sizeof(msg), +- "bad relocation %#x DT_INIT_ARRAY[0]", ++ "bad relocation %#llx DT_INIT_ARRAY[0]", + r_info); + throwCantPack(msg); + } -- cgit v1.2.3 From 05e0bd07d4fcfd082a8095150a86ceacb4635b7c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:11:02 -0400 Subject: gnu: bcg729: Enable tests and update home page, license. * gnu/packages/linphone.scm (bcg729)[source]: Remove '.git' suffix from URL. [tests?]: Remove argument. [configure-flags]: Enable tests. [phases]{copy-inputs}: New phase. {check}: Override. [native-inputs]: Add perl, test-patterns and unzip. [home-page]: Update. [license]: Upgrade to GPLv3+. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 56 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 382b3a912b..19b50170d2 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -243,24 +243,68 @@ tracks in one file. ") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/bcg729.git") + (url "git://git.linphone.org/bcg729") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_TESTS=YES") + #:phases + (modify-phases %standard-phases + (add-before 'check 'copy-inputs + (lambda* (#:key inputs #:allow-other-keys) + (let ((test-patterns (assoc-ref inputs "test-patterns")) + (dest (string-append "test/bcg729-patterns.zip"))) + (copy-recursively test-patterns dest)))) + (replace 'check + (lambda _ + (with-directory-excursion "test" + (invoke "unzip" "bcg729-patterns.zip") + (for-each + (lambda (test-name) + (invoke "./testCampaign" "-s" test-name)) + (list "fixedCodebookSearch" + "postProcessing" + "adaptativeCodebookSearch" + "computeLP" + "computeAdaptativeCodebookGain" + "postFilter" + "decoder" + "LPSynthesisFilter" + "decodeLSP" + ;; "encoder" + ;; "LSPQuantization" + "preProcessing" + "decodeFixedCodeVector" + "CNGdecoder" + ;; "LP2LSPConversion" + "gainQuantization" + "findOpenLoopPitchDelay" + "decodeGains" + "computeWeightedSpeech" + "interpolateqLSPAndConvert2LP" + "decodeAdaptativeCodeVector")))))))) + (native-inputs + `(("perl" ,perl) + ("test-patterns" + ,(origin + (method url-fetch) + (uri (string-append "http://www.belledonne-communications.com/" + "bc-downloads/bcg729-patterns.zip")) + (sha256 + (base32 "1kivarhh3izrl9sg0szs6x6pbq2ap0y6xsraw0gbgspi4gnfihrh")))) + ("unzip" ,unzip))) (synopsis "Belledonne Communications G729 Codec") (description "BcG729 is an implementation of both encoder and decoder of the ITU G729 speech codec. The library written in C 99 is fully portable and can be executed on many platforms including both ARM and x86 processors. It supports concurrent channels encoding and decoding for multi call application such as conferencing.") - (home-page "https://gitlab.linphone.org/BC/public/belcard") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/bcg729") + (license license:gpl3+))) (define-public ortp (package -- cgit v1.2.3 From 279908ef510342b967f9ce25e5ff969f9c0ca55d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 20:30:21 -0400 Subject: gnu: bcmatroska2: Fetch the sources from git. * gnu/packages/linphone.scm (bcmatroska2)[source]: Fetch sources from git. [description]: Expound description. [license]: Add the gpl2+ license to the list. Remove broken URLs. --- gnu/packages/linphone.scm | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 19b50170d2..078185046f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -209,31 +209,26 @@ format.") (version "0.23") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/bcmatroska2.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15")))) + (base32 "1avl9w18kh4dxm3g8j0bkw39bksd7bz3nfxvyibqqnz63ds8vfi2")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required + `(#:tests? #f ; No test target + #:configure-flags (list "-DENABLE_STATIC=NO"))) ; Not required (synopsis "Belledonne Communications Media Container") (description "BcMatroska is a free and open standard multi-media container format. It can hold an unlimited number of video, audio, picture, or subtitle -tracks in one file. ") +tracks in one file. This project provides a convenient distribution of the +Matroska multimedia container format.") (home-page "https://gitlab.linphone.org/BC/public/bcmatroska2") - (license - (list - ;; For Core C and LibEBML2. - ;; https://www.matroska.org/node/47 - license:bsd-4 - ;; For LibMatroska2. - ;; https://www.matroska.org/node/47 - license:lgpl2.1+)))) + (license (list license:gpl2+ ;for this package (build system files) + license:bsd-4 ;for Core C and LibEBML2 + license:lgpl2.1+)))) ;for LibMatroska2 (define-public bcg729 (package -- cgit v1.2.3 From ec3b73336861eaa27f506d17fdbea573363beb84 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 27 Mar 2021 10:45:47 +0100 Subject: gnu: cuirass: Update to 1.0.0-5.eb94e7d. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-5.eb94e7d. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index f7f4bf4dc1..15d1cb5317 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "ff3f25d28782a85841b5e604335fc1118ef93f01") - (revision "4")) + (let ((commit "eb94e7da6a5985a4b92d92aa22955e4013490e9c") + (revision "5")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0sykgmh12llkk5qb63542wb7ywjiirscqmlvrsskfkqlgs7scsgg")))) + "1fyj33bhfl0zl7ik98dxqvb58n24zv3aw037gvri0p0xzyp2fhbx")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From c7d04418af3d9a107330063192eee32d1457a2a5 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sat, 27 Mar 2021 14:13:43 +0100 Subject: gnu: icedove: Update to 78.9.0. * gnu/packages/gnuzilla.scm (icedove): Update to 78.9.0. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 826dbbd511..f2de477548 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1305,11 +1305,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20210223000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20210323000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "78.8.0") + (version "78.9.0") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1589,7 +1589,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "d801a94f25867ca5f2f3488c4700532351987999")) + ,(let ((changeset "1a5cd2aa11de609116f258b413afcf113ed72f3a")) (origin (method hg-fetch) (uri (hg-reference @@ -1598,7 +1598,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "19h1s9qcxzcvbd1m07xajk5lhpikj53k5fp3nwvl38xj7a3s0gxw"))))) + "0qgz9qj8gbn2ccmhvk3259ahs9p435ipvkzsysn3xj8a6klbz02w"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) -- cgit v1.2.3 From 61746650b22698583bbc016b4ae1763422f7023c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 15:20:50 +0100 Subject: gnu: cryptsetup: Update to 2.3.5. * gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.3.5. --- gnu/packages/cryptsetup.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index a12ac93b25..1b3da5389c 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Ludovic Courtès -;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +35,7 @@ (define-public cryptsetup (package (name "cryptsetup") - (version "2.3.4") + (version "2.3.5") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -43,7 +43,7 @@ "/cryptsetup-" version ".tar.xz")) (sha256 (base32 - "0wrpz2fzbsszmsgxxbssxjgylpyiindh24z8g13m2fxmjsxyw5lx")))) + "1hbhzlv4vbib1da20vnrqaikhxi7ljnchbzrv8v2a4sd8ipr9nff")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From da431695b5b7a8dce96404d8d8b054d3fa7ef6a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 16:33:49 +0100 Subject: gnu: nnn: Update to 3.6. * gnu/packages/admin.scm (nnn): Update to 3.6. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6949edd00c..df467c6965 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3501,14 +3501,14 @@ information tool.") (define-public nnn (package (name "nnn") - (version "3.5") + (version "3.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1ww18vvfjkvi36rcamw8kpix4bhk71w5bw9kmnh158crah1x8dp6")))) + (base32 "1dbq16cdipij5ws59ab3alfmxli7n4wx28ip7gsyq8ncxg598l47")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From 8a423f8911b5d476b6322ceaebed87f85c3c3806 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 16:47:05 +0100 Subject: gnu: ccls: Update to 0.20201219. * gnu/packages/cpp.scm (ccls): Update to 0.20201219. --- gnu/packages/cpp.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2233d2e993..a0fc373bfd 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ethan R. Jones -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2019, 2020 Mathieu Othacehe @@ -482,7 +482,7 @@ tools (containers, algorithms) used by other QuantStack packages.") (define-public ccls (package (name "ccls") - (version "0.20201025") + (version "0.20201219") (source (origin (method git-fetch) @@ -490,8 +490,7 @@ tools (containers, algorithms) used by other QuantStack packages.") (url "https://github.com/MaskRay/ccls") (commit version))) (sha256 - (base32 - "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p")) + (base32 "0nkg92rgb1x6scpiwdamfrd1ag87j7ajxyn5qi861r916m5mh9m8")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From acbcc0c4b1810422963e41c7ecbf23cada171b66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 16:47:21 +0100 Subject: gnu: facter: Update to 4.0.52. * gnu/packages/admin.scm (facter): Update to 4.0.52. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index df467c6965..1b0cc6a4ec 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -462,7 +462,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.51") + (version "4.0.52") (source (origin (method git-fetch) (uri (git-reference @@ -471,7 +471,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1s98rq2wjmh8bqdfdibvfp9j2ynd97k0c4hairryrzl9nna3j542")))) + "05j4q87sak1f1isj7ngzr59h3j3xskfwjjwfv0xd7lhwcaxg3a3c")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From b51f086f9297a4c9b54952b6d5e33db66f0f7bcd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 19:04:51 +0100 Subject: gnu: git: Update to 2.31.1. * gnu/packages/version-control.scm (git): Update to 2.31.1. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 137c7c8336..95703e5e00 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -172,14 +172,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.31.0") + (version "2.31.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0h4sg3xqa9pd2agrd7m18sqg319ls978d39qswyf30rjvg5n5wg8")))) + "10367n5sv4nsgaxy486pbp7nscx34vjk8vrb06jm9ffm8ix42qcz")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -196,7 +196,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1v40wwj130k76xf2w6vwhvfpkk765q1gcy5bqcrqssxf66ydqp8q")))) + "00n7vbfmd3ywgjksgwrszwj0l2niba64qkaq07ra4p8mawy483ax")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From dfd20df252f803a3215a7e9a5d799ac5ab8d4f87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 19:06:38 +0100 Subject: gnu: gptfdisk: Update to 1.0.7. * gnu/packages/disk.scm (gptfdisk): Update to 1.0.7. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b89da87967..81197c9cc2 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -305,14 +305,14 @@ tables, and it understands a variety of different formats.") (define-public gptfdisk (package (name "gptfdisk") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/" version "/gptfdisk-" version ".tar.gz")) (sha256 - (base32 "1a4c2ss6n2s6x8v11h79jykh96y46apd6i838ka0ngx58gb53ifx")))) + (base32 "1h1871gwlq05gdc2wym98ghfmq6pn5lh8g5cqy3r49svz2vh8h3m")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From a4a8693c8e9916dc649b527d5e9728e728f0cc5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 20:04:55 +0100 Subject: gnu: diffoscope: Update to 171. * gnu/packages/diffoscope.scm (diffoscope): Update to 171. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 20ba92709a..0b2779d288 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "170") + (version "171") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0s1z4yc5d10ns4x28d2lm8py30r7sq4764q6b8yxcwxwfrjibmb0")))) + "1niz481s8i86ql56kfmnyzh0nwinhpzhprfkljwdprqi6hc63v0c")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 50a325166780d860d82efb218822792b5dc2d7e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 20:47:55 +0100 Subject: gnu: ntl: Update to 11.4.4. * gnu/packages/algebra.scm (ntl): Update to 11.4.4. --- gnu/packages/algebra.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 64f7eda485..d92e963af4 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2020 Efraim Flashner -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier ;;; Copyright © 2019 Mathieu Othacehe @@ -563,14 +563,14 @@ these types and other mathematical functions.") (define-public ntl (package (name "ntl") - (version "11.4.3") + (version "11.4.4") (source (origin (method url-fetch) (uri (string-append "https://shoup.net/ntl/ntl-" version ".tar.gz")) (sha256 (base32 - "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp")) + "1nr1h27j2gdz6badzz9lk2pknxhdijqdxqhd3haryh0sw616wzwx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 8521e875b49a3171c921d41ba865dffcd6ba6328 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 22:05:26 +0100 Subject: gnu: Add gpart. * gnu/packages/disk.scm (gpart): New public variable. --- gnu/packages/disk.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 81197c9cc2..6b9a9e4812 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -302,6 +302,58 @@ fdisk. fdisk is used for the creation and manipulation of disk partition tables, and it understands a variety of different formats.") (license license:gpl3+))) +(define-public gpart + ;; The latest (0.3) release is from 2015 and is missing a crash fix. + (let ((commit "ec03350a01ad69708b5a3e2d47b8e002b0eba6c9") + (revision "0")) + (package + (name "gpart") + (version (git-version "0.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/baruch/gpart") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dassswliaiwhhmx7yz540yyxgk53fvg672dbvgc5q0v6cqrh5jx")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" + ,name "-" ,version)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-premature-configuration + (lambda _ + (substitute* "autogen.sh" + (("\\./configure") ""))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "https://github.com/baruch/gpart") + (synopsis "Guess and recover PC-style partition tables") + (description + "Gpart tries to guess the partitions on a PC-style, MBR-partitioned disk +after they have been inadvertently deleted or the primary partition table at +sector 0 damaged. In both cases, the contents of these partitions still exist +on the disk but the operating system cannot access them. + +Gpart ignores the partition table and scans each sector of the device or image +file for several known file system and partition types. Only partitions which +have been formatted in some way can be recognized. Several file system guessing +modules are built in; more can be written and loaded at run time. + +The guessed table can be restored manually, for example with @command{fdisk}, +written to a file, or---if you firmly believe it's entirely correct---directly +to disk. + +It should be stressed that gpart does a very heuristic job. It can easily be +right in its guesswork but it can also be terribly wrong. Never believe its +output without any plausability checks.") + (license license:gpl2+)))) + (define-public gptfdisk (package (name "gptfdisk") -- cgit v1.2.3 From f7aa0734518f18680a1fe4d54af221a45002475b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 22:17:55 +0100 Subject: gnu: pam-mount: Update to 2.18. * gnu/packages/admin.scm (pam-mount): Update to 2.18. [inputs]: Replace pcre with pcre2. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1b0cc6a4ec..df7973395d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4104,14 +4104,14 @@ tcpdump and snoop.") (define-public pam-mount (package (name "pam-mount") - (version "2.17") + (version "2.18") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pam-mount/pam_mount/" "pam_mount-" version ".tar.xz")) (sha256 - (base32 "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy")))) + (base32 "0832nh2qf9pisgwnbgx6hkylx5d7i416l19y3ly4ifv7k1p7mxqa")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) @@ -4123,7 +4123,7 @@ tcpdump and snoop.") ("linux-pam" ,linux-pam) ("lvm2" ,lvm2) ("openssl" ,openssl) - ("pcre" ,pcre) + ("pcre2" ,pcre2) ("libmount" ,util-linux "lib") ("util-linux" ,util-linux))) (arguments -- cgit v1.2.3 From 02a2c7e53cc0070233c31f52600bec5e6a0d7c72 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 22:47:02 +0100 Subject: gnu: gnu-efi: Update to 3.0.13. * gnu/packages/efi.scm (gnu-efi): Update to 3.0.13. --- gnu/packages/efi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 11cfe586ac..8bbd873435 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -38,14 +38,14 @@ (define-public gnu-efi (package (name "gnu-efi") - (version "3.0.12") + (version "3.0.13") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnu-efi/" "gnu-efi-" version ".tar.bz2")) (sha256 - (base32 "0sbn6am3k5lqafycggh1g964fcwjwnh0i9hhwrk4ncrwzphz55h1")))) + (base32 "0z9v5pl5pmlw8pjpd66iyh9pml2hh6pqd4c5qilywilw4wazgk1g")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; none exist -- cgit v1.2.3 From 3f4a71a44efb2b1a2a5c994598021b441aada7a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 22:47:13 +0100 Subject: gnu: knot: Update to 3.0.5. * gnu/packages/dns.scm (knot): Update to 3.0.5. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 953933d880..b6f86711a3 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -812,7 +812,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.0.4") + (version "3.0.5") (source (origin (method git-fetch) @@ -821,7 +821,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mbjl18zi8yxs7pa3395lqjwdw0agjbfpl32x42i6d9zb8fsblzs")) + (base32 "16rgcmgj21w2niyz45d3zjlci9i22gxcvfzqw7g5zwsjdy9610nx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 9f511106c6759e6b555060220eebae0ca98b71e8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 27 Mar 2021 22:42:15 +0100 Subject: gnu: Add mandoc. * gnu/packages/man.scm (mandoc): New variable. Co-authored-by: Stefan Karrmann --- gnu/packages/man.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 8a548e6e56..8911463a61 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2014, 2015, 2017, 2018, 2021 Ludovic Courtès ;;; Copyright © 2014 David Thompson ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Alex Kost @@ -32,6 +32,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system ruby) #:use-module (guix utils) + #:use-module (gnu packages compression) #:use-module (gnu packages dbm) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) @@ -221,6 +222,50 @@ accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases.") (license license:gpl2+))) +(define-public mandoc + (package + (name "mandoc") + (version "1.14.5") + (source (origin + (method url-fetch) + (uri (string-append "https://mandoc.bsd.lv/snapshots/mandoc-" + version ".tar.gz")) + (sha256 + (base32 + "1xyqllxpjj1kimlipx11pzyywf5c25i4wmv0lqm7ph3gnlnb86c2")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "regress" + #:phases (modify-phases %standard-phases + (add-before 'configure 'set-prefix + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "configure" + (("^CC=.*") + (string-append "CC=" ,(cc-for-target) "\n")) + (("^DEFCFLAGS=\\\\\"") + "DEFCFLAGS=\"-O2 ") + (("^UTF8_LOCALE=.*") ;used for tests + "UTF8_LOCALE=en_US.UTF-8\n") + (("^MANPATH_(BASE|DEFAULT)=.*" _ which) + (string-append "MANPATH_" which "=" + "/run/current-system/profile/share/man\n")) + (("^PREFIX=.*") + (string-append "PREFIX=" (assoc-ref outputs "out") + "\n")))))))) + (native-inputs `(("perl" ,perl))) ;used to run tests + (inputs `(("zlib" ,zlib))) + (synopsis "Tools for BSD mdoc and man pages") + (description + "mandoc is a suite of tools compiling mdoc, the roff macro language of +choice for BSD manual pages, and man, the predominant historical language for +UNIX manuals. It is small and quite fast. The main component of the toolset +is the @command{mandoc} utility program, based on the libmandoc validating +compiler, to format output for UTF-8 and ASCII UNIX terminals, HTML 5, +PostScript, and PDF. Additional tools include the @command{man} viewer, and +@command{apropos} and @command{whatis}.") + (home-page "https://mandoc.bsd.lv/") + (license license:isc))) + (define-public man-pages (package (name "man-pages") -- cgit v1.2.3 From 52d2c0b27aba1f29b99bdb8649c992f5dfaee95d Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Sat, 23 Jan 2021 14:57:25 -0600 Subject: gnu: Add interception-tools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (interception-tools): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/linux.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5e7542d50b..929b930dd9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3532,6 +3532,53 @@ subsystem. @code{uinput} allows userspace programs to create and handle input devices that can inject events directly into the input subsystem.") (license license:bsd-3))) +(define-public interception-tools + (package + (name "interception-tools") + (version "0.6.4") + (home-page "https://gitlab.com/interception/linux/tools") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "121jy40ynkbzlqnx7g0dqwvkb7dm2ahcy6vwrz6ylsyd0jmi6s5a")))) + (build-system cmake-build-system) + (inputs + `(("boost" ,boost) + ("libevdev" ,libevdev) + ("libudev" ,eudev) + ("yaml-cpp" ,yaml-cpp))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-libevdev-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((libevdev (assoc-ref inputs "libevdev"))) + (substitute* "CMakeLists.txt" + (("/usr/include/libevdev-1.0") + (string-append libevdev "/include/libevdev-1.0"))) + #t)))) + ;; No tests are included. + #:tests? #f)) + (synopsis "Utilities for operating on input events of evdev devices") + (description + "Interception Tools provides a composable infrastructure on top of +@code{libudev} and @code{libevdev}. The following utilities are provided: + +@itemize +@item @command{udevmon} --- monitor input devices for launching tasks +@item @command{intercept} --- redirect device input events to stdout +@item @command{uinput} --- redirect device input events from stding to virtual device +@item @command{mux} --- mux streams of input events +@end itemize") + ;; Dual-licensed under GPLv3+ or "something else" on request, per + ;; 'README.md'. + (license license:gpl3+))) + (define-public lvm2 (package (name "lvm2") -- cgit v1.2.3 From 3b0ead1c6a6665c175bb390155eba1f54ba510b5 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Sat, 23 Jan 2021 16:13:27 -0600 Subject: gnu: Add interception-dual-function-keys. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (interception-dual-function-keys): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 929b930dd9..388b8aae8d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3579,6 +3579,46 @@ devices that can inject events directly into the input subsystem.") ;; 'README.md'. (license license:gpl3+))) +(define-public interception-dual-function-keys + (package + (name "interception-dual-function-keys") + (version "1.3.0") + (home-page "https://gitlab.com/interception/linux/plugins/dual-function-keys") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gvhkmwzl5fyyc7k8rc4rf2b9mzh05wa8wcybf9hz2x1mqkc7lmz")))) + (build-system gnu-build-system) + (inputs + `(("libevdev" ,libevdev) + ("yaml-cpp" ,yaml-cpp))) + (arguments + `(#:make-flags (list "CC=gcc" "CXX=g++" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-libevdev-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((libevdev (assoc-ref inputs "libevdev"))) + (substitute* "config.mk" + (("/usr/include/libevdev-1.0") + (string-append libevdev "/include/libevdev-1.0"))) + #t))) + ;; No configure script + (delete 'configure) + ;; No target 'check' + (delete 'check)))) + (synopsis "Tap for one key, hold for another") + (description + "Dual Function Keys is a plugin for @code{interception-tools} that allows +one to send arbitrary keycodes when a given key is tapped or held.") + (license license:expat))) + (define-public lvm2 (package (name "lvm2") -- cgit v1.2.3 From 7c2b840d6c586f80fe22a862ce4e362c997559a5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:07:59 -0400 Subject: gnu: imagemagick: Remove graft. Note that this commit does *not* integrate the fixes that were previously applied via the graft. This commit simply discards those fixes. We will address those security flaws, without grafting, in subsequent commits. * gnu/packages/imagemagick.scm (imagemagick)[replacement]: Remove field. (imagemagick/fixed): Remove variable. --- gnu/packages/imagemagick.scm | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index a3562f2e13..cc5f1de4bf 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -51,7 +51,6 @@ ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. (version "6.9.11-48") - (replacement imagemagick/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" @@ -128,45 +127,6 @@ transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.") (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) -(define-public imagemagick/fixed - (package - (inherit imagemagick) - (name "imagemagick") - ;; 'g' for 'guix', appended character to retain version length so grafting - ;; works properly. - (version "6.9.12-2g") - (source (origin - (method url-fetch) - (uri (string-append "mirror://imagemagick/ImageMagick-" - ;; Hardcode the version here since we had to - ;; change it above. - "6.9.12-2.tar.xz")) - (sha256 - (base32 - "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))) - (arguments - (substitute-keyword-arguments (package-arguments imagemagick) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'fix-compat-cheat-rename-so - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion - (string-append (assoc-ref outputs "out") - "/lib") - (symlink "libMagick++-6.Q16.so.9.0.0" - "libMagick++-6.Q16.so.8.0.0") - (symlink "libMagick++-6.Q16.so.9" - "libMagick++-6.Q16.so.8") - (symlink "libMagickCore-6.Q16.so.7.0.0" - "libMagickCore-6.Q16.so.6.0.0") - (symlink "libMagickCore-6.Q16.so.7" - "libMagickCore-6.Q16.so.6") - (symlink "libMagickWand-6.Q16.so.7.0.0" - "libMagickWand-6.Q16.so.6.0.0") - (symlink "libMagickWand-6.Q16.so.7" - "libMagickWand-6.Q16.so.6")) - #t)))))))) - (define-public perl-image-magick (package (name "perl-image-magick") -- cgit v1.2.3 From be3aef49ed1d8a0f13d64cd5cf6f280500876efd Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:16:50 -0400 Subject: gnu: imagemagick: Add 'imagemagick/stable' variant. * gnu/packages/imagemagick.scm (imagemagick/stable): New variable. (imagemagick): This is now an alias to 'imagemagick/stable'. --- gnu/packages/imagemagick.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index cc5f1de4bf..528fb9eb25 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -44,7 +44,19 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) -(define-public imagemagick +;; This is a variant of the 'imagemagick' package that is not updated often. +;; It is intended to be used as a native-input at build-time only, e.g. by +;; 'gtk-doc' (via 'dblatex') for generating package documentation. This +;; allows the main 'imagemagick' package to be freely updated on the 'master' +;; branch without triggering an excessive number of rebuilds. +;; +;; Normally the grafts mechanism would be used, but there are often +;; difficulties grafting imagemagick, e.g. because upstream changes the ABI +;; between micro version updates. Also, the overwhelming majority of +;; dependencies on imagemagick are via 'gtk-doc' in 'native-inputs', where +;; grafting is ineffective. See: +;; . +(define-public imagemagick/stable (package (name "imagemagick") ;; The 7 release series has an incompatible API, while the 6 series is still @@ -127,6 +139,9 @@ transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.") (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) +(define-public imagemagick + imagemagick/stable) + (define-public perl-image-magick (package (name "perl-image-magick") -- cgit v1.2.3 From 69437a59e67634f85477a5eadab092598aa57ee1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:27:52 -0400 Subject: gnu: dblatex: Add 'dblatex/stable' variant. * gnu/packages/docbook.scm (dblatex/stable): New variable. --- gnu/packages/docbook.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 012e86f6a5..e348fb1a5b 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix build-system trivial) #:use-module (guix build-system python)) @@ -460,3 +462,14 @@ process. MathML 2.0 markups are supported too. It started as a clone of DB2LaTeX.") ;; lib/contrib/which is under an X11 license (license gpl2+))) + +;; This is a variant of the 'dblatex' package that is not updated often. It +;; is intended to be used as a native-input at build-time only, e.g. by +;; 'gtk-doc' for generating package documentation. This allows the main +;; 'dblatex' and 'imagemagick' packages to be freely updated on the 'master' +;; branch without triggering an excessive number of rebuilds. +(define-public dblatex/stable + (hidden-package + (package/inherit dblatex + (inputs (alist-replace "imagemagick" `(,imagemagick/stable) + (package-inputs dblatex)))))) -- cgit v1.2.3 From 11d73170c5eee450b9b2f2dd444457850389e6a2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:29:25 -0400 Subject: gnu: gtk-doc: Add 'gtk-doc/stable' variant. * gnu/packages/gtk.scm (gtk-doc/stable): New variable. --- gnu/packages/gtk.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cf9116214c..52710b4687 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -48,6 +48,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -1829,6 +1830,17 @@ typically used to document the public API of GTK+ and GNOME libraries, but it can also be used to document application code.") (license license:gpl2+))) +;; This is a variant of the 'gtk-doc' package that is not updated often. It +;; is intended to be used as a native-input at build-time only. This allows +;; the main 'gtk-doc', 'dblatex' and 'imagemagick' packages to be freely +;; updated on the 'master' branch without triggering an excessive number of +;; rebuilds. +(define-public gtk-doc/stable + (hidden-package + (package/inherit gtk-doc + (inputs (alist-replace "dblatex" `(,dblatex/stable) + (package-inputs gtk-doc)))))) + (define-public gtk-engines (package (name "gtk-engines") -- cgit v1.2.3 From 9dea1618755891526f708aa335b4136c1302d16e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:35:02 -0400 Subject: gnu: Use 'gtk-doc/stable' in native-inputs of selected packages. * gnu/packages/calendar.scm (libical), gnu/packages/check.scm (umockdev), gnu/packages/fontutils.scm (libraqm), gnu/packages/freedesktop.scm (appstream, farstream, libglib-testing) (udisks, libfprint, libportal), gnu/packages/geo.scm (memphis, osm-gps-map), gnu/packages/glib.scm (template-glib), gnu/packages/gnome.scm (gupnp-igd, libcloudproviders, libgrss, seed) (gtx, dee, zeitgeist, phodav, gssdp, gupnp, gupnp-dlna, gupnp-av, rygel) (libnma, gdl, libnotify, vte-ng, dconf, libxklavier, libsoup, colord) (geoclue, geocode-glib, amtk, grilo, gvfs, gusb, network-manager) (network-manager-applet, gfbgraph, libunique, cheese, libhandy) (gnome-latex, libgda), gnu/packages/gstreamer.scm (orc), gnu/packages/gtk.scm (at-spi2-core, goocanvas), gnu/packages/language.scm (nimf), gnu/packages/networking.scm (libnice), gnu/packages/video.scm (schroedinger), gnu/packages/virtualization.scm (libosinfo), gnu/packages/webkit.scm (wpewebkit, webkitgtk), gnu/packages/xml.scm (libxmlb)[native-inputs]: Replace 'gtk-doc' with 'gtk-doc/stable'. --- gnu/packages/calendar.scm | 2 +- gnu/packages/check.scm | 2 +- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 12 +++---- gnu/packages/geo.scm | 4 +-- gnu/packages/glib.scm | 2 +- gnu/packages/gnome.scm | 70 ++++++++++++++++++++--------------------- gnu/packages/gstreamer.scm | 2 +- gnu/packages/gtk.scm | 4 +-- gnu/packages/language.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/virtualization.scm | 2 +- gnu/packages/webkit.scm | 4 +-- gnu/packages/xml.scm | 2 +- 15 files changed, 57 insertions(+), 57 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 4e1e4f05b6..d473900ac5 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -156,7 +156,7 @@ the library for handling time zones and leap seconds.") (native-inputs `(("docbook-xml" ,docbook-xml-4.3) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("perl" ,perl) ("pkg-config" ,pkg-config) ("vala" ,vala))) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c27f347819..7c95ea6950 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2732,7 +2732,7 @@ provides a simple way to achieve this.") (native-inputs `(("vala" ,vala) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ;; For tests. diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a4c92f5bea..1d9c81b8a6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -965,7 +965,7 @@ Unicode Charts. It was developed for use with DejaVu Fonts project.") (arguments `(#:configure-flags (list "--disable-static"))) (native-inputs - `(("gtk-doc" ,gtk-doc) + `(("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4105dd7ca0..a9e96c9928 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -173,7 +173,7 @@ ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("gperf" ,gperf) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("xsltproc" ,libxslt))) @@ -261,7 +261,7 @@ application-centers for distributions.") ("docbook-xml" ,docbook-xml-4.1.2) ("docbook-xsl" ,docbook-xsl) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libtool" ,libtool) ("perl" ,perl) ("pkg-config" ,pkg-config) @@ -313,7 +313,7 @@ for videoconferencing.") `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (inputs `(("dbus" ,dbus) ("glib" ,glib))) @@ -1202,7 +1202,7 @@ Analysis and Reporting Technology) functionality.") ("glib:bin" ,glib "bin") ; for glib-mkenums ("gnome-common" ,gnome-common) ; TODO: Why is this needed? ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) @@ -1598,7 +1598,7 @@ wish to perform colour calibration.") `(("eudev" ,eudev) ("glib:bin" ,glib "bin") ; for {glib-,}mkenums ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) ; for 88 KiB of API documentation + ("gtk-doc" ,gtk-doc/stable) ; for 88 KiB of API documentation ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) @@ -2197,7 +2197,7 @@ fallback to generic Systray support if none of those are available.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("docbook-xsl" ,docbook-xsl) ("docbook-xml" ,docbook-xml) ("libxml2" ,libxml2) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c988d6b114..97fa83b86b 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -151,7 +151,7 @@ ("automake" ,automake) ("docbook-xml" ,docbook-xml-4.3) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -1138,7 +1138,7 @@ OpenStreetMap data files.") (build-system gnu-build-system) (native-inputs `(("gnome-common" ,gnome-common) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9c3cd75624..c04bd334e9 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1165,7 +1165,7 @@ other API remains the same.") `(("bison" ,bison) ("flex" ,flex) ("glib:bin" ,glib "bin") ;; For glib-mkenums - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (home-page "https://gitlab.gnome.org/GNOME/template-glib") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7702510eb4..1e8af1c41f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -263,7 +263,7 @@ ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) @@ -366,7 +366,7 @@ features to enable users to create their discs easily and quickly.") (native-inputs `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -415,7 +415,7 @@ services.") (native-inputs `(("docbook-xml" ,docbook-xml-4.1.2) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) @@ -512,7 +512,7 @@ bindings.") ("docbook-xml" ,docbook-xml-4.1.2) ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) @@ -622,7 +622,7 @@ It is written in C using GObject and libsoup.") "/share/gtk-doc/html")))) (native-inputs `(("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib))) @@ -692,7 +692,7 @@ of writing test cases for asynchronous interactions.") ("dbus-test-runner" ,dbus-test-runner) ("docbook-xml" ,docbook-xml-4.3) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ;; Would only be required by configure flag "--enable-extended-tests". ;("gtx" ,gtx) ("pkg-config" ,pkg-config) @@ -768,7 +768,7 @@ of known objects without needing a central registrar.") ("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("vala" ,vala) @@ -1177,7 +1177,7 @@ Library reference documentation.") `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("avahi" ,avahi) @@ -1295,7 +1295,7 @@ It has miners for Facebook, Flickr, Google, ownCloud and SkyDrive.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -1326,7 +1326,7 @@ a debugging tool, @command{gssdp-device-sniffer}.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -1357,7 +1357,7 @@ for creating UPnP devices and control points, written in C using `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libxml" ,libxml2) ("pkg-config" ,pkg-config) ("vala" ,vala))) @@ -1391,7 +1391,7 @@ given profile, etc. DLNA is a subset of UPnP A/V.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libxml" ,libxml2) ("pkg-config" ,pkg-config))) (inputs @@ -1607,7 +1607,7 @@ preview files on the GNOME desktop.") (native-inputs `(("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -1669,7 +1669,7 @@ client devices can handle.") `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala))) @@ -2417,7 +2417,7 @@ GNOME Desktop.") ("automake" ,automake) ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("gnome-common" ,gnome-common) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("libtool" ,libtool) @@ -3057,7 +3057,7 @@ configuring CUPS.") ("gobject-introspection" ,gobject-introspection) ;; For the documentation. - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("xsltproc" ,libxslt) ("docbook-xsl" ,docbook-xsl))) (home-page "https://developer-next.gnome.org/libnotify/") @@ -4503,7 +4503,7 @@ editors, IDEs, etc.") "0rnm5c6m3abbm81jsfdas0y80z299ny54gr4syn4bfrms3s4g19l")))) (build-system meson-build-system) (native-inputs - `(("gtk-doc" ,gtk-doc) + `(("gtk-doc" ,gtk-doc/stable) ,@(package-native-inputs vte))) (arguments `(#:configure-flags '("-Ddocs=true"))) @@ -4620,7 +4620,7 @@ and RDP protocols.") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (arguments @@ -4697,7 +4697,7 @@ and objects.") `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("which" ,which) ("autoconf" ,autoconf) @@ -4920,7 +4920,7 @@ libxml to ease remote use of the RESTful API.") `(("docbook-xml" ,docbook-xml-4.1.2) ("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -5287,7 +5287,7 @@ keyboard shortcuts.") `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs @@ -5332,7 +5332,7 @@ output devices.") ("gobject-introspection" ,gobject-introspection) ("modem-manager" ,modem-manager) ("libnotify" ,libnotify) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool))) (inputs `(("avahi" ,avahi) @@ -5377,7 +5377,7 @@ permission from user.") ("glibc-locales" ,glibc-locales) ; for tests ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("json-glib" ,json-glib))) (propagated-inputs @@ -5683,7 +5683,7 @@ which are easy to play with the aid of a mouse.") (native-inputs `(("gobject-introspection" ,gobject-introspection) ("glib:bin" ,glib "bin") ; for glib-mkenums - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) @@ -6100,7 +6100,7 @@ as possible!") ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("vala" ,vala))) (inputs `(("cyrus-sasl" ,cyrus-sasl) @@ -6534,7 +6534,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs @@ -6599,7 +6599,7 @@ DAV, and others.") `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala) - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (propagated-inputs ;; Both of these are required by gusb.pc. `(("glib" ,glib) @@ -7804,7 +7804,7 @@ users.") `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("gobject-introspection" ,gobject-introspection) ("docbook-xml" ,docbook-xml) ("docbook-xsl" ,docbook-xsl) @@ -8061,7 +8061,7 @@ Cisco's AnyConnect SSL VPN.") `(("intltool" ,intltool) ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs ;; libnm-gtk.pc refers to all these. @@ -9809,7 +9809,7 @@ compiled.") "--enable-introspection"))) (native-inputs `(("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ;; The 0.2.4 ‘release’ tarball isn't bootstrapped. @@ -9881,7 +9881,7 @@ environment, which can notably display keyboard layouts.") `(("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (propagated-inputs ;; Referred to in .h files and .pc. `(("gtk+" ,gtk+))) @@ -10466,7 +10466,7 @@ photo-booth-like software, such as Cheese.") ("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("itstool" ,itstool) ("libxml2" ,libxml2) ("libxslt" ,libxslt) @@ -11005,7 +11005,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ; for g-ir-scanner ("vala" ,vala) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) @@ -11540,7 +11540,7 @@ card sheets that you’ll find at most office supply stores.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) @@ -12132,7 +12132,7 @@ developed with the aim of being used with the Librem 5 phone.") ("glib:bin" ,glib "bin") ("gnome-common" ,gnome-common) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1c7ba98a86..6a4e14167d 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -384,7 +384,7 @@ http://www.tux.org/~ricdude/overview.html") "if (error) return 77;")) #t))))) (native-inputs - `(("gtk-doc" ,gtk-doc))) + `(("gtk-doc" ,gtk-doc/stable))) (home-page "https://gstreamer.freedesktop.org/modules/orc.html") (synopsis "Oil runtime compiler") (description diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 52710b4687..fa4241eb31 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -723,7 +723,7 @@ in the GNOME project.") (native-inputs `(("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (synopsis "Assistive Technology Service Provider Interface, core components") @@ -2247,7 +2247,7 @@ popovers.") `(("gettext" ,gettext-minimal) ("glib-bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("python" ,python))) (inputs diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index d4b9b8d4cb..5325445a24 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -170,7 +170,7 @@ ("gobject-introspection" ,gobject-introspection) ("gtk+-2:bin" ,gtk+-2 "bin") ("gtk+:bin" ,gtk+ "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("perl" ,perl) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ea3e3f67e7..ecc6f57f4e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -302,7 +302,7 @@ Android, and ChromeOS.") (native-inputs `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("gstreamer" ,gstreamer) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 02096dc7a4..05502a1d1a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -381,7 +381,7 @@ video decode, encode and filtering on Intel's Gen graphics hardware platforms.") #t)))))) (native-inputs `(("dash" ,dash) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("glew" ,glew) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index fabac5b984..96347adf7c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -984,7 +984,7 @@ Debian or a derivative using @command{debootstrap}.") (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("vala" ,vala) ("intltool" ,intltool) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 89eee74def..d8378354bd 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -174,7 +174,7 @@ engine that uses Wayland for graphics output.") ("docbook-xsl" ,docbook-xsl) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -301,7 +301,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("gtk-doc" ,gtk-doc) ; For documentation generation + ("gtk-doc" ,gtk-doc/stable) ; For documentation generation ("docbook-xml" ,docbook-xml) ; For documentation generation ("ruby" ,ruby))) (propagated-inputs diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d05d326f5b..defc0323e6 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -99,7 +99,7 @@ `(#:glib-or-gtk? #t)) (native-inputs `(("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("appstream-glib" ,appstream-glib) -- cgit v1.2.3 From ea2b379ac58fc81e20ee274fa66054efff285b5d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:49:04 -0400 Subject: gnu: imagemagick: Update to 6.9.12-4. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.12-4. --- gnu/packages/imagemagick.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 528fb9eb25..a26e08eb42 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Mark H Weaver +;;; Copyright © 2016, 2021 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong @@ -140,7 +140,19 @@ text, lines, polygons, ellipses and Bézier curves.") (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) (define-public imagemagick - imagemagick/stable) + (package + (inherit imagemagick/stable) + ;; The 7 release series has an incompatible API, while the 6 series is still + ;; maintained. Don't update to 7 until we've made sure that the ImageMagick + ;; users are ready for the 7-series API. + (version "6.9.12-4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://imagemagick/ImageMagick-" + version ".tar.xz")) + (sha256 + (base32 + "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")))))) (define-public perl-image-magick (package -- cgit v1.2.3 From cb3ae2f246646e9d27f844a33a28146093051bbc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 19:37:36 -0400 Subject: gnu: imagemagick: Hide 'imagemagick/stable' variant. * gnu/packages/imagemagick.scm (imagemagick/stable): Hide it. (imagemagick): Remove inherited 'hidden?' property. --- gnu/packages/imagemagick.scm | 151 ++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 74 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index a26e08eb42..bbf038534f 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -42,7 +42,8 @@ #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (srfi srfi-1)) ;; This is a variant of the 'imagemagick' package that is not updated often. ;; It is intended to be used as a native-input at build-time only, e.g. by @@ -57,91 +58,93 @@ ;; grafting is ineffective. See: ;; . (define-public imagemagick/stable - (package - (name "imagemagick") - ;; The 7 release series has an incompatible API, while the 6 series is still - ;; maintained. Don't update to 7 until we've made sure that the ImageMagick - ;; users are ready for the 7-series API. - (version "6.9.11-48") - (source (origin - (method url-fetch) - (uri (string-append "mirror://imagemagick/ImageMagick-" - version ".tar.xz")) - (sha256 - (base32 - "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" + (hidden-package + (package + (name "imagemagick") + ;; The 7 release series has an incompatible API, while the 6 series is still + ;; maintained. Don't update to 7 until we've made sure that the ImageMagick + ;; users are ready for the 7-series API. + (version "6.9.11-48") + (source (origin + (method url-fetch) + (uri (string-append "mirror://imagemagick/ImageMagick-" + version ".tar.xz")) + (sha256 + (base32 + "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" - ;; Do not embed the build date in binaries. - "--enable-reproducible-build") + ;; Do not embed the build date in binaries. + "--enable-reproducible-build") - ;; FIXME: The test suite succeeded before version 6.9.6-2. - ;; Try enabling it again with newer releases. - #:tests? #f - #:phases (modify-phases %standard-phases - (add-before - 'build 'pre-build - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - ;; Clear the `LIBRARY_PATH' setting, which otherwise - ;; interferes with our own use. - (("^LIBRARY_PATH[[:blank:]]*=.*$") - "") + ;; FIXME: The test suite succeeded before version 6.9.6-2. + ;; Try enabling it again with newer releases. + #:tests? #f + #:phases (modify-phases %standard-phases + (add-before + 'build 'pre-build + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + ;; Clear the `LIBRARY_PATH' setting, which otherwise + ;; interferes with our own use. + (("^LIBRARY_PATH[[:blank:]]*=.*$") + "") - ;; Since the Makefile overrides $docdir, modify it to - ;; refer to what we want. - (("^DOCUMENTATION_PATH[[:blank:]]*=.*$") - (let ((doc (assoc-ref outputs "doc"))) - (string-append "DOCUMENTATION_PATH = " - doc "/share/doc/" - ,name "-" - ,(package-version this-package) "\n")))) - #t)) - (add-before - 'configure 'strip-configure-xml - (lambda _ - (substitute* "config/configure.xml.in" - ;; Do not record 'configure' arguments in the - ;; configure.xml file that gets installed: That would - ;; include --docdir, and thus retain a reference to the - ;; 'doc' output. - (("@CONFIGURE_ARGS@") - "not recorded")) - #t))))) - ;; TODO: Add Jasper etc. - (inputs `(("fftw" ,fftw) - ("graphviz" ,graphviz) - ("ghostscript" ,ghostscript) - ("lcms" ,lcms) - ("libx11" ,libx11) - ("zlib" ,zlib) - ("libxml2" ,libxml2) - ("libtiff" ,libtiff) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo) - ("pango" ,pango) - ("freetype" ,freetype) - ("bzip2" ,bzip2) - ("xz" ,xz))) - (native-inputs `(("pkg-config" ,pkg-config))) - (outputs '("out" - "doc")) ; 26 MiB of HTML documentation - (home-page "https://www.imagemagick.org/") - (synopsis "Create, edit, compose, or convert bitmap images") - (description - "ImageMagick is a software suite to create, edit, compose, or convert + ;; Since the Makefile overrides $docdir, modify it to + ;; refer to what we want. + (("^DOCUMENTATION_PATH[[:blank:]]*=.*$") + (let ((doc (assoc-ref outputs "doc"))) + (string-append "DOCUMENTATION_PATH = " + doc "/share/doc/" + ,name "-" + ,(package-version this-package) "\n")))) + #t)) + (add-before + 'configure 'strip-configure-xml + (lambda _ + (substitute* "config/configure.xml.in" + ;; Do not record 'configure' arguments in the + ;; configure.xml file that gets installed: That would + ;; include --docdir, and thus retain a reference to the + ;; 'doc' output. + (("@CONFIGURE_ARGS@") + "not recorded")) + #t))))) + ;; TODO: Add Jasper etc. + (inputs `(("fftw" ,fftw) + ("graphviz" ,graphviz) + ("ghostscript" ,ghostscript) + ("lcms" ,lcms) + ("libx11" ,libx11) + ("zlib" ,zlib) + ("libxml2" ,libxml2) + ("libtiff" ,libtiff) + ("libpng" ,libpng) + ("libjpeg" ,libjpeg-turbo) + ("pango" ,pango) + ("freetype" ,freetype) + ("bzip2" ,bzip2) + ("xz" ,xz))) + (native-inputs `(("pkg-config" ,pkg-config))) + (outputs '("out" + "doc")) ; 26 MiB of HTML documentation + (home-page "https://www.imagemagick.org/") + (synopsis "Create, edit, compose, or convert bitmap images") + (description + "ImageMagick is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.") - (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) + (license (license:fsf-free "http://www.imagemagick.org/script/license.php"))))) (define-public imagemagick (package (inherit imagemagick/stable) + (properties (alist-delete 'hidden? (package-properties imagemagick/stable))) ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. -- cgit v1.2.3 From bfc69d5e7c45eac865e231643b58396580afb231 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 08:08:37 -0400 Subject: gnu: imagemagick: Fix CVE-2020-27829. * gnu/packages/patches/imagemagick-CVE-2020-27829.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/imagemagick.scm (source): Add patch. --- gnu/local.mk | 1 + gnu/packages/imagemagick.scm | 4 +++- .../patches/imagemagick-CVE-2020-27829.patch | 27 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/imagemagick-CVE-2020-27829.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f8c4e73402..435aade2b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1220,6 +1220,7 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/idris-disable-test.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ + %D%/packages/patches/imagemagick-CVE-2020-27829.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index bbf038534f..c48ba534c2 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -155,7 +155,9 @@ text, lines, polygons, ellipses and Bézier curves.") version ".tar.xz")) (sha256 (base32 - "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")))))) + "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")) + (patches + (search-patches "imagemagick-CVE-2020-27829.patch")))))) (define-public perl-image-magick (package diff --git a/gnu/packages/patches/imagemagick-CVE-2020-27829.patch b/gnu/packages/patches/imagemagick-CVE-2020-27829.patch new file mode 100644 index 0000000000..b15c1d0879 --- /dev/null +++ b/gnu/packages/patches/imagemagick-CVE-2020-27829.patch @@ -0,0 +1,27 @@ +We omit the ChangeLog changes below, since they do not apply cleanly. + + +From 6ee5059cd3ac8d82714a1ab1321399b88539abf0 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Mon, 30 Nov 2020 16:26:59 +0000 +Subject: [PATCH] possible TIFF related-heap buffer overflow (alert & POC by + Hardik Shah) + +--- + ChangeLog | 6 ++++++ + coders/tiff.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/coders/tiff.c b/coders/tiff.c +index e98f927ab..1eecf17ae 100644 +--- a/coders/tiff.c ++++ b/coders/tiff.c +@@ -1975,7 +1975,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, + extent+=image->columns*sizeof(uint32); + #endif + strip_pixels=(unsigned char *) AcquireQuantumMemory(extent, +- sizeof(*strip_pixels)); ++ 2*sizeof(*strip_pixels)); + if (strip_pixels == (unsigned char *) NULL) + ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); + (void) memset(strip_pixels,0,extent*sizeof(*strip_pixels)); -- cgit v1.2.3 From 2d3d7faf0a087c7836d71c92c8a67283c3d4dec5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:01:37 -0400 Subject: gnu: imagemagick: Add more upstream fixes. * gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch, gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch, gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/imagemagick.scm (source): Add patches. --- gnu/local.mk | 3 ++ gnu/packages/imagemagick.scm | 5 +++- .../patches/imagemagick-ReadDCMImage-fix.patch | 26 ++++++++++++++++ .../patches/imagemagick-ReadDCMPixels-fix.patch | 35 ++++++++++++++++++++++ .../imagemagick-WriteTHUMBNAILImage-fix.patch | 25 ++++++++++++++++ 5 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch create mode 100644 gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch create mode 100644 gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 435aade2b8..52a021c2a3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1221,6 +1221,9 @@ dist_patch_DATA = \ %D%/packages/patches/idris-disable-test.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/imagemagick-CVE-2020-27829.patch \ + %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \ + %D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \ + %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index c48ba534c2..4f0ffcbcc6 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -157,7 +157,10 @@ text, lines, polygons, ellipses and Bézier curves.") (base32 "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")) (patches - (search-patches "imagemagick-CVE-2020-27829.patch")))))) + (search-patches "imagemagick-ReadDCMImage-fix.patch" + "imagemagick-ReadDCMPixels-fix.patch" + "imagemagick-WriteTHUMBNAILImage-fix.patch" + "imagemagick-CVE-2020-27829.patch")))))) (define-public perl-image-magick (package diff --git a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch new file mode 100644 index 0000000000..42ece43682 --- /dev/null +++ b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch @@ -0,0 +1,26 @@ +From 512668dfd92b20d0d08b91d62b422d8262573281 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Wed, 24 Mar 2021 20:37:15 +0100 +Subject: [PATCH] Throw exception when no exception was raised but status was + false (#3432). + +--- + coders/dcm.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/coders/dcm.c b/coders/dcm.c +index 7a68ed6e8..ed17c9567 100644 +--- a/coders/dcm.c ++++ b/coders/dcm.c +@@ -3989,6 +3989,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) + if (redmap != (int *) NULL) + redmap=(int *) RelinquishMagickMemory(redmap); + image=DestroyImageList(image); ++ if ((status == MagickFalse) && (exception->severity < ErrorException)) ++ ThrowReaderException(CorruptImageError,"CorruptImage"); + return(GetFirstImageInList(images)); + } + if (info.depth != (1UL*MAGICKCORE_QUANTUM_DEPTH)) +-- +2.31.0 + diff --git a/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch new file mode 100644 index 0000000000..a91999186b --- /dev/null +++ b/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch @@ -0,0 +1,35 @@ +From c8f25953ad1dd38a8b2d92738f0f742ad7e0bce7 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Sun, 21 Mar 2021 21:21:15 -0400 +Subject: [PATCH] https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32322 + +--- + coders/dcm.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/coders/dcm.c b/coders/dcm.c +index 29eed9618..7a68ed6e8 100644 +--- a/coders/dcm.c ++++ b/coders/dcm.c +@@ -2984,12 +2984,12 @@ static MagickBooleanType ReadDCMPixels(Image *image,DCMInfo *info, + } + else + { +- SetPixelRed(q,(Quantum) (((ssize_t) pixel.red) | +- (((ssize_t) GetPixelRed(q)) << 8))); +- SetPixelGreen(q,(Quantum) (((ssize_t) pixel.green) | +- (((ssize_t) GetPixelGreen(q)) << 8))); +- SetPixelBlue(q,(Quantum) (((ssize_t) pixel.blue) | +- (((ssize_t) GetPixelBlue(q)) << 8))); ++ SetPixelRed(q,(Quantum) (((size_t) pixel.red) | ++ (((size_t) GetPixelRed(q)) << 8))); ++ SetPixelGreen(q,(Quantum) (((size_t) pixel.green) | ++ (((size_t) GetPixelGreen(q)) << 8))); ++ SetPixelBlue(q,(Quantum) (((size_t) pixel.blue) | ++ (((size_t) GetPixelBlue(q)) << 8))); + } + q++; + } +-- +2.31.0 + diff --git a/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch b/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch new file mode 100644 index 0000000000..f38a45b800 --- /dev/null +++ b/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch @@ -0,0 +1,25 @@ +From 6a5d3575487487f2703383338bd17c8c25068f19 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 25 Mar 2021 08:58:18 -0400 +Subject: [PATCH] eliminate compiler warning + +--- + coders/thumbnail.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/coders/thumbnail.c b/coders/thumbnail.c +index 3833341b0..1e2bfe8c2 100644 +--- a/coders/thumbnail.c ++++ b/coders/thumbnail.c +@@ -199,7 +199,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info, + q++; + } + if ((q > (GetStringInfoDatum(profile)+GetStringInfoLength(profile))) || +- (length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q))) ++ ((ssize_t) length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q))) + ThrowWriterException(CoderError,"ImageDoesNotHaveAThumbnail"); + thumbnail_image=BlobToImage(image_info,q,length,&image->exception); + if (thumbnail_image == (Image *) NULL) +-- +2.31.0 + -- cgit v1.2.3 From ac6e19b08259f2085ae4757bf4efb095fbdd23e9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 21:57:10 -0400 Subject: gnu: soci: Propagate inputs. * gnu/packages/databases.scm (soci)[inputs]: Move to... [propagated-inputs]: ... here. Signed-off-by: Maxim Cournoyer --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 20069f9383..130e94d535 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3782,7 +3782,8 @@ The drivers officially supported by @code{libdbi} are: (base32 "14x2gjblkgpflv75wl144cyjp1sis5rbxnr9r2gj3yw16v2av0bp")))) (build-system cmake-build-system) - (inputs + (propagated-inputs + ;; Headers of soci has include-references to headers of these inputs. `(("firebird" ,firebird) ("postgresql" ,postgresql) ("sqlite" ,sqlite) -- cgit v1.2.3 From 65719505b8c96498f79890f3c52fd6ebc0ada4a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 May 2020 22:01:57 -0400 Subject: gnu: Add build. * gnu/packages/build-tools.scm (build): New variable. Co-authored-by: Raghav Gururajan --- gnu/packages/build-tools.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 3e453cca82..b5cebf0f9b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -547,3 +547,43 @@ besides executing the make build command, updates the JSON compilation database file corresponding to that build, resulting in a command-line interface similar to Bear.") (license license:gpl3))) + +(define-public build + (package + (name "build") + (version "0.3.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "build/" (version-major+minor version) + "/build-" version ".tar.bz2")) + (sha256 + (base32 "1lx5rpnmsbip43zpp0a57sl5rm7pjb0y6i2si6rfglfp4p9d3z76")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "install_prefix=" %output)) + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'build) + (delete 'configure)))) + (home-page "https://www.codesynthesis.com/projects/build/") + (synopsis "Massively-parallel build system implemented on top of GNU make") + (description "Build is a massively-parallel software build system +implemented on top of GNU Make, designed with the following tasks in mind: +@itemize +@item configuration +@item building +@item testing +@item installation +@end itemize +Build has features such as: +@itemize +@item Position-independent makefiles. +@item Non-recursive multi-makefile include-based structure. +@item Leaf makefiles are full-fledged GNU makefiles, not just variable definitions. +@item Complete dependency graph. +@item Inter-project dependency tracking. +@item Extensible language/compiler framework. +@end itemize") + (license license:gpl2+))) -- cgit v1.2.3 From ae479f183418679a916a39ef499e80052d6a0abd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 5 May 2020 22:01:05 -0400 Subject: gnu: Add libcutl. * gnu/packages/cpp.scm (libcutl): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/cpp.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index a0fc373bfd..908ab17c5f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -17,6 +17,8 @@ ;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Milkey Mouse +;;; Copyright © 2021 Raghav Gururajan + ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +39,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -64,7 +67,8 @@ #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) (define-public range-v3 (package @@ -1014,3 +1018,42 @@ Linear Congruential Generator (LCG) with a permutation function to increase output randomness while retaining speed, simplicity, and conciseness.") (home-page "https://www.pcg-random.org") (license (list license:expat license:asl2.0))))) ; dual licensed + +(define-public libcutl + (package + (name "libcutl") + (version "1.10.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.codesynthesis.com/download/libcutl/" + (version-major+minor version) + "/libcutl-" version ".tar.bz2")) + (sha256 + (base32 + "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled sources. + (with-directory-excursion "cutl/details" + (for-each delete-file-recursively + ;; FIXME: Boost_RegEx isn't being detected. + (list + ;;"boost" + "expat"))))))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--disable-static" + ;;"--with-external-boost" + "--with-external-expat"))) + (inputs + `(;;("boost ,boost) + ("expat" ,expat))) + (home-page "https://www.codesynthesis.com/projects/libcutl/") + (synopsis "C++ utility library with generic and independent components") + (description "libcutl is a C++ utility library. It contains a collection +of generic and independent components such as meta-programming tests, smart +pointers, containers, compiler building blocks, etc.") + (license (list license:expat ;everything except... + license:boost1.0)))) ;...the files under cutl/details/boost -- cgit v1.2.3 From 111004cc581e93197f63001237b64323e72b1db6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 27 Mar 2021 01:53:48 -0400 Subject: gnu: Add libxsd-frontend. * gnu/packages/cpp.scm (libxsd-frontend): New variable. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/cpp.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 908ab17c5f..6e6328a045 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) + #:use-module (gnu packages build-tools) #:use-module (gnu packages c) #:use-module (gnu packages check) #:use-module (gnu packages code) @@ -1057,3 +1058,50 @@ of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks, etc.") (license (list license:expat ;everything except... license:boost1.0)))) ;...the files under cutl/details/boost + +(define-public libxsd-frontend + (package + (name "libxsd-frontend") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "libxsd-frontend/" (version-major+minor version) + "/libxsd-frontend-" version ".tar.bz2")) + (sha256 + (base32 "1nmzchsvwvn66jpmcx18anzyl1a3l309x1ld4zllrg37ijc31fim")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:imported-modules ((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules (((guix build copy-build-system) #:prefix copy:) + (guix build gnu-build-system) + (guix build utils)) + #:make-flags (list (string-append "--include-dir=" + (assoc-ref %build-inputs "build") + "/include/")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("xsd-frontend" "include/xsd-frontend" + #:include-regexp ("\\.?xx$")) + ("xsd-frontend" "lib" + #:include-regexp ("\\.so$"))) + args)))))) + (native-inputs + `(("build" ,build))) + (inputs + `(("libcutl" ,libcutl) + ("libxerces-c" ,xerces-c))) + (synopsis "XSD Front-end") + (description "@code{libxsd-frontend} is a compiler frontend for the W3C +XML Schema definition language. It includes a parser, semantic graph types +and a traversal mechanism.") + (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/") + (license license:gpl2+))) -- cgit v1.2.3 From f649a0a557bdc4afc39e033597f5b67cdabd3743 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 27 Mar 2021 21:21:45 -0400 Subject: gnu: Add cli. * gnu/packages/cpp.scm (cli): New variable. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/cpp.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 6e6328a045..22d1341b8d 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1105,3 +1105,51 @@ XML Schema definition language. It includes a parser, semantic graph types and a traversal mechanism.") (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/") (license license:gpl2+))) + +(define-public cli + (package + (name "cli") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "cli/" (version-major+minor version) + "/cli-" version ".tar.bz2")) + (sha256 + (base32 "0bg0nsai2q4h3mldpnj0jz4iy4svs0bcfvmq0v0c9cdyknny606g")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags (list (string-append "--include-dir=" + (assoc-ref %build-inputs "build") + "/include") + (string-append "install_prefix=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* (find-files "." "\\.make$") + (("build-0\\.3") + (string-append (assoc-ref %build-inputs "build") + "/include/build-0.3"))) + ;; Add the namespace prefix, to avoid errors such as "error: + ;; ‘iterate_and_dispatch’ was not declared in this scope". + (substitute* (find-files "." "\\.?xx$") + (("add \\(typeid \\(type\\), \\*this\\);" all) + (string-append "traverser_map::" all)) + (("iterate_and_dispatch \\(s\\.names_begin.*;" all) + (string-append "edge_dispatcher::" all))))) + (delete 'configure)))) + (native-inputs + `(("build" ,build))) + (inputs + `(("libcutl" ,libcutl))) + (synopsis "C++ Command Line Interface (CLI) definition language") + (description "@code{cli} is a domain-specific language (DSL) for defining +command line interfaces of C++ programs. It allows you to describe the +options that your program supports, their types, default values, and +documentation.") + (home-page "https://codesynthesis.com/projects/cli/") + (license license:expat))) -- cgit v1.2.3 From 510e24f973a918391d8122fd6ad515c0567bf23e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 27 Mar 2021 22:46:39 -0400 Subject: gnu: Add xsd. * gnu/packages/cpp.scm (xsd): New variable. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/cpp.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 22d1341b8d..2a00d3838a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages logging) #:use-module (gnu packages maths) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) @@ -1153,3 +1154,60 @@ options that your program supports, their types, default values, and documentation.") (home-page "https://codesynthesis.com/projects/cli/") (license license:expat))) + +(define-public xsd + (package + (name "xsd") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "xsd/" (version-major+minor version) + "/xsd-" version ".tar.bz2")) + (sha256 + (base32 "1hi9ppxd34np8ydv1h0vgc2qpdmgcd1cdzgk30aidv670xjg91fx")))) + (build-system gnu-build-system) + (outputs '("out" "doc")) ;3.8 MiB of doc and examples + (arguments + `(#:test-target "test" + #:make-flags (list (string-append "--include-dir=" + (assoc-ref %build-inputs "build") + "/include/") + (string-append "install_prefix=" + (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file (string-append out "/share/doc/xsd") + (string-append doc "/share/doc/xsd-" + ,version))))) + (delete 'configure)))) + (native-inputs + `(("build" ,build) + ("cli" ,cli))) + (inputs + `(("libcutl" ,libcutl) + ("libnsl" ,libnsl) + ("libxsd-frontend" ,libxsd-frontend))) + (propagated-inputs + ;; The code XSD generates requires the following library at run time; + ;; propagate it for convenience. + `(("xerces-c" ,xerces-c))) + (synopsis "XML Data Binding for C++") + (description "CodeSynthesis XSD (also known as libxsd or xsdcxx) is an XML +Schema to C++ data binding compiler. Provided with an XML instance +specification (XML Schema), it generates C++ classes that represent the given +vocabulary as well as XML parsing and serialization code. The data stored in +XML can then be accessed using types and functions that semantically +correspond to an application domain rather than dealing with the intricacies +of reading and writing XML.") + (home-page "https://codesynthesis.com/projects/xsd/") + ;; Exceptions are made to allow using the generated source files as well + ;; as the libxsd library in free software projects whose license is + ;; incompatible with the GPL v2. Refer to the file named FLOSSE for the + ;; details. + (license license:gpl2+))) -- cgit v1.2.3 From 43469e193ba5c2d06c5f3e10d5550ce7ec201729 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 12:51:08 +0200 Subject: gnu: autofs: Update to 5.1.7. * gnu/packages/file-systems.scm (autofs): Update to 5.1.7. [arguments]: Add a new 'fix-rpath phase. --- gnu/packages/file-systems.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 198653c639..ae10796fab 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -80,7 +80,7 @@ (define-public autofs (package (name "autofs") - (version "5.1.6") + (version "5.1.7") (source (origin (method url-fetch) @@ -88,7 +88,7 @@ "v" (version-major version) "/" "autofs-" version ".tar.xz")) (sha256 - (base32 "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx")))) + (base32 "1myfz6a3wj2c4j9h5g44zj796fdi82jhp1s92w2hg6xp2632csx3")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -112,6 +112,12 @@ (("^searchpath=\".*\"") "searchpath=\"$PATH\"")) #t)) + (add-before 'configure 'fix-rpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile.rules" + (("^AUTOFS_LIB_LINK.*=" match) + (string-append match " -Wl,-rpath=" out "/lib")))))) (add-before 'install 'omit-obsolete-lookup_nis.so-link ;; Building lookup_yp.so depends on $(YPCLNT) but this doesn't, ;; leading to a make error. Since it's broken, comment it out. -- cgit v1.2.3 From 1f6e870ea56d2d43a135973e6a8b4513ad9fb469 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 13:16:16 +0200 Subject: gnu: gramps: Update to 5.1.3. * gnu/packages/genealogy.scm (gramps): Update to 5.1.3. --- gnu/packages/genealogy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm index dde0fddc25..2c3781d361 100644 --- a/gnu/packages/genealogy.scm +++ b/gnu/packages/genealogy.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Guillaume Le Vaillant -;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +39,7 @@ (define-public gramps (package (name "gramps") - (version "5.1.2") + (version "5.1.3") (source (origin (method git-fetch) @@ -48,7 +48,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "175iwvdp6c1a8rskl2wpk4yvzl437j7hm23v481974a85qy43iv8")))) + (base32 "109dwkswz2h2328xkqk2zj736d117s9pp7rz5cc1qg2vxn1lpm93")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From b30407b82f6ab6dab1e08cfd4a8e9eb0a8831eef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 14:28:41 +0200 Subject: gnu: gnutls: Fix typos in description. * gnu/packages/tls.scm (gnutls)[description]: Fix typos. Reported by genr8 on #guix. --- gnu/packages/tls.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 2a8c69a68c..423612f4b6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -251,7 +251,7 @@ living in the same process.") (description "GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols. It is provided in the form of a C library to support the -protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other +protocols, as well as to parse and write X.509, PKCS #12, OpenPGP and other required structures.") (license license:lgpl2.1+) (properties '((ftp-server . "ftp.gnutls.org") -- cgit v1.2.3 From da29d63a10409e7886bb825a6e03ea2af787009a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 18:28:46 +0200 Subject: gnu: spdlog: Update to 1.8.5. * gnu/packages/logging.scm (spdlog): Update to 1.8.5. --- gnu/packages/logging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 09e9d59ed5..b879fecebc 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -190,7 +190,7 @@ output in multiple windows in a terminal.") (define-public spdlog (package (name "spdlog") - (version "1.8.3") + (version "1.8.5") (source (origin (method git-fetch) @@ -199,7 +199,7 @@ output in multiple windows in a terminal.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qcabdc3yrm30vapn7g7lf3bwjissl15y66mpmx2w0gjjc6aqdd1")))) + (base32 "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit v1.2.3 From 81e85d6299fa71eb4366b799b1858b3e0ec3483b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 18:45:53 +0200 Subject: gnu: babl: Update to 0.1.86. * gnu/packages/gimp.scm (babl): Update to 0.1.86. [arguments]: Build with meson@0.55. --- gnu/packages/gimp.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 5d005e0378..b864c88e2f 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) @@ -166,7 +167,7 @@ of a larger interface.") (define-public babl (package (name "babl") - (version "0.1.78") + (version "0.1.86") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -180,10 +181,11 @@ of a larger interface.") "/babl-" version ".tar.xz"))) (sha256 (base32 - "0fjjfb0pbgimlqi7rk8cqz8pq595b7gw8nrpkxfmixdz6cv4km8p")))) + "1w68h81kqkqnziixrx21qs0gfv2z79651h19sxn226xdb58mjgqb")))) (build-system meson-build-system) (arguments - `(#:configure-flags + `(#:meson ,meson-0.55 + #:configure-flags (list "-Denable-gir=false"))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b5116db5c05f662f775096ef4c105fa7aea5c8b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 18:46:16 +0200 Subject: gnu: gegl: Update to 0.4.28. * gnu/packages/gimp.scm (gegl): Update to 0.4.28. [arguments]: Build with meson@0.55. --- gnu/packages/gimp.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index b864c88e2f..4bdc4ee42e 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -207,7 +207,7 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.26") + (version "0.4.28") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -221,10 +221,11 @@ provided, as well as a framework to add new color models and data types.") "/gegl-" version ".tar.xz"))) (sha256 (base32 - "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg")))) + "003ri7yv7lm2fi86ama3vlkwnz656yyib4r36hxwlk6mfy2hs48x")))) (build-system meson-build-system) (arguments - `(#:configure-flags + `(#:meson ,meson-0.55 + #:configure-flags (list "-Dintrospection=false") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 58452d08ff3e0044e9a32e6d5b3663cf185d8b33 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Sun, 28 Mar 2021 10:51:16 -0700 Subject: gnu: cross-base: Relax check for powerpc64le. * gnu/packages/cross-base.scm (cross-gcc-arguments): When conditionally adding "--with-long-double-128", check for "powerpc64le-" prefix instead of matching full target. Signed-off-by: Chris Marusich --- gnu/packages/cross-base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index bea2d69876..180594509b 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -153,7 +153,7 @@ base compiler and using LIBC (which may be either a libc package or #f.)" "--disable-decimal-float" ;would need libc "--disable-libcilkrts" - ,@(if (equal? "powerpc64le-linux-gnu" target) + ,@(if (string-prefix? "powerpc64le-" target) ;; On POWER9 (little endian) glibc needs ;; the 128-bit long double type. '("--with-long-double-128") -- cgit v1.2.3 From 8bd2c50bee40f68b582a4d26bc918baf60e9c36c Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Sun, 21 Mar 2021 10:33:52 +0800 Subject: gnu: hnsd: Update to 1.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dns.scm (hnsd): Update to 1.0.0. Signed-off-by: Ludovic Courtès --- gnu/packages/dns.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b6f86711a3..37f8c3a6be 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Simon South +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1111,20 +1112,17 @@ attempts the update when it has changed.") (license license:gpl2+))) (define-public hnsd - ;; There have been no releases yet, hence this commit. - (let ((revision "0") - (commit "895d89c25d316d18df9d374fe78aae3902bc89fb")) (package (name "hnsd") - (version (git-version "0.0" revision commit)) + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/handshake-org/hnsd") - (commit commit))) + (commit (string-append "v" version)))) (sha256 (base32 - "0704y73sddn24jga9csw4gxyfb3pnrfnk0vdcph84n1h38490l16")) + "1kdgff8rf8gmvwz2p758ilbjxpvz4xm6z41pa5353asg6xb853bb")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet @@ -1161,7 +1159,7 @@ attempts the update when it has changed.") (description "@command{hnsd} is a @dfn{host name resolver} for the Handshake Naming System (HNS) peer-to-peer network.") - (license license:expat)))) + (license license:expat))) (define-public libmicrodns (package -- cgit v1.2.3 From 5d8c2c00d60196c46a32b68c618ccbe2b3aa48f4 Mon Sep 17 00:00:00 2001 From: Simon South Date: Mon, 1 Mar 2021 10:13:29 -0500 Subject: tests: Add Transmission Daemon system test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/tests/file-sharing.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/tests/file-sharing.scm | 271 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 272 insertions(+) create mode 100644 gnu/tests/file-sharing.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 52a021c2a3..d131dc0388 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -692,6 +692,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/desktop.scm \ %D%/tests/dict.scm \ %D%/tests/docker.scm \ + %D%/tests/file-sharing.scm \ %D%/tests/ganeti.scm \ %D%/tests/guix.scm \ %D%/tests/monitoring.scm \ diff --git a/gnu/tests/file-sharing.scm b/gnu/tests/file-sharing.scm new file mode 100644 index 0000000000..9a8ee6a593 --- /dev/null +++ b/gnu/tests/file-sharing.scm @@ -0,0 +1,271 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Simon South +;;; +;;; 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 . + +;;; +;;; The Transmission Daemon service. +;;; + +(define-module (gnu tests file-sharing) + #:use-module (gnu packages bittorrent) + #:use-module (gnu services) + #:use-module (gnu services file-sharing) + #:use-module (gnu services networking) + #:use-module (gnu system vm) + #:use-module (gnu tests) + #:use-module (guix gexp) + #:export (%test-transmission-daemon)) + +(define %transmission-daemon-user "transmission") +(define %transmission-daemon-group "transmission") + +(define %transmission-daemon-config-dir "/var/lib/transmission-daemon") +(define %transmission-daemon-watch-dir + (string-append %transmission-daemon-config-dir "/watch")) +(define %transmission-daemon-incomplete-dir + (string-append %transmission-daemon-config-dir "/incomplete")) + +(define %transmission-daemon-settings-file + (string-append %transmission-daemon-config-dir "/settings.json")) + +(define %transmission-daemon-peer-port 51000) ; default is 51413 + +(define %transmission-daemon-rpc-port 9999) ; default is 9091 +(define %transmission-daemon-rpc-username "test-username") +(define %transmission-daemon-rpc-password "test-password") + +(define %transmission-daemon-test-configuration + (transmission-daemon-configuration + (incomplete-dir-enabled? #t) + (incomplete-dir %transmission-daemon-incomplete-dir) + + (watch-dir-enabled? #t) + (watch-dir %transmission-daemon-watch-dir) + + (peer-port-random-on-start? #f) + (peer-port %transmission-daemon-peer-port) + + (rpc-enabled? #t) + (rpc-port %transmission-daemon-rpc-port) + (rpc-whitelist-enabled? #f) + (rpc-authentication-required? #t) + (rpc-username %transmission-daemon-rpc-username) + (rpc-password (transmission-password-hash %transmission-daemon-rpc-password + "yEK0q3.X")))) + +(define (run-transmission-daemon-test) + (define os + (marionette-operating-system + (simple-operating-system + (service dhcp-client-service-type) + (service transmission-daemon-service-type + %transmission-daemon-test-configuration)) + #:imported-modules '((gnu services herd) + (json parser)) + #:requirements '(transmission-daemon))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-64)) + + (define marionette + (make-marionette + (list #$(virtual-machine + (operating-system os) + (port-forwardings + `((9091 . ,%transmission-daemon-rpc-port))))))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "transmission-daemon") + + ;; Make sure the "transmission" user and group have been created. + (test-assert "\"transmission\" user exists" + (marionette-eval + '(begin + (getpwnam #$%transmission-daemon-user) + #t) + marionette)) + (test-assert "\"transmission\" group exists" + (marionette-eval + '(begin + (getgrnam #$%transmission-daemon-group) + #t) + marionette)) + + ;; Make sure Transmission Daemon's configuration directory has been + ;; created with the correct ownership and permissions. + (test-assert "configuration directory exists" + (marionette-eval + '(eq? (stat:type (stat #$%transmission-daemon-config-dir)) + 'directory) + marionette)) + (test-assert "configuration directory has correct ownership" + (marionette-eval + '(let ((config-dir (stat #$%transmission-daemon-config-dir)) + (transmission-user (getpwnam #$%transmission-daemon-user))) + (and (eqv? (stat:uid config-dir) + (passwd:uid transmission-user)) + (eqv? (stat:gid config-dir) + (passwd:gid transmission-user)))) + marionette)) + (test-assert "configuration directory has expected permissions" + (marionette-eval + '(eqv? (stat:perms (stat #$%transmission-daemon-config-dir)) + #o750) + marionette)) + + ;; Make sure the incomplete-downloads and watch directories have been + ;; created with the correct ownership and permissions. + (test-assert "incomplete-downloads directory exists" + (marionette-eval + '(eq? (stat:type (stat #$%transmission-daemon-incomplete-dir)) + 'directory) + marionette)) + (test-assert "incomplete-downloads directory has correct ownership" + (marionette-eval + '(let ((incomplete-dir + (stat #$%transmission-daemon-incomplete-dir)) + (transmission-user + (getpwnam #$%transmission-daemon-user))) + (and (eqv? (stat:uid incomplete-dir) + (passwd:uid transmission-user)) + (eqv? (stat:gid incomplete-dir) + (passwd:gid transmission-user)))) + marionette)) + (test-assert + "incomplete-downloads directory has expected permissions" + (marionette-eval + '(eqv? (stat:perms (stat #$%transmission-daemon-incomplete-dir)) + #o750) + marionette)) + + (test-assert "watch directory exists" + (marionette-eval + '(eq? (stat:type (stat #$%transmission-daemon-watch-dir)) + 'directory) + marionette)) + (test-assert "watch directory has correct ownership" + (marionette-eval + '(let ((watch-dir (stat #$%transmission-daemon-watch-dir)) + (transmission-user (getpwnam #$%transmission-daemon-user))) + (and (eqv? (stat:uid watch-dir) + (passwd:uid transmission-user)) + (eqv? (stat:gid watch-dir) + (passwd:gid transmission-user)))) + marionette)) + (test-assert "watch directory has expected permissions" + (marionette-eval + '(eqv? (stat:perms (stat #$%transmission-daemon-watch-dir)) + #o770) + marionette)) + + ;; Make sure the settings file has been created and appears valid. + (test-assert "settings file exists" + (marionette-eval + '(file-exists? #$%transmission-daemon-settings-file) + marionette)) + (test-assert "settings file is valid JSON" + (marionette-eval + '(begin + (use-modules (json parser)) + (with-input-from-file #$%transmission-daemon-settings-file + (lambda () + (json->scm))) + #t) + marionette)) + (test-assert "settings file contains a non-empty JSON object" + (marionette-eval + '(begin + (use-modules (json parser) + (srfi srfi-1)) + (let ((settings (with-input-from-file + #$%transmission-daemon-settings-file + (lambda () + (json->scm))))) + (and (list? settings) + (not (null? settings)) + (every pair? settings)))) + marionette)) + + ;; Make sure Transmission Daemon is running. + (test-assert "transmission-daemon is running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (live-service-running + (find (lambda (live-service) + (memq 'transmission-daemon + (live-service-provision live-service))) + (current-services)))) + marionette)) + + ;; Make sure the daemon is listening for peer connections. + (test-assert "transmission-daemon is listening for peers" + (wait-for-tcp-port #$%transmission-daemon-peer-port marionette)) + + ;; Make sure the daemon is listening for RPC-client connections. + (test-assert "transmission-daemon is listening for RPC clients" + (wait-for-tcp-port #$%transmission-daemon-rpc-port marionette)) + + ;; Make sure the RPC-authentication settings are honored. + (test-assert "transmission-daemon requires RPC authentication" + (let ((transmission-remote + (string-append #+transmission "/bin/transmission-remote"))) + (with-error-to-port (%make-void-port "w") + (lambda () + (not (zero? (system* transmission-remote + "--session-info"))))))) + (test-assert "transmission-daemon rejects incorrect RPC credentials" + (let ((transmission-remote + (string-append #+transmission "/bin/transmission-remote")) + (wrong-auth-string + (string-append #$%transmission-daemon-rpc-username + ":" + "wrong-" + #$%transmission-daemon-rpc-password))) + (with-error-to-port (%make-void-port "w") + (lambda () + (not (zero? (system* transmission-remote + "--auth" wrong-auth-string + "--session-info"))))))) + (test-assert "transmission-daemon accepts correct RPC credentials" + (let ((transmission-remote + (string-append #+transmission "/bin/transmission-remote")) + (auth-string + (string-append #$%transmission-daemon-rpc-username + ":" + #$%transmission-daemon-rpc-password))) + (with-output-to-port (%make-void-port "w") + (lambda () + (zero? (system* transmission-remote + "--auth" auth-string + "--session-info")))))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "transmission-daemon-test" test)) + +(define %test-transmission-daemon + (system-test + (name "transmission-daemon") + (description "Test a running Transmission Daemon service.") + (value (run-transmission-daemon-test)))) -- cgit v1.2.3 From f2d9174b7c8ddbdb2b94bf4e76fb7f34849db3c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:19:18 +0200 Subject: gnu: mpop: Update to 1.4.13. * gnu/packages/mail.scm (mpop): Update to 1.4.13. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a1168872ba..2eb03f60f2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2718,14 +2718,14 @@ easily (one at a time).") (define-public mpop (package (name "mpop") - (version "1.4.12") + (version "1.4.13") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "02j8qfd44dfyq1sq7r9znj9y6wam39ncch1sc8chcdlw5nsmaqsz")))) + (base32 "1hbx69d6ivbvjajrcp54fdb3g1ms4ydj0ybf3bfhlravqrk88jdk")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls))) -- cgit v1.2.3 From fd5139199321302b93a4c9ce9592829ce4c8eb6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:19:27 +0200 Subject: gnu: neomutt: Update to 20210205. * gnu/packages/mail.scm (neomutt): Update to 20210205. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2eb03f60f2..54ff2fe6fc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -528,7 +528,7 @@ operating systems.") (define-public neomutt (package (name "neomutt") - (version "20201127") + (version "20210205") (source (origin (method git-fetch) @@ -537,7 +537,7 @@ operating systems.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1yhpz591jhcjpwllgppwf7vl7z2rnaqfphsvqd1sihd9k4lwch06")))) + (base32 "15kr9nvb4j8lx5rl2yapv231rbp4sbn709vv82pfhx5717x3yf00")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From 86a119e3e36d907cf65d5e2ee4f0fa62c6f2ee11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:35:44 +0200 Subject: gnu: links: Update to 2.22. * gnu/packages/web-browsers.scm (links): Update to 2.22. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index e5e726ad19..24bca093a6 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -173,14 +173,14 @@ older or slower computers and embedded systems.") (define-public links (package (name "links") - (version "2.21") + (version "2.22") (source (origin (method url-fetch) (uri (string-append "http://links.twibright.com/download/" "links-" version ".tar.bz2")) (sha256 (base32 - "0qqdcghsdqm7l6kyi0k752ws3ak5crw85pqkcb11wy67j62yspi8")))) + "0k88qbmq0mf6zmk2v158c0rxvqbi7ysn58xyf4qqw7kz79mrhr03")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From ceff850369738888a0b7ce96d71614a57c769e71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:35:57 +0200 Subject: gnu: skopeo: Update to 1.2.2. * gnu/packages/virtualization.scm (skopeo): Update to 1.2.2. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 96347adf7c..c6929b9f1a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1670,7 +1670,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (define-public skopeo (package (name "skopeo") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -1679,7 +1679,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (file-name (git-file-name name version)) (sha256 (base32 - "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg")))) + "03sznybn3rqjyplc6w4b7mfa6gas8db15p5vnmfm1xqw72ldylgc")))) (build-system go-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From ed4899968a514ed43732fbd72a15acdbb90f68a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:37:26 +0200 Subject: gnu: bcachefs-tools: Update to 0.1-4.bb6eccc. * gnu/packages/file-systems.scm (bcachefs-tools): Update to 0.1-4.bb6eccc. --- gnu/packages/file-systems.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index ae10796fab..9877e5c433 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -340,8 +340,8 @@ from a mounted file system.") (license license:gpl2+))) (define-public bcachefs-tools - (let ((commit "612f6b9ab73c7f46e0254355b707d494a8ad9270") - (revision "3")) + (let ((commit "bb6eccc2ecd4728871bfc70462d3a4a20daa9d68") + (revision "4")) (package (name "bcachefs-tools") (version (git-version "0.1" revision commit)) @@ -353,7 +353,7 @@ from a mounted file system.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1a62wkv1i6pg5k1cjw7fzn933cbz8cp8y40cdpfd8rxjx0wg2szb")))) + (base32 "0ziqmcxbrak6bjck6s46hqrqx44zc97yaj0kbk3amsxf18rsfs0n")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From d9429a1a804cf064b7e855f38eb6039cb090b6b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:37:43 +0200 Subject: gnu: wireguard-tools: Update to 1.0.20210315. * gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20210315. --- gnu/packages/vpn.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 2ea04acaa2..4eccd2c64f 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -683,7 +683,7 @@ WireGuard was added to Linux 5.6.") (define-public wireguard-tools (package (name "wireguard-tools") - (version "1.0.20210223") + (version "1.0.20210315") (source (origin (method git-fetch) @@ -692,7 +692,7 @@ WireGuard was added to Linux 5.6.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pz7rir7bzj7rv1lqy45pqnr6jxsb4war31f9492757fql7kcrf4")))) + (base32 "1an5gm2dv111n3fylbrnyynxmi2d3iwf2b46zq08hc54kzazxcml")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 55a754ce3a6384e8183b34fe93da2ef343297247 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 00:17:40 +0300 Subject: gnu: vim-asyncrun: Update to 2.8.5. * gnu/packages/vim.scm (vim-asyncrun): Update to 2.8.5. --- gnu/packages/vim.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 9a3547bbc9..0a73d9e402 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke @@ -842,7 +842,7 @@ through its msgpack-rpc API.") (define-public vim-asyncrun (package (name "vim-asyncrun") - (version "2.7.5") + (version "2.8.5") (source (origin (method git-fetch) (uri (git-reference @@ -851,7 +851,7 @@ through its msgpack-rpc API.") (file-name (git-file-name name version)) (sha256 (base32 - "02fiqf4rcrxbcgvj02mpd78wkxsrnbi54aciwh9fv5mnz5ka249m")))) + "0mxsmjv497h6w8dxw0zvqginlx0yvrvrx4z3jhq2x3y2dfvpcm41")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From 6ebc3c41f4411110e998d0e4ba810f5e7b669fd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 00:23:53 +0300 Subject: gnu: urlscan: Update to 0.9.6. * gnu/packages/mail.scm (urlscan): Update to 0.9.6. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 54ff2fe6fc..3e0ce99457 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari @@ -3825,13 +3825,13 @@ servers. The 4rev1 and 4 versions of IMAP are supported.") (define-public urlscan (package (name "urlscan") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri (pypi-uri "urlscan" version)) (sha256 - (base32 "07vcwirap0p4dkqrqblfn1q017slgd8m6qyijvbi3gxnr09pbyx2")))) + (base32 "09lxi7dhn49fpb3ij4cgrhj3qqqqs9rcxbjb7p9smw5wblrqpzga")))) (build-system python-build-system) (propagated-inputs `(("python-urwid" ,python-urwid))) -- cgit v1.2.3 From bdc72870af04a93b084f7c4d18a7e5c3937f14d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 00:27:32 +0300 Subject: gnu: qrencode: Update to 4.1.1. * gnu/packages/aidc.scm (qrencode): Update to 4.1.1. --- gnu/packages/aidc.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 6628a8ead3..8bbdacaf6f 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darringon -;;; Copyright © 2016, 2020 Efraim Flashner +;;; Copyright © 2016, 2020, 2021 Efraim Flashner ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guillaume Le Vaillant @@ -108,15 +108,14 @@ formats.") (define-public qrencode (package (name "qrencode") - (version "4.0.2") + (version "4.1.1") (source (origin (method url-fetch) - (uri (string-append - "https://fukuchi.org/works/qrencode/qrencode-" version - ".tar.bz2")) + (uri (string-append "https://fukuchi.org/works/qrencode/" + "qrencode-" version ".tar.bz2")) (sha256 (base32 - "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9")))) + "08v9d8jn26bva2a8x4hghq3mgl8zcid393iqkidwyhc05xrxjmg4")))) (build-system gnu-build-system) (inputs `(("libpng" ,libpng))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 414fc58cef4eb9c2cc18a381629d17c5adf76210 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 00:42:19 +0300 Subject: gnu: qrencode: Enable tests. * gnu/packages/aidc.scm (qrencode)[arguments]: Add configure-flag to build tests. Use custom 'check phase to run tests. --- gnu/packages/aidc.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 8bbdacaf6f..d1b63de736 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -117,6 +117,16 @@ formats.") (base32 "08v9d8jn26bva2a8x4hghq3mgl8zcid393iqkidwyhc05xrxjmg4")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-tests") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "./test_basic.sh"))) + #t))))) (inputs `(("libpng" ,libpng))) (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "Encode data into a QR Code symbol") -- cgit v1.2.3 From bdd0d5bfbd494ad14393e5b558abf959dada56e3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 14:00:48 -0500 Subject: gnu: bctoolbox: Update to 4.4.34 and enable libdecaf, tests. * gnu/packages/linphone.scm (bctoolbox)[version]: Update to 4.4.34. [source]: Switch to git repository. [outputs]: Add a debug output. [arguments]: Remove tests? argument, enabling tests. [phases]{patch-cmake, skip-problematic-tests} {fix-installed-resource-directory-detection}: New phases. {check}: Override phase. [inputs]: Add libdecaf. [license]: Update to GPLv3+. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 61 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 078185046f..cfe05eaa7a 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; -;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Raghav Gururajan +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -25,6 +25,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -127,28 +128,64 @@ writing, administering, and running unit tests in C.") (define-public bctoolbox (package (name "bctoolbox") - (version "0.6.0") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/bctoolbox.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6")))) + (base32 "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25")))) (build-system cmake-build-system) + (outputs '("out" "debug")) (arguments - '(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=OFF"))) ; Not required + `(#:configure-flags '("-DENABLE_STATIC=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix decaf dependency (see: + ;; https://gitlab.linphone.org/BC/public/bctoolbox/-/issues/3). + (let* ((decaf (assoc-ref inputs "decaf"))) + (substitute* (find-files "." "CMakeLists.txt") + (("find_package\\(Decaf CONFIG\\)") + "set(DECAF_FOUND 1)") + (("\\$\\{DECAF_INCLUDE_DIRS\\}") + (string-append decaf "/include/decaf")) + (("\\$\\{DECAF_TARGETNAME\\}") + "decaf"))))) + (add-after 'unpack 'skip-problematic-tests + (lambda _ + ;; The following test relies on networking; disable it. + (substitute* "tester/port.c" + (("[ \t]*TEST_NO_TAG.*bctbx_addrinfo_sort_test\\)") + "")))) + (add-after 'unpack 'fix-installed-resource-directory-detection + (lambda _ + ;; There's some broken logic in tester.c that checks if CWD, or + ;; if its parent exist, and if so, sets the prefix where the test + ;; resources are looked up to; disable it (see: + ;; https://gitlab.linphone.org/BC/public/bctoolbox/-/issues/4). + (substitute* "src/tester.c" + (("if \\(file_exists\\(\".\"\\)\\)") + "if (NULL)") + (("if \\(file_exists\\(\"..\"\\)\\)") + "if (NULL)")))) + (replace 'check + (lambda _ + (with-directory-excursion "tester" + (invoke "./bctoolbox_tester"))))))) (inputs `(("bcunit" ,bcunit) + ("decaf" ,libdecaf) ("mbedtls" ,mbedtls-apache))) (synopsis "Belledonne Communications Tool Box") (description "BcToolBox is an utilities library used by Belledonne Communications software like belle-sip, mediastreamer2 and linphone.") (home-page "https://gitlab.linphone.org/BC/public/bctoolbox") - (license license:gpl2+))) + (license license:gpl3+))) (define-public belr (package -- cgit v1.2.3 From c52d0f9c42596404180f1d3f06c646b25b3ac541 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 14 Mar 2021 23:40:02 -0400 Subject: gnu: belr: Update to 4.4.34 and enable tests. * gnu/packages/linphone.scm (belr)[source]: Switch to git repository. [version]: Update to 4.4.34. [arguments]: Remove the tests? argument to enable tests. [phases]{move-tester, check}: New phases. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index cfe05eaa7a..3e46d23838 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -190,20 +190,45 @@ Communications software like belle-sip, mediastreamer2 and linphone.") (define-public belr (package (name "belr") - (version "0.1.3") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/belr.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1")))) + (base32 "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h")))) (build-system cmake-build-system) + (outputs '("out" "debug" "tester")) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=OFF"))) ; Not required + `(#:configure-flags '("-DENABLE_STATIC=OFF") + #:phases + (modify-phases %standard-phases + (delete 'check) ;moved after the install phase + (add-after 'install 'check + (lambda* (#:key outputs #:allow-other-keys) + (let* ((tester (assoc-ref outputs "tester")) + (belr_tester (string-append tester "/bin/belr_tester")) + (tester-share (string-append tester "/share/belr_tester"))) + (invoke belr_tester)))) + (add-after 'install 'move-tester + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (tester (assoc-ref outputs "tester"))) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file + (string-append out "/bin/belr_tester") + (string-append tester "/bin/belr_tester")) + (rename-file + (string-append out "/share/belr-tester") + ;; The detect_res_prefix procedure in bctoolbox's tester.c + ;; resolves the resource path based on the executable path and + ;; name, so have it match. + (string-append tester "/share/belr_tester")))))))) (inputs `(("bctoolbox" ,bctoolbox))) (synopsis "Belledonne Communications Language Recognition Library") -- cgit v1.2.3 From 7a8e17343d3b8fbf394e8ef091852ea54d9fc741 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 16:24:20 -0400 Subject: gnu: belcard: Update to 4.4.34 and enable tests. * gnu/packages/linphone.scm (belcard)[source]: Switch to git repository. [version]: Update to 4.4.34. [outputs]: Add the tester and debug outputs. [arguments]: Enable tests. [phases]{patch-vcard-grammar-location, install-tester, check}: New phases. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 49 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 3e46d23838..d1648418e5 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -242,20 +242,51 @@ IETF.") (define-public belcard (package (name "belcard") - (version "1.0.2") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/belcard.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k")))) + (base32 "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m")))) (build-system cmake-build-system) + (outputs '("out" "debug" "tester")) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=OFF"))) ; Not required + `(#:tests? #t + #:configure-flags '("-DENABLE_STATIC=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-vcard-grammar-location + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (vcard-grammar + (string-append out "/share/belr/grammars/vcard_grammar"))) + (substitute* "include/belcard/vcard_grammar.hpp" + (("define VCARD_GRAMMAR \"vcard_grammar\"") + (format #f "define VCARD_GRAMMAR ~s" vcard-grammar)))))) + (add-after 'install 'install-tester + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (tester (assoc-ref outputs "tester")) + (test-name (string-append ,name "_tester"))) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file (string-append out "/bin/" test-name) + (string-append tester "/bin/" test-name)) + (rename-file (string-append out "/share/" test-name) + (string-append tester "/share/" test-name))))) + (delete 'check) + (add-after 'install-tester 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (let* ((tester (assoc-ref outputs "tester")) + (belcard_tester (string-append tester + "/bin/belcard_tester"))) + (invoke belcard_tester)))))))) (inputs `(("bctoolbox" ,bctoolbox) ("belr" ,belr))) -- cgit v1.2.3 From ebc75b6ae8205c9a23826453db2e6ac4ce37ff0d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:22:31 -0400 Subject: gnu: bzrtp: Update to 4.4.34 and enable tests. * gnu/packages/linphone.scm (bzrtp)[source]: Switch to git repository. [version]: Update to 4.4.34. [configure-flags]: Enable tests. [license]: Upgrade to GPLv3+. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index d1648418e5..60221ffad8 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -425,20 +425,22 @@ implements the RFC 3550 standard.") (define-public bzrtp (package (name "bzrtp") - (version "1.0.6") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/bzrtp") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z")))) + (base32 "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required + `(#:configure-flags + (list + "-DENABLE_STATIC=NO" + "-DENABLE_TESTS=YES"))) (inputs `(("bctoolbox" ,bctoolbox) ("sqlite3" ,sqlite) @@ -448,7 +450,7 @@ implements the RFC 3550 standard.") written in C. It is fully portable and can be executed on many platforms including both ARM and x86.") (home-page "https://gitlab.linphone.org/BC/public/bzrtp") - (license license:gpl2+))) + (license license:gpl3+))) (define-public belle-sip (package -- cgit v1.2.3 From 2dda883dee6efffc213181f9f8462500bd1fb45a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:09:07 -0400 Subject: gnu: ortp: Update to 4.4.34. * gnu/packages/linphone.scm (ortp)[source]: Switch to git repository. [version]: Update to 4.4.34. [outputs]{doc, tester}: New outputs. [configure-flag]: Enable tests. [phases]{fix-version-strings, separate-outputs}: New phases. [home-page]: Update. [license]: Upgrade to GPLv3+. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 60221ffad8..370748220a 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -397,20 +397,44 @@ such as conferencing.") (define-public ortp (package (name "ortp") - (version "1.0.2") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/ortp.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5")))) + (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m")))) (build-system cmake-build-system) + (outputs '("out""tester" + "doc")) ;1.5 MiB of HTML doc (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required + `(#:tests? #f ;requires networking + #:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_TESTS=YES") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version-strings + (lambda _ + (substitute* "CMakeLists.txt" + (("VERSION 4.4.0") + (string-append "VERSION " ,version)) + (("\\$\\{ORTP_DOC_VERSION\\}") + ,version)))) + (add-after 'install 'separate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (doc-src (string-append out "/share/doc/ortp-" ,version)) + (doc-dest (string-append doc "/share/doc/ortp-" ,version)) + (tester (assoc-ref outputs "tester"))) + (for-each mkdir-p (list (string-append doc "/share/doc") + (string-append tester "/bin"))) + (rename-file doc-src doc-dest) + (rename-file (string-append out "/bin") + (string-append tester "/bin")))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen))) @@ -419,8 +443,8 @@ such as conferencing.") (synopsis "Belledonne Communications RTP Library") (description "oRTP is a C library implementing the RTP protocol. It implements the RFC 3550 standard.") - (home-page "https://gitlab.linphone.org/BC/public/ortp") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/ortp") + (license license:gpl3+))) (define-public bzrtp (package -- cgit v1.2.3 From 146a9403b3f9bda114e4e3a63ad1ad1aaac82d12 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 15:51:11 -0400 Subject: gnu: mediastreamer2: Update to 4.4.34. * gnu/packages/linphone.scm (mediastreamer2)[source]: Switch to git repository. [version]: Update to 4.4.34. [patches]: Remove field. [configure-flags]: Remove the ENABLE_STRICT, ENABLE_BV16, CMAKE_C_FLAGS and CMAKE_CXX_FLAGS flags. [phases]{fix-version}: New phase. {separate-outputs}: Modify. [native-inputs]: Replace python with python-wrapper. [home-page]: Update. [license]: Upgrade to GPLv3+. * gnu/packages/patches/mediastreamer2-srtp2.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 1 - gnu/packages/linphone.scm | 61 +++++----- gnu/packages/patches/mediastreamer2-srtp2.patch | 155 ------------------------ 3 files changed, 29 insertions(+), 188 deletions(-) delete mode 100644 gnu/packages/patches/mediastreamer2-srtp2.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d131dc0388..2194e46f5d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1397,7 +1397,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ - %D%/packages/patches/mediastreamer2-srtp2.patch \ %D%/packages/patches/mesa-skip-tests.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 370748220a..129b6764e5 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -417,9 +417,10 @@ such as conferencing.") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-version-strings + ;; See: https://gitlab.linphone.org/BC/public/ortp/-/issues/5. (lambda _ (substitute* "CMakeLists.txt" - (("VERSION 4.4.0") + (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") (string-append "VERSION " ,version)) (("\\$\\{ORTP_DOC_VERSION\\}") ,version)))) @@ -518,56 +519,52 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (define-public mediastreamer2 (package (name "mediastreamer2") - (version "2.16.1") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" - "mediastreamer/mediastreamer-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/mediastreamer2.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k")) - (patches (search-patches "mediastreamer2-srtp2.patch")))) + (base32 "0989h3d0h7qrx4kjx8gg09j8c5hvvi3h8qi1iq1dqbppwbaxbz8c")))) (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_STRICT=NO" ; Would otherwise treat warnings as err - "-DENABLE_BV16=NO" ; Not available - "-DCMAKE_C_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"" - "-DCMAKE_CXX_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"") + #:configure-flags (list "-DENABLE_STATIC=NO") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-version + (lambda _ + (substitute* "CMakeLists.txt" + (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") + (string-append "VERSION " ,version))))) (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) (tester (assoc-ref outputs "tester")) - (tester-name (string-append ,name "_tester"))) + (tester-name (string-append ,name "_tester")) + (doc (assoc-ref outputs "doc")) + (doc-name (string-append ,name "-" ,version))) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share") + (string-append doc "/share/doc"))) ;; Copy the tester executable. - (mkdir-p (string-append tester "/bin")) (rename-file (string-append out "/bin/" tester-name) (string-append tester "/bin/" tester-name)) ;; Copy the tester data files. - (copy-recursively (string-append out "/share/" tester-name) - (string-append tester "/share/" tester-name)) - (delete-file-recursively (string-append out "/share/" - tester-name)) + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name)) ;; Copy the HTML documentation. - (copy-recursively (string-append out "/share/doc/" - ,name "-" ,version "/html") - (string-append doc "/share/doc/" - ,name "-" ,version "/html")) - (delete-file-recursively (string-append out "/share/doc/" - ,name "-" ,version - "/html")) - #t)))))) + (rename-file (string-append out "/share/doc/" doc-name) + (string-append doc "/share/doc/" doc-name)))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python))) + ("python" ,python-wrapper))) (inputs `(("alsa" ,alsa-lib) ("bcg729" ,bcg729) @@ -600,8 +597,8 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") for telephony applications. This media processing and streaming toolkit is responsible for receiving and sending all multimedia streams in Linphone, including media capture, encoding and decoding, and rendering.") - (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/mediastreamer2") + (license license:gpl3+))) (define-public liblinphone (package diff --git a/gnu/packages/patches/mediastreamer2-srtp2.patch b/gnu/packages/patches/mediastreamer2-srtp2.patch deleted file mode 100644 index f6d494facb..0000000000 --- a/gnu/packages/patches/mediastreamer2-srtp2.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 97903498364ae2596e790cb2c2ce9ac76c04d64a Mon Sep 17 00:00:00 2001 -From: Danmei Chen -Date: Fri, 19 Jan 2018 10:04:07 +0100 -Subject: [PATCH] add compability with srtp2 - ---- - cmake/FindSRTP.cmake | 24 ++++++++++++++++++++---- - src/CMakeLists.txt | 1 + - src/crypto/ms_srtp.c | 10 ++-------- - src/utils/srtp_prefix.h | 41 +++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 64 insertions(+), 12 deletions(-) - create mode 100644 src/utils/srtp_prefix.h - -diff --git a/cmake/FindSRTP.cmake b/cmake/FindSRTP.cmake -index 988b846a..f720ce7e 100644 ---- a/cmake/FindSRTP.cmake -+++ b/cmake/FindSRTP.cmake -@@ -31,20 +31,36 @@ set(_SRTP_ROOT_PATHS - ) - - find_path(SRTP_INCLUDE_DIRS -- NAMES srtp/srtp.h -+ NAMES srtp2/srtp.h - HINTS _SRTP_ROOT_PATHS - PATH_SUFFIXES include - ) - - if(SRTP_INCLUDE_DIRS) - set(HAVE_SRTP_SRTP_H 1) --endif() -- --find_library(SRTP_LIBRARIES -+ set(SRTP_VERSION 2) -+ find_library(SRTP_LIBRARIES -+ NAMES srtp2 -+ HINTS ${_SRTP_ROOT_PATHS} -+ PATH_SUFFIXES bin lib -+ ) -+else() -+ find_path(SRTP_INCLUDE_DIRS -+ NAMES srtp/srtp.h -+ HINTS _SRTP_ROOT_PATHS -+ PATH_SUFFIXES include -+ ) -+ if(SRTP_INCLUDE_DIRS) -+ set(HAVE_SRTP_SRTP_H 1) -+ set(SRTP_VERSION 1) -+ endif() -+ find_library(SRTP_LIBRARIES - NAMES srtp - HINTS ${_SRTP_ROOT_PATHS} - PATH_SUFFIXES bin lib - ) -+endif() -+ - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(SRTP -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index da429764..c46faa62 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -183,6 +183,7 @@ set(VOIP_SOURCE_FILES_C - utils/pcap_sender.c - utils/pcap_sender.h - utils/stream_regulator.c -+ utils/srtp_prefix.h - voip/audioconference.c - voip/audiostream.c - voip/bandwidthcontroller.c -diff --git a/src/crypto/ms_srtp.c b/src/crypto/ms_srtp.c -index 5a510c99..67810316 100644 ---- a/src/crypto/ms_srtp.c -+++ b/src/crypto/ms_srtp.c -@@ -25,6 +25,7 @@ - #include "mediastreamer2/ms_srtp.h" - #include "mediastreamer2/mediastream.h" - -+ - #ifdef HAVE_SRTP - - /*srtp defines all this stuff*/ -@@ -34,13 +35,7 @@ - #undef PACKAGE_TARNAME - #undef PACKAGE_VERSION - --#if defined(MS2_WINDOWS_PHONE) --// Windows phone doesn't use make install --#include --#else --#include --#endif -- -+#include "srtp_prefix.h" - - #include "ortp/b64.h" - -@@ -352,7 +347,6 @@ int ms_srtp_init(void) - srtp_init_done++; - }else{ - ms_fatal("Couldn't initialize SRTP library: %d.", st); -- err_reporting_init("mediastreamer2"); - } - }else srtp_init_done++; - return (int)st; -diff --git a/src/utils/srtp_prefix.h b/src/utils/srtp_prefix.h -new file mode 100644 -index 00000000..68bde496 ---- /dev/null -+++ b/src/utils/srtp_prefix.h -@@ -0,0 +1,41 @@ -+/* -+ mediastreamer2 library - modular sound and video processing and streaming -+ Copyright (C) 2006-2014 Belledonne Communications, Grenoble -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+#ifndef __SRTP2_H__ -+#define __SRTP2_H__ -+ -+#if defined(MS2_WINDOWS_PHONE) -+// Windows phone doesn't use make install -+#include -+#elif SRTP_VERSION==1 -+#include -+#else -+#include -+#define err_status_t srtp_err_status_t -+#define err_status_ok srtp_err_status_ok -+#define crypto_policy_t srtp_crypto_policy_t -+#define crypto_policy_set_aes_cm_256_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_128_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_32 -+#define crypto_policy_set_aes_cm_128_null_auth srtp_crypto_policy_set_aes_cm_128_null_auth -+#define crypto_policy_set_null_cipher_hmac_sha1_80 srtp_crypto_policy_set_null_cipher_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_128_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_256_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_256_hmac_sha1_32 -+#define ssrc_t srtp_ssrc_t -+#endif -+ -+#endif --- -2.21.0 - -- cgit v1.2.3 From 0c6f7d8396349dc5afb5c24b72f940f097737e78 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 16:56:25 -0400 Subject: gnu: mediastreamer2: Enable tests. * gnu/packages/linphone.scm (mediastreamer2) [arguments]: Remove tests? argument, enabling tests. [phases]{pre-check}: New phase. {check}: Replace with custom phase. [native-inputs]: Add xorg-server-for-tests. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 129b6764e5..f06b2be452 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -532,8 +532,7 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags (list "-DENABLE_STATIC=NO") + `(#:configure-flags (list "-DENABLE_STATIC=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-version @@ -541,6 +540,14 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (substitute* "CMakeLists.txt" (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") (string-append "VERSION " ,version))))) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getenv "TEMP")))) + (delete 'check) ;move after install (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -552,19 +559,37 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (list (string-append tester "/bin") (string-append tester "/share") (string-append doc "/share/doc"))) - ;; Copy the tester executable. + ;; Move the tester executable. (rename-file (string-append out "/bin/" tester-name) (string-append tester "/bin/" tester-name)) - ;; Copy the tester data files. + ;; Move the tester data files. (rename-file (string-append out "/share/" tester-name) (string-append tester "/share/" tester-name)) - ;; Copy the HTML documentation. + ;; Move the HTML documentation. (rename-file (string-append out "/share/doc/" doc-name) - (string-append doc "/share/doc/" doc-name)))))))) + (string-append doc "/share/doc/" doc-name))))) + (add-after 'separate-outputs 'check + (lambda* (#:key outputs #:allow-other-keys) + (let ((tester (string-append (assoc-ref outputs "tester") + "/bin/mediastreamer2_tester"))) + (for-each (lambda (suite-name) + (invoke tester "--suite" suite-name)) + ;; Some tests fail, due to requiring access to the + ;; sound card or the network. + (list "Basic Audio" + ;; "Sound Card" + ;; "AdaptiveAlgorithm" + ;; "AudioStream" + ;; "VideoStream" + "H26x Tools" + "Framework" + ;; "Player" + "TextStream")))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("alsa" ,alsa-lib) ("bcg729" ,bcg729) -- cgit v1.2.3 From abc1418786df47816a00c68e90c770d9692a2bb7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 18:43:55 -0400 Subject: gnu: mediastreamer2: Enable PCAP, port-audio and G729B support. * gnu/packages/linphone.scm (mediastreamer2) [configure-flags]: Add the ENABLE_PCAP, ENABLE_PORTAUDIO and ENABLE_G729B_CNG flags. [phases]{patch-source}: New phase. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index f06b2be452..0da9e02b4c 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -532,7 +532,12 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments - `(#:configure-flags (list "-DENABLE_STATIC=NO") + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_PCAP=YES" + ;; Do not fail on compile warnings. + "-DENABLE_STRICT=NO" + "-DENABLE_PORTAUDIO=YES" + "-DENABLE_G729B_CNG=YES") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-version @@ -540,6 +545,10 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (substitute* "CMakeLists.txt" (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") (string-append "VERSION " ,version))))) + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "src/otherfilters/mspcapfileplayer.c" + (("O_BINARY") "L_INCR")))) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. -- cgit v1.2.3 From 23a96055fb1c952d9b182b4f2dbd53e7ac25deba Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:40:05 -0400 Subject: gnu: belle-sip: Update to 4.4.34. * gnu/packages/linphone.scm (belle-sip)[source]: Switch to git repository. [version]: Update to 4.4.34. [home-page]: Update. [license]: Update to GPLv3+. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 0da9e02b4c..6f7634ecdb 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -480,15 +480,16 @@ including both ARM and x86.") (define-public belle-sip (package (name "belle-sip") - (version "1.6.3") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/belle-sip") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z")))) + (base32 "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; Requires network access @@ -513,8 +514,8 @@ including both ARM and x86.") (description "Belle-sip is a modern library implementing SIP transport, transaction and dialog layers. It is written in C, with an object-oriented API. It also comprises a simple HTTP/HTTPS client implementation.") - (home-page "https://gitlab.linphone.org/BC/public/belle-sip") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/belle-sip") + (license license:gpl3+))) (define-public mediastreamer2 (package -- cgit v1.2.3 From c2a86746142fd51f53f3006dce5420d23ea36fef Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 13:25:14 -0400 Subject: gnu: belle-sip: Enable tests. * gnu/packages/linphone.scm (belle-sip)[outputs]: New "tester" output. [tests?]: Remove argument, enabling tests. [phases]{check}: Override phase. {separate-outputs}: New phase. [inputs]: Remove antlr3, anttlr3c and java. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 48 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 6f7634ecdb..ec35ad4545 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -485,15 +485,15 @@ including both ARM and x86.") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/belle-sip") + (url "https://gitlab.linphone.org/BC/public/belle-sip.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z")))) (build-system cmake-build-system) + (outputs '("out" "tester")) (arguments - `(#:tests? #f ; Requires network access - #:configure-flags + `(#:configure-flags (list "-DENABLE_STATIC=NO") ; Not required #:phases (modify-phases %standard-phases @@ -502,13 +502,43 @@ including both ARM and x86.") (substitute* "src/CMakeLists.txt" ;; ANTLR would use multithreaded DFA generation otherwise, ;; which would not be reproducible. - (("-Xmultithreaded ") "")) - #t))))) + (("-Xmultithreaded ") "")))) + (delete 'check) ;move after install + (add-after 'install 'separate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (tester (assoc-ref outputs "tester")) + (tester-name "belle_sip_tester")) + (for-each mkdir-p (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file (string-append out "/bin") + (string-append tester "/bin")) + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name))))) + (add-after 'separate-outputs 'check + (lambda* (#:key outputs #:allow-other-keys) + (let ((tester (string-append (assoc-ref outputs "tester") + "/bin/belle_sip_tester"))) + (for-each (lambda (suite-name) + (invoke tester "--suite" suite-name)) + (list "Object inheritance" + "SIP URI" + "FAST SIP URI" + "FAST SIP URI 2" + "Generic uri" + "Headers" + "Core" + "SDP" + ;;"Resolver" + "Message" + "Authentication helper" + ;;"Register" + ;;"Dialog" + "Refresher" + ;;"HTTP stack" + "Object")))))))) (inputs - `(("antlr3" ,antlr3-3.3) - ("antlr3c" ,libantlr3c) - ("bctoolbox" ,bctoolbox) - ("java" ,icedtea) + `(("bctoolbox" ,bctoolbox) ("zlib" ,zlib))) (synopsis "Belledonne Communications SIP Library") (description "Belle-sip is a modern library implementing SIP transport, -- cgit v1.2.3 From 3c7ff0be83973ea37a186e1e9d277e8d02e4f785 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 14:28:56 -0400 Subject: gnu: belle-sip: Enable mDNS support. * gnu/packages/linphone.scm (belle-sip)[configure-flags]: Enable mDNS support. [phases]{patch}: Force the detection of avahi. [inputs]: Add avahi. --- gnu/packages/linphone.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index ec35ad4545..2ca05ac8b9 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages audio) + #:use-module (gnu packages avahi) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) @@ -493,12 +494,21 @@ including both ARM and x86.") (build-system cmake-build-system) (outputs '("out" "tester")) (arguments - `(#:configure-flags - (list "-DENABLE_STATIC=NO") ; Not required + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_MDNS=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix mDNS dependency. + (let* ((avahi (assoc-ref inputs "avahi"))) + (substitute* (find-files "." "CMakeLists.txt") + (("find_package\\(DNSSD REQUIRED\\)") + "set(DNSSD_FOUND 1)") + (("\\$\\{DNSSD_INCLUDE_DIRS\\}") + (string-append avahi "/include/avahi-compat-libdns_sd")) + (("\\$\\{DNSSD_LIBRARIES\\}") + "dns_sd"))) (substitute* "src/CMakeLists.txt" ;; ANTLR would use multithreaded DFA generation otherwise, ;; which would not be reproducible. @@ -538,7 +548,8 @@ including both ARM and x86.") ;;"HTTP stack" "Object")))))))) (inputs - `(("bctoolbox" ,bctoolbox) + `(("avahi" ,avahi) + ("bctoolbox" ,bctoolbox) ("zlib" ,zlib))) (synopsis "Belledonne Communications SIP Library") (description "Belle-sip is a modern library implementing SIP transport, -- cgit v1.2.3 From 093c5da74702b90c209c3659913b0736ed002b29 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 23:08:41 -0400 Subject: gnu: Add lime. * gnu/packages/linphone.scm (lime): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 2ca05ac8b9..1c94d49f59 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -676,6 +677,58 @@ including media capture, encoding and decoding, and rendering.") (home-page "https://linphone.org/technical-corner/mediastreamer2") (license license:gpl3+))) +(define-public lime + (package + (name "lime") + (version "4.4.34") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/lime.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z")))) + (build-system cmake-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_C_INTERFACE=YES") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Disable tests that require networking. + (substitute* "tester/CMakeLists.txt" + (("add_test\\(?.*\"Hello World\"\\)") "") + (("add_test\\(?.*\"lime\"\\)") "") + (("add_test\\(?.*\"FFI\"\\)") "")))) + (add-after 'build 'build-doc + (lambda _ + (invoke "make" "doc"))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (assoc-ref outputs "doc")) + (dir (string-append doc "/share/doc")) + (dest (string-append dir "/" ,name "-" ,version))) + (mkdir-p dest) + (copy-recursively "doc" dest))))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("belle-sip" ,belle-sip) + ("soci" ,soci))) + (synopsis "Belledonne Communications Encryption Library") + (description "LIME is an encryption library for one-to-one and group +instant messaging, allowing users to exchange messages privately and +asynchronously. It supports multiple devices per user and multiple users per +device.") + (home-page "https://linphone.org/technical-corner/lime") + (license license:gpl3+))) + (define-public liblinphone (package (name "liblinphone") -- cgit v1.2.3 From acf4c0cd7c41e2c4643ebb6820cbcd86f0bf3b48 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 17 Mar 2021 23:36:02 -0400 Subject: gnu: liblinphone: Update to 4.4.34. * gnu/packages/linphone.scm (liblinphone) [source]: Switch to git repository. [version]: Update to 4.4.34. [outputs]: Remove the "doc" output. [imported-modules, modules]: Remove arguments. [configure-flags]: Remove flag. : Likewise. [phases] : Remove phases. : Modify. [native-inputs]: Add perl. Replace python with python-wrapper. [inputs]: Add belr, lime, soci and xsd. Remove glib and gtk+-2. [home-page]: Update. [license]: Upgrade to GPLv3+. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 95 ++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 64 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 1c94d49f59..cc1308b8f7 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -25,6 +25,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages avahi) #:use-module (gnu packages base) + #:use-module (gnu packages cpp) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) @@ -732,95 +733,61 @@ device.") (define-public liblinphone (package (name "liblinphone") - (version "3.12.0") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/linphone" - "/linphone-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/liblinphone.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x")))) - (outputs '("out" "doc" "tester")) + (base32 "1lwabr93jw24y04pdqnw9dgg8jb3lzfplyx19f83jgp9dj8kmfq9")))) + (outputs '("out" "tester")) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=" - (string-append (assoc-ref %build-inputs "gtk2") - "/lib/gtk-2.0/include")) - (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=" - (string-append (assoc-ref %build-inputs "glib") - "/lib/glib-2.0/include")) - "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_STRICT=NO" - "-DENABLE_GTK_UI=YES") ; for legacy UI - #:imported-modules (,@%cmake-build-system-modules - (guix build glib-or-gtk-build-system)) - #:modules ((guix build cmake-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) + `(#:tests? #f ; Tests require networking + #:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_DOC=NO" ;requires unpackaged javasphinx + "-DENABLE_LDAP=YES") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* "gtk/main.c" - (("#include \"liblinphone_gitversion.h\"") - "")) - #t)) (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) (tester (assoc-ref outputs "tester")) (tester-name (string-append ,name "_tester"))) - ;; Copy the tester executable. - (mkdir-p (string-append tester "/bin")) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share"))) (rename-file (string-append out "/bin/" tester-name) (string-append tester "/bin/" tester-name)) - ;; Copy the tester data files. - (mkdir-p (string-append tester "/share/")) + (rename-file (string-append out "/bin/groupchat_benchmark") + (string-append tester "/bin/groupchat_benchmark")) (rename-file (string-append out "/share/" tester-name) - (string-append tester "/share/" tester-name)) - ;; Copy the HTML and XML documentation. - (copy-recursively - (string-append out "/share/doc/linphone-" ,version) - (string-append doc "/share/doc/" ,name "-" ,version)) - (delete-file-recursively - (string-append out "/share/doc/linphone-" ,version)) - #t))) - (add-after 'install 'install-man-pages - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man/man1"))) - (for-each (lambda (file) - (install-file file man)) - (find-files ".." ".*.1$")) - #t))) - (add-after 'separate-outputs 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (string-append tester "/share/" tester-name)))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("udev" ,eudev) ;for libudev.h - ;; For generating the C++ wrappers. - ("dot" ,graphviz) + `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python) + ("gettext" ,gettext-minimal) + ("perl" ,perl) + ("python" ,python-wrapper) ("pystache" ,python-pystache) - ("six" ,python-six))) + ("six" ,python-six) + ("udev" ,eudev))) (inputs `(("bctoolbox" ,bctoolbox) ("belcard" ,belcard) ("bellesip" ,belle-sip) + ("belr" ,belr) ("bzrtp" ,bzrtp) ("iconv" ,libiconv) - ("glib" ,glib) - ("gtk2" ,gtk+-2) + ("libxsd" ,xsd) + ("lime" ,lime) ("mediastreamer2" ,mediastreamer2) ("notify" ,libnotify) ("ortp" ,ortp) + ("soci" ,soci) ("sqlite" ,sqlite) ("xml2" ,libxml2) ("zlib" ,zlib))) @@ -830,8 +797,8 @@ all calling and instant messaging features into an unified easy-to-use API. It is the cross-platform VoIP library on which the Linphone application is based on, and that anyone can use to add audio and video calls or instant messaging capabilities to an application.") - (home-page "https://gitlab.linphone.org/BC/public/liblinphone") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/liblinphone") + (license license:gpl3+))) (define-public linphoneqt (package -- cgit v1.2.3 From 342e223c8e1913fdab9e099a68bce7d93b16cc42 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 20 Mar 2021 04:08:06 -0400 Subject: gnu: liblinphone: Enable LDAP support. * gnu/packages/linphone.scm (liblinphone) [configure-flags] : New flag. [inputs]: Add openldap. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index cc1308b8f7..053e9e9e6f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) + #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -782,6 +783,7 @@ device.") ("belr" ,belr) ("bzrtp" ,bzrtp) ("iconv" ,libiconv) + ("ldap" ,openldap) ("libxsd" ,xsd) ("lime" ,lime) ("mediastreamer2" ,mediastreamer2) -- cgit v1.2.3 From 48b2202789c85b6ab2d10916e2b6b118efc18ea9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 20:58:20 -0400 Subject: gnu: linphoneqt: Update to 4.2.5 and rename to linphone-desktop. Also enable the daemon and console interfaces. * gnu/packages/linphone.scm (linphoneqt) [name]: Rename to linphone-desktop. [source]: Switch to git repository. [patches]: Remove linphoneqt-tabbutton.patch and add linphone-desktop-without-sdk.patch. [outputs]: New output. [configure-flags]: Disable update checking and enable the daemon and console interfaces. [phases]: New phase. : Remove phases. : Rename to... : ... this; adjust. [native-inputs]: Add pkg-config. [inputs]: Add belr and ortp. Remove belle-sip. [home-page]: Update home page. [license]: Update to GPLv3+. * gnu/packages/patches/linphoneqt-tabbutton.patch: Remove file. linphone-desktop-without-sdk.patch: New file. * gnu/local.mk (dist_patch_DATA): Update. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 2 +- gnu/packages/linphone.scm | 74 ++++--- .../patches/linphone-desktop-without-sdk.patch | 235 +++++++++++++++++++++ gnu/packages/patches/linphoneqt-tabbutton.patch | 96 --------- 4 files changed, 277 insertions(+), 130 deletions(-) create mode 100644 gnu/packages/patches/linphone-desktop-without-sdk.patch delete mode 100644 gnu/packages/patches/linphoneqt-tabbutton.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 2194e46f5d..40732ca696 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1362,7 +1362,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ - %D%/packages/patches/linphoneqt-tabbutton.patch \ + %D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 053e9e9e6f..7337e0ef1e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -802,55 +803,59 @@ and video calls or instant messaging capabilities to an application.") (home-page "https://linphone.org/technical-corner/liblinphone") (license license:gpl3+))) -(define-public linphoneqt +(define-public linphone-desktop (package - (name "linphoneqt") - (version "4.1.1") + (name "linphone-desktop") + (version "4.2.5") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/linphone-desktop") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a")) - (patches (search-patches "linphoneqt-tabbutton.patch")))) + (base32 "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz")) + (patches (search-patches "linphone-desktop-without-sdk.patch")))) (build-system qt-build-system) + (outputs '("out" "debug")) (arguments `(#:tests? #f ; No test target + #:configure-flags (list "-DENABLE_UPDATE_CHECK=NO" + "-DENABLE_DAEMON=YES" + "-DENABLE_CONSOLE_UI=YES") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-cmake-error - (lambda _ - ;; This is fixed in commit efed2fd8 of the master branch. - (substitute* "CMakeLists.txt" - (("js)\\$\"") - "js$\"")) - #t)) - (add-after 'unpack 'set-version-string + (add-after 'unpack 'pre-configure (lambda _ - (substitute* "src/app/AppController.cpp" - (("LINPHONE_QT_GIT_VERSION") - (format #f "~s" ,version))) - #t)) - (add-after 'install 'extend-shared-resources - ;; Not using the FHS exposes an issue where the client refers to - ;; its own "share" directory, which lacks sound files installed by - ;; liblinphone. + (make-file-writable "linphone-app/linphoneqt_version.cmake") + (substitute* "linphone-app/linphoneqt_version.cmake" + (("\\$\\{GUIX-SET-VERSION\\}") ,version)))) + (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((liblinphone (assoc-ref inputs "linphone")) - (out (assoc-ref outputs "out"))) + (let* ((out (assoc-ref outputs "out")) + (liblinphone (assoc-ref inputs "liblinphone")) + (grammar-dest (string-append out "/share/belr/grammars"))) + ;; Remove unnecessary Qt configuration file. + (delete-file (string-append out "/bin/qt.conf")) + ;; Not using the FHS exposes an issue where the client + ;; refers to its own "share" directory, which lacks files + ;; installed by the dependencies. (symlink (string-append liblinphone "/share/sounds") (string-append out "/share/sounds")) - #t)))))) + (mkdir-p (dirname grammar-dest)) + (symlink (string-append liblinphone "/share/belr/grammars") + grammar-dest))))))) (native-inputs - `(("qttools" ,qttools))) + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("bctoolbox" ,bctoolbox) ("belcard" ,belcard) - ("bellesip" ,belle-sip) - ("linphone" ,liblinphone) + ("belr" ,belr) + ("liblinphone" ,liblinphone) ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) @@ -875,8 +880,11 @@ and video calls or instant messaging capabilities to an application.") @item Audio codecs: opus, speex, g711, g729, gsm, iLBC, g722, SILK, etc. @item Video codecs: VP8, H.264 and H.265 with resolutions up to 1080P, MPEG4 @end itemize") - (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/linphone") + (license license:gpl3+))) + +(define-public linphoneqt + (deprecated-package "linphoneqt" linphone-desktop)) (define-public msopenh264 (package diff --git a/gnu/packages/patches/linphone-desktop-without-sdk.patch b/gnu/packages/patches/linphone-desktop-without-sdk.patch new file mode 100644 index 0000000000..63e9808bf4 --- /dev/null +++ b/gnu/packages/patches/linphone-desktop-without-sdk.patch @@ -0,0 +1,235 @@ +From cfdf6d1c2051d6a20d0cbb94d81fe398f70dea4d Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Sun, 21 Mar 2021 21:13:53 -0400 +Subject: [PATCH] [PATCH]: Fix building from git. + +--- + CMakeLists.txt | 73 +------------------ + linphone-app/CMakeLists.txt | 12 +-- + .../cmake_builder/additional_steps.cmake | 2 +- + .../linphone_package/CMakeLists.txt | 38 ---------- + linphone-app/linphoneqt_version.cmake | 1 + + linphone-app/src/config.h.cmake | 1 + + 6 files changed, 6 insertions(+), 121 deletions(-) + create mode 100644 linphone-app/linphoneqt_version.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7eb05f2..3e853bdd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,16 +48,6 @@ project(linphoneqt) + include(GNUInstallDirs) + include(CheckCXXCompilerFlag) + +-# Prepare gobal CMAKE configuration specific to the current project +-set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep all in it. +-set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") +- +-set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") +- +-set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") +-string(REPLACE ";" "|" PREFIX_PATH "${CMAKE_PREFIX_PATH}") +-#set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") +- + # Avoid cmake warning if CMP0071 is not set. + if (POLICY CMP0071) + cmake_policy(SET CMP0071 NEW) +@@ -116,9 +106,6 @@ if(ENABLE_V4L) + endif() + list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") + +-list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") +- +-include(ExternalProject) + set(PROJECT_BUILD_COMMAND "") + if(CMAKE_BUILD_PARALLEL_LEVEL) + list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") +@@ -133,32 +120,10 @@ if(CMAKE_VERBOSE_MAKEFILE) + endif() + endif() + if(UNIX AND NOT APPLE) +- set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") + list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") + endif() +-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" +- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" +- STAMP_DIR "${SDK_BUILD_DIR}/stamp" +- BINARY_DIR "${SDK_BUILD_DIR}" +- STEP_TARGETS build +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- #BUILD_ALWAYS NO #${DO_BUILD} +-) +-ExternalProject_Add_Step(sdk force_build +- COMMENT "Forcing build for 'desktop'" +- DEPENDEES configure +- DEPENDERS build +- ALWAYS 1 +-) + include(FindPkgConfig) + +-set(APP_DEPENDS sdk) +- +- + find_package(Qt5 5.12 COMPONENTS Core REQUIRED) + + if ( NOT Qt5_FOUND ) +@@ -173,39 +138,5 @@ find_package(Mediastreamer2 CONFIG QUIET) + find_package(ortp CONFIG QUIET) + + +-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) +- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") +- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- DEPENDS ${APP_DEPENDS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project" +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- # ${APP_OPTIONS} +- BUILD_ALWAYS ON +- ) +- install(CODE "message(STATUS Running install)") +- set(AUTO_REGENERATION auto_regeneration) +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS linphone-qt) +-else() +- message("Adding Linphone Desktop in an IDE-friendly state") +- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") +- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +- add_dependencies(app-library ${APP_DEPENDS}) +-endif() +-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +-# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- EXCLUDE_FROM_ALL ON +- BUILD_ALWAYS ON +-) ++message("Adding Linphone Desktop in an IDE-friendly state") ++add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index 3bc9420a..5267cd4a 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -21,17 +21,8 @@ + ################################################################################ + cmake_minimum_required(VERSION 3.1) + ++include(linphoneqt_version.cmake) + find_package(bctoolbox CONFIG) +-set(FULL_VERSION ) +-bc_compute_full_version(FULL_VERSION) +-set(version_major ) +-set(version_minor ) +-set(version_patch ) +-set(identifiers ) +-set(metadata ) +-bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) +- +-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + + if(ENABLE_BUILD_VERBOSE) + #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") +@@ -49,7 +40,6 @@ if(UNIX AND NOT APPLE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") +-list(APPEND CMAKE_MODULE_PATH "${LINPHONE_OUTPUT_DIR}/cmake") + + set(APP_LIBRARY app-library) + include(application_info.cmake) +diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake +index 7f7fd573..48e3c716 100644 +--- a/linphone-app/cmake_builder/additional_steps.cmake ++++ b/linphone-app/cmake_builder/additional_steps.cmake +@@ -61,7 +61,7 @@ if (ENABLE_PACKAGING) + SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" + DOWNLOAD_COMMAND "" + CMAKE_GENERATOR ${CMAKE_GENERATOR} +- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} ++ CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} + ) + endif () + endif () +diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +index baea03cf..d06dcb74 100644 +--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt ++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +@@ -200,44 +200,6 @@ elseif (APPLE) + endif () + # install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.app" DESTINATION "." USE_SOURCE_PERMISSIONS) + else()# Not Windows and Apple +- foreach (LIBRARY ${SHARED_LIBRARIES}) +- get_filename_component(LIBRARY_FILENAME ${LIBRARY} NAME) +- message("Changing RPATH of ${LIBRARY_FILENAME} from '${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}' to '$ORIGIN/../${CMAKE_INSTALL_LIBDIR}'") +- execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}" "$ORIGIN/../lib" "${LIBRARY}") +- execute_process(COMMAND install_name_tool -addrpath "$ORIGIN/../lib64" "${LIBRARY}") +- endforeach () +- install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/" DESTINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS) +-#Just in case. This is useless because we have to use CMAKE_INSTALL_LIBDIR +- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib/") +- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib/*.so*") +- if( ENABLE_OPENH264 )# Remove openH264 lib from the installation. this codec will be download by user +- foreach(item ${SHARED_LIBRARIES}) +- get_filename_component(LIBRARY_FILENAME ${item} NAME) +- if("${LIBRARY_FILENAME}" MATCHES "^libopenh264.*$") +- list(REMOVE_ITEM SHARED_LIBRARIES ${item}) +- endif() +- endforeach(item) +- endif() +- install(FILES ${SHARED_LIBRARIES} DESTINATION "lib") +- endif() +- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib64/") +- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib64/*.so*") +- if( ENABLE_OPENH264 )# Remove openH264 lib from the installation. this codec will be download by user +- foreach(item ${SHARED_LIBRARIES}) +- get_filename_component(LIBRARY_FILENAME ${item} NAME) +- if("${LIBRARY_FILENAME}" MATCHES "^libopenh264.*$") +- list(REMOVE_ITEM SHARED_LIBRARIES ${item}) +- endif() +- endforeach(item) +- endif() +- install(FILES ${SHARED_LIBRARIES} DESTINATION "lib64") +- endif() +- install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS) +- if(ENABLE_BUILD_VERBOSE) +- message("INSTALLATION : ${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" ) +- endif() +- file(GLOB PLUGINS_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins/*") +- install(FILES ${PLUGINS_FILES} DESTINATION "plugins/mediastreamer/" ) + # Install desktop/icon files. + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/linphone.desktop.cmake" "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") +diff --git a/linphone-app/linphoneqt_version.cmake b/linphone-app/linphoneqt_version.cmake +new file mode 100644 +index 00000000..a85d3455 +--- /dev/null ++++ b/linphone-app/linphoneqt_version.cmake +@@ -0,0 +1 @@ ++project(linphoneqt VERSION ${GUIX-SET-VERSION}) +\ No newline at end of file +diff --git a/linphone-app/src/config.h.cmake b/linphone-app/src/config.h.cmake +index 093539e0..5a238c70 100644 +--- a/linphone-app/src/config.h.cmake ++++ b/linphone-app/src/config.h.cmake +@@ -28,3 +28,4 @@ + #cmakedefine ENABLE_UPDATE_CHECK 1 + #cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}" + #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" ++#define LINPHONE_QT_GIT_VERSION "${PROJECT_VERSION}" +\ No newline at end of file +-- +2.31.0 + diff --git a/gnu/packages/patches/linphoneqt-tabbutton.patch b/gnu/packages/patches/linphoneqt-tabbutton.patch deleted file mode 100644 index 6b3214026e..0000000000 --- a/gnu/packages/patches/linphoneqt-tabbutton.patch +++ /dev/null @@ -1,96 +0,0 @@ -From ecaab0f73d0b74bbfbf150286305fa6e12970037 Mon Sep 17 00:00:00 2001 -From: Ronan Abhamon -Date: Fri, 19 Jan 2018 14:42:01 +0100 -Subject: [PATCH] fix(SettingsWindow): rename icon property of TabButton to - iconName (issue with Qt 5.10 and new icon property) - ---- - ui/modules/Common/Form/Tab/TabButton.qml | 8 ++++---- - ui/views/App/Settings/SettingsWindow.qml | 14 +++++++------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Common/Form/Tab/TabButton.qml -index ad220ab2..a47bb20b 100644 ---- a/ui/modules/Common/Form/Tab/TabButton.qml -+++ b/ui/modules/Common/Form/Tab/TabButton.qml -@@ -12,8 +12,8 @@ Controls.TabButton { - - // --------------------------------------------------------------------------- - -- property string icon - property int iconSize: TabButtonStyle.icon.size -+ property string iconName - - readonly property bool _isSelected: parent.parent.currentItem === button - -@@ -66,9 +66,9 @@ Controls.TabButton { - Layout.leftMargin: TabButtonStyle.text.leftPadding - - icon: { -- var icon = button.icon -- return icon.length -- ? (icon + '_' + (button._isSelected ? 'selected' : 'normal')) -+ var iconName = button.iconName -+ return iconName.length -+ ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal')) - : '' - } - iconSize: button.iconSize -diff --git a/ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Settings/SettingsWindow.qml -index b8f5a80f..58909544 100644 ---- a/ui/views/App/Settings/SettingsWindow.qml -+++ b/ui/views/App/Settings/SettingsWindow.qml -@@ -48,43 +48,43 @@ ApplicationWindow { - id: tabBar - - TabButton { -- icon: 'settings_sip_accounts' -+ iconName: 'settings_sip_accounts' - text: qsTr('sipAccountsTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_audio' -+ iconName: 'settings_audio' - text: qsTr('audioTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_video' -+ iconName: 'settings_video' - text: qsTr('videoTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_call' -+ iconName: 'settings_call' - text: qsTr('callsAndChatTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_network' -+ iconName: 'settings_network' - text: qsTr('networkTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_advanced' -+ iconName: 'settings_advanced' - text: qsTr('uiTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_advanced' -+ iconName: 'settings_advanced' - text: qsTr('uiAdvanced') - width: implicitWidth - } --- -2.21.0 - -- cgit v1.2.3 From f7408b7d2983825e7afb6b4166088a8f6dda6f70 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 22:21:12 -0400 Subject: gnu: msopenh264: Update to 1.2.1-21. * gnu/packages/linphone.scm (msopenh264) [source]: Switch to git repository. [version]: Update to 1.2.1. [patches]: Remove field. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 67 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 7337e0ef1e..5b5c57b357 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -887,44 +887,35 @@ and video calls or instant messaging capabilities to an application.") (deprecated-package "linphoneqt" linphone-desktop)) (define-public msopenh264 - (package - (name "msopenh264") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugins/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8")) - (patches - (list - ;; For support for OpenH264 version >= 2. - (origin - (method url-fetch) - (uri - (string-append "https://gitlab.linphone.org/BC/public/msopenh264/" - "commit/493d147d28c9a0f788ba4e50b47a1ce7b18bf326" - ".diff")) - (file-name "msopenh264-openh264.patch") - (sha256 - (base32 - "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb"))))))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("openh264" ,openh264) - ("ortp" ,ortp))) - (synopsis "Media Streamer H.264 Codec") - (description "MsOpenH264 is an H.264 encoder/decoder plugin for -mediastreamer2 based on the openh264 library.") - (home-page "https://gitlab.linphone.org/BC/public/msopenh264") - (license license:gpl2+))) + (let ((commit "88697cc95140017760d6da408cb0efdc5e86e40a") + (revision "0")) + (package + (name "msopenh264") + (version (git-version "1.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/msopenh264.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10y3b6s934f2wbsf60b3p0g6hffizjqrj5in8l4sida2fjdxlwwy")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=NO"))) ; Not required + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("openh264" ,openh264) + ("ortp" ,ortp))) + (synopsis "Media Streamer H.264 Codec") + (description "MsOpenH264 is an H.264 encoder/decoder plugin for + mediastreamer2 based on the openh264 library.") + (home-page "https://gitlab.linphone.org/BC/public/msopenh264") + (license license:gpl2+)))) (define-public mssilk (package -- cgit v1.2.3 From c4577a406f40798f0c5a37b5cb957befc61591ec Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 22:33:38 -0400 Subject: gnu: mssilk: Update to 1.1.1-8. * gnu/packages/linphone.scm (mssilk) [source]: Switch to git repository. [version]: Update to 1.1.1-8. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 50 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 5b5c57b357..03fcfdc6d4 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -918,30 +918,34 @@ and video calls or instant messaging capabilities to an application.") (license license:gpl2+)))) (define-public mssilk - (package - (name "mssilk") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugins/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("ortp" ,ortp))) - (synopsis "Media Streamer SILK Codec") - (description "MSSILK is a plugin of MediaStreamer, adding support for AMR + (let ((commit "dd0f31ee795faa7ea89e601b072dae4cd1df7e3f") + (revision "0")) + (package + (name "mssilk") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/mssilk.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dann5fnzqp6wjlwc6bl2k9b6rvn6bznqb3qsi1kgv9dnq44cbr0")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=NO"))) ; Not required + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp))) + (synopsis "Media Streamer SILK Codec") + (description "MSSILK is a plugin of MediaStreamer, adding support for AMR codec. It is based on the Skype's SILK implementation.") - (home-page "https://gitlab.linphone.org/BC/public/mssilk") - (license license:gpl2+))) + (home-page "https://gitlab.linphone.org/BC/public/mssilk") + (license license:gpl2+)))) (define-public mswebrtc (package -- cgit v1.2.3 From f2ae919ca9837775fcbe266788386a1c5f6f6a2d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 23:51:32 -0400 Subject: gnu: mswebrtc: Update to 1.1.1-23. * gnu/packages/linphone.scm (mswebrtc) [source]: Switch to git repository. [version]: Update to 1.1.1-23. [arguments]<#:phases>['copy-inputs]: New phase. [native-inputs]: Add webrtc and python-wrapper. --- gnu/packages/linphone.scm | 75 +++++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 03fcfdc6d4..354140d64f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -948,32 +948,57 @@ codec. It is based on the Skype's SILK implementation.") (license license:gpl2+)))) (define-public mswebrtc - (package - (name "mswebrtc") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugins/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required - (inputs - `(("bctoolbox" ,bctoolbox) - ("mediastreamer2" ,mediastreamer2) - ("ortp" ,ortp))) - (synopsis "Media Streamer WebRTC Codec") - (description "MSWebRTC is a plugin of MediaStreamer, adding support for + (let ((commit "946ca706733f36a6b4923f04e569531125462d1d") + (revision "0")) + (package + (name "mswebrtc") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/mswebrtc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pfg9m6bpbv0f53nx72rdxhlyriax9pg4yj0gpwq8ha6lqnpwg1x")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list + "-DENABLE_STATIC=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((webrtc-from (assoc-ref inputs "webrtc")) + (webrtc-to (string-append (getcwd) "/webrtc"))) + (copy-recursively webrtc-from webrtc-to)) + #t))))) + (native-inputs + `(("webrtc" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.linphone.org/BC/public/external/webrtc") + (commit "583acd27665cfadef8ab03eb85a768d308bd29dd"))) + (file-name + (git-file-name "webrtc-for-mswebrtc" version)) + (sha256 + (base32 + "1maqychrgwy0z4zypa03qp726l2finw64z6cymdzhd58ql3p1lvm")))) + ("python" ,python-wrapper))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp))) + (synopsis "Media Streamer WebRTC Codec") + (description "MSWebRTC is a plugin of MediaStreamer, adding support for WebRTC codec. It includes features from WebRTC, such as, iSAC and AECM.") - (home-page "https://gitlab.linphone.org/BC/public/mswebrtc") - (license license:gpl2+))) + (home-page "https://gitlab.linphone.org/BC/public/mswebrtc") + (license license:gpl2+)))) (define-public msamr (package -- cgit v1.2.3 From a99932503ebcc8190034de8489f9d2036cd453f6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 20 Mar 2021 00:01:26 -0400 Subject: gnu: msamr: Update to 1.1.3-11. * gnu/packages/linphone.scm (msamr) [source]: Switch to git repository. [version]: Update to 1.1.3-11. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 56 +++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 354140d64f..2107560aa0 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -1001,30 +1001,34 @@ WebRTC codec. It includes features from WebRTC, such as, iSAC and AECM.") (license license:gpl2+)))) (define-public msamr - (package - (name "msamr") - (version "1.1.3") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugins/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_WIDEBAND=YES"))) - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("opencoreamr" ,opencore-amr) - ("ortp" ,ortp) - ("voamrwbenc" ,vo-amrwbenc))) - (synopsis "Media Streamer AMR Codec") - (description "MSAMR is a plugin of MediaStreamer, adding support for AMR + (let ((commit "5ab5c098299107048dfcbfc741f7392faef167bd") + (revision "0")) + (package + (name "msamr") + (version (git-version "1.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/msamr") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1g79lw1qi1mlw3v1b0cixmqiwjql81gz9naakb15n8pvaag9aaqm")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=NO" ; Not required + "-DENABLE_WIDEBAND=YES"))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("opencoreamr" ,opencore-amr) + ("ortp" ,ortp) + ("voamrwbenc" ,vo-amrwbenc))) + (synopsis "Media Streamer AMR Codec") + (description "MSAMR is a plugin of MediaStreamer, adding support for AMR codec. It is based on the opencore-amr implementation.") - (home-page "https://gitlab.linphone.org/BC/public/msamr") - (license license:gpl3+))) + (home-page "https://gitlab.linphone.org/BC/public/msamr") + (license license:gpl3+)))) -- cgit v1.2.3 From 5a4d0a653146442f9a17ebf1485dd89e8ab84dc4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 09:26:10 +0300 Subject: gnu: wavpack: Update to 5.4.0. * gnu/packages/audio.scm (wavpack): Update to 5.4.0. [source]: Download release tarball. [arguments]: Remove custom 'boostrap phase. [native-inputs]: Remove autoconf, automake, libtool. --- gnu/packages/audio.scm | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 29ef0266ce..badeecd7b0 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3259,31 +3259,18 @@ stretching and pitch scaling of audio. This package contains the library.") (define-public wavpack (package (name "wavpack") - (version "5.3.2") + (version "5.4.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dbry/WavPack") - (commit "e4e8d191e8dd74cbdbeaef3232c16a7ef517e68d"))) + (method url-fetch) + (uri (string-append "https://github.com/dbry/WavPack/releases/download/" + version "/wavpack-" version ".tar.xz")) (sha256 - (base32 "1zj8svk6giy1abq3940sz32ygz7zldppxl47852zgn5wfm3l2spx")) - (file-name (git-file-name name version)))) + (base32 "0ycbqarw25x7208jilh86vwwiqklr7f617jps9mllqc659mnmpjb")))) (build-system gnu-build-system) (arguments '(#:configure-flags - (list "--disable-static") - #:phases - (modify-phases %standard-phases - (replace 'bootstrap - ;; Running ./autogen.sh would cause premature configuration. - (lambda _ - (invoke "autoreconf" "-vif") - #t))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + (list "--disable-static"))) (home-page "https://www.wavpack.com/") (synopsis "Hybrid lossless audio codec") (description -- cgit v1.2.3 From d97030358923bc5b281a95c34a83cb10b9106977 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 10:38:25 +0300 Subject: gnu: wavpack: Enable test suite. * gnu/packages/audio.scm (wavpack)[arguments]: Add configure-flag to build test program. Use custom 'check phase to run test suite. --- gnu/packages/audio.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index badeecd7b0..32ca4d65e8 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3270,7 +3270,15 @@ stretching and pitch scaling of audio. This package contains the library.") (build-system gnu-build-system) (arguments '(#:configure-flags - (list "--disable-static"))) + (list "--disable-static" + "--enable-tests") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./cli/wvtest" "--default" "--short")) + #t))))) (home-page "https://www.wavpack.com/") (synopsis "Hybrid lossless audio codec") (description -- cgit v1.2.3 From 8e3944f857ccbd5db32b58efa81b02ed76da5e66 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 28 Mar 2021 10:56:02 +0200 Subject: gnu: fetchmail: Update to 6.4.18. * gnu/packages/mail.scm (fetchmail): Update to 6.4.18. Signed-off-by: Efraim Flashner --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3e0ce99457..68c2fe2433 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -446,7 +446,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.17") + (version "6.4.18") (source (origin (method url-fetch) @@ -454,7 +454,7 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "1ijh9l7pg2yk5s5h1yj3vpd1az31giqy9bjrna10daj13gqws6x4")))) + (base32 "17r5zfk9yh7jhgdb360dlzx5fx9lsbmalasx6zgxw9v9vjycjb9h")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3 From 18b26a437cc95fa6818d0706344619f5418abb2d Mon Sep 17 00:00:00 2001 From: la snesne Date: Sun, 28 Mar 2021 18:05:08 +0900 Subject: gnu: krita: Update to 4.4.3. * gnu/packages/kde.scm (krita): Update to 4.4.3. Signed-off-by: Efraim Flashner --- gnu/packages/kde.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 213def42e3..4a989b32dd 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Prafulla Giri ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandros Theodotou +;;; Copyright © 2021 la snesne ;;; ;;; This file is part of GNU Guix. ;;; @@ -458,7 +459,7 @@ illustrate project schedules.") (define-public krita (package (name "krita") - (version "4.4.2") + (version "4.4.3") (source (origin (method url-fetch) (uri (string-append @@ -466,7 +467,7 @@ illustrate project schedules.") "/krita-" version ".tar.gz")) (sha256 (base32 - "14lprcv7xw6r19bmylcz4c1p1jfazmza2b4m48f3x7vmdv2sx5ln")))) + "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From f9c507bbcc48a791433e283b3233cc9ed6754ea1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Mar 2021 23:23:04 +0000 Subject: gnu: Add cl-bodge-utilities. * gnu/packages/lisp-xyz.scm: (sbcl-bodge-utilities, cl-bodge-utilities, ecl-bodge-utilities): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d4bf75b231..673e3e82e9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -120,6 +120,45 @@ portable between implementations.") (define-public ecl-alexandria (sbcl-package->ecl-package sbcl-alexandria)) +(define-public sbcl-bodge-utilities + (let ((commit "6304bac4abe06d53579e2c0fc4437d14ff077d9f") + (revision "1")) + (package + (name "sbcl-bodge-utilities") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borodust/bodge-utilities") + (commit commit))) + (file-name (git-file-name "bodge-utilities" version)) + (sha256 + (base32 "1z1blj05q71vzh323qwyn9p3xs7v0mq2yhwfyzza5libp37wqm3c")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("claw" ,sbcl-claw) + ("dissect" ,sbcl-dissect) + ("local-time" ,sbcl-local-time) + ("log4cl" ,sbcl-log4cl) + ("split-sequence" ,sbcl-split-sequence) + ("static-vectors" ,sbcl-static-vectors) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (home-page "https://github.com/borodust/bodge-utilities") + (synopsis "Common Lisp utilities library for CL-BODGE") + (description + "This Common Lisp library provides utilities for the @emph{Bodge} library +collection.") + (license license:expat)))) + +(define-public ecl-bodge-utilities + (sbcl-package->ecl-package sbcl-bodge-utilities)) + +(define-public cl-bodge-utilities + (sbcl-package->cl-source-package sbcl-bodge-utilities)) + (define-public sbcl-golden-utils (let ((commit "9424419d867d5c2f819196ee41667a818a5058e7") (revision "1")) -- cgit v1.2.3 From 4f4ea0824000445f9d891fd519d4f2c3a47b7a90 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Mar 2021 23:15:24 +0000 Subject: gnu: Add cl-rtg-math. * gnu/packages/lisp-xyz.scm: (sbcl-rtg-math, cl-rtg-math, ecl-rtg-math): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 673e3e82e9..462e842171 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2929,6 +2929,39 @@ from GLSL as data.") (define-public cl-glsl-spec (sbcl-package->cl-source-package sbcl-glsl-spec)) +(define-public sbcl-rtg-math + (let ((commit "29fc5b3d0028a4a11a82355ecc8cca62662c69e0") + (revision "1")) + (package + (name "sbcl-rtg-math") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cbaggers/rtg-math") + (commit commit))) + (file-name (git-file-name "rtg-math" version)) + (sha256 + (base32 "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("documentation-utils" ,sbcl-documentation-utils) + ("glsl-symbols" ,sbcl-glsl-spec))) + (home-page "https://github.com/cbaggers/rtg-math") + (synopsis "Common Lisp library of game-related math functions") + (description + "RTG-MATH provides a selection of the math routines most commonly needed +for making realtime graphics in Lisp.") + (license license:bsd-2)))) + +(define-public ecl-rtg-math + (sbcl-package->ecl-package sbcl-rtg-math)) + +(define-public cl-rtg-math + (sbcl-package->cl-source-package sbcl-rtg-math)) + (define-public sbcl-varjo (let ((commit "9e77f30220053155d2ef8870ceba157f75e538d4") (revision "1")) -- cgit v1.2.3 From 96df3fe765cc5dda3b31d4cbe29ed3ba9cf3d254 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Mar 2021 23:28:27 +0000 Subject: gnu: Add cl-bodge-math. * gnu/packages/lisp-xyz.scm: (sbcl-bodge-math, cl-bodge-math, ecl-bodge-math): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 462e842171..ab258efdfd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15484,3 +15484,35 @@ immediately loaded.") (define-public cl-quickproject (sbcl-package->cl-source-package sbcl-quickproject)) + +(define-public sbcl-bodge-math + (let ((commit "9159b7faf88d440024c07110dbef2abddb20b9af") + (revision "1")) + (package + (name "sbcl-bodge-math") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borodust/bodge-math") + (commit commit))) + (file-name (git-file-name "bodge-math" version)) + (sha256 + (base32 "0r3vnl9lywn4ksy34apcv6j825qp7l1naddawr14v4lwacndb80v")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bodge-utilities" ,sbcl-bodge-utilities) + ("rtg-math" ,sbcl-rtg-math))) + (home-page "https://github.com/borodust/bodge-math") + (synopsis "Common Lisp core math utilities of BODGE library collection") + (description + "This Common Lisp package contains the core math utilities of the +@emph{Bodge} library collection.") + (license license:expat)))) + +(define-public ecl-bodge-math + (sbcl-package->ecl-package sbcl-bodge-math)) + +(define-public cl-bodge-math + (sbcl-package->cl-source-package sbcl-bodge-math)) -- cgit v1.2.3 From fba2fa7ed842a6f75abe12058003bf853e0e9f52 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 29 Mar 2021 10:35:44 +0200 Subject: gnu: sbcl: Update to 2.1.3. * gnu/packages/lisp.scm (sbcl): Update to 2.1.3. --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 29b32956db..3704d226fe 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -400,14 +400,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "2.1.2") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "02scrqyp2izsd8xjm2k5j5lhn4pdhd202jlcb54ysmcqjd80awdp")))) + (base32 "1h6s3as8m72ik971zy7a8j1kqfyy5gzpv9ksy09ixv65a10ll3d9")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit v1.2.3 From 109f13c0981b8134c98a2326f22cc837ec523712 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:18 +0200 Subject: gnu: libspatialite: Update dependencies. * gnu/packages/geo.scm (libspatialite, spatialite-tools): Update dependencies. [inputs]: Replace proj.4 with proj and remove zlib which is not used anymore since libspatialite started using minizip. (libspatialite)[arguments]: Fix regex to not disable more tests than necessary. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 97fa83b86b..8c98534a4a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -442,9 +442,8 @@ writing GeoTIFF information tags.") ("librttopo" ,librttopo) ("libxml2" ,libxml2) ("minizip" ,minizip) - ("proj.4" ,proj.4) - ("sqlite" ,sqlite) - ("zlib" ,zlib))) + ("proj" ,proj) + ("sqlite" ,sqlite))) (arguments `(#:configure-flags '("--enable-rttopo=yes") @@ -454,7 +453,7 @@ writing GeoTIFF information tags.") (add-after 'unpack 'ignore-broken-tests (lambda _ (substitute* '("test/Makefile.in") - (("\tcheck_sql_stm.*" all) "\tcheck_multithread$(EXEEXT) \\\n") + (("\tcheck_sql_stmt.* (check_sql_.*)" all tiny) (string-append "\t" tiny)) (("(\tch.*) check_v.*ble2.*$" all vt1) (string-append vt1 " \\\n")) (("\tch.* (check_v.*ble4.*)$" all vt4) (string-append "\t" vt4))) #t))))) @@ -1748,10 +1747,9 @@ associated attribute file (@file{.dbf}).") ("libspatialite" ,libspatialite) ("libxml2" ,libxml2) ("minizip" ,minizip) - ("proj.4" ,proj.4) + ("proj" ,proj) ("readosm" ,readosm) - ("sqlite" ,sqlite) - ("zlib" ,zlib))) + ("sqlite" ,sqlite))) (synopsis "Collection of command line tools for SpatiaLite") (description "@code{spatialite-tools} is a collection of Command Line Interface (CLI) -- cgit v1.2.3 From 5d32fa526d9d054f21fa3a40b7cb3e3cf468e4b9 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:19 +0200 Subject: gnu: Add libxlsxwriter. * gnu/packages/xml.scm (libxlsxwriter): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/xml.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index defc0323e6..130fe45995 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -29,6 +29,8 @@ ;;; Copyright © 2021 Michael Rohleder ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Julien Lepiller +;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +79,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix utils) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config)) @@ -215,6 +218,49 @@ hierarchical form with variable field lengths.") project (but it is usable outside of the Gnome platform).") (license license:x11))) +(define-public libxlsxwriter + (package + (name "libxlsxwriter") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmcnamara/libxlsxwriter") + (commit (string-append "RELEASE_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "070pfqggia71z4ichr5yrwfndfz903z941ns72vy0lvb1mpp7g05")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled minizip source + '(begin + (delete-file-recursively "third_party/minizip") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out")) + "USE_STANDARD_TMPFILE=1" + "USE_SYSTEM_MINIZIP=1") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (native-inputs + `(("python-pytest" ,python-pytest))) + (inputs + `(("minizip" ,minizip))) + (home-page "https://github.com/jmcnamara/libxlsxwriter") + (synopsis "C library for creating Excel XLSX files") + (description + "Libxlsxwriter is a C library that can be used to write text, numbers, +formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.") + (license (list license:bsd-2 + license:public-domain)))) ; third_party/md5 + ;; This is the latest stable release. (define-public libxmlplusplus (package -- cgit v1.2.3 From 3eb14c28d57e1e2c1a23e3d3a36e1091e10d5813 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:21 +0200 Subject: gnu: Add librasterlite2. * gnu/packages/geo.scm (librasterlite2): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8c98534a4a..d43b1a4e56 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -373,6 +373,63 @@ writing GeoTIFF information tags.") (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution."))))) +(define-public librasterlite2 + (package + (name "librasterlite2") + (version "1.1.0-beta1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://www.gaia-gis.it/gaia-sins/librasterlite2-sources/" + "librasterlite2-" version ".tar.gz")) + (sha256 + (base32 + "1x24gqp4hsq97c31ncwxblab0x0863q8v1z42jil7lvsq3glqa7p")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("curl" ,curl) + ("freetype" ,freetype) + ("freexl" ,freexl) + ("giflib" ,giflib) + ("libgeotiff" ,libgeotiff) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libpng" ,libpng) + ("librttopo" ,librttopo) + ("libspatialite" ,libspatialite) + ("libtiff" ,libtiff) + ("libwebp" ,libwebp) + ("libxml2" ,libxml2) + ("lz4" ,lz4) + ("minizip" ,minizip) + ("openjpeg" ,openjpeg) + ("proj" ,proj) + ("sqlite" ,sqlite) + ("zstd" ,zstd "lib"))) + (synopsis "Library to work with huge raster coverages using a SpatiaLite") + (description + "librasterlite2 is a library that stores and retrieves huge raster +coverages using a SpatiaLite DBMS.") + (home-page "https://www.gaia-gis.it/fossil/librasterlite2/index") + ;; For the genuine librasterlite-sources holds: + ;; Any of the licenses MPL1.1, GPL2+ or LGPL2.1+ may be picked. + ;; Files under src/control_points are from GRASS + ;; and are licensed under GPL2+ only. + ;; src/md5.[ch]: Placed into the public domain by Alexander Peslyak. + ;; The tools supporting the library (both rl2tool and wmslite) are + ;; licensed under the GPL v3 (or any subsequent version) terms. + ;; The test/*.svg files are placed in the public domain, except for + ;; test/Car_Yellow.svg which is licensed under the Free Art License 1.3. + (license (list license:gpl2+ + license:gpl3+ + license:lal1.3 + license:lgpl2.1+ + license:mpl1.1 + license:public-domain)))) + (define-public librttopo (package (name "librttopo") -- cgit v1.2.3 From 9bd2478e2ccca3da2edc74670bc4bf878cbb4f70 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:22 +0200 Subject: gnu: spatialite-gui: Update to 2.1.0-beta1. * gnu/packages/geo.scm (spatialite-gui): Update to 2.1.0-beta1. [inputs]: Replace proj.4 with proj and wxwidgets-2 with wxwidgets. Add curl, giflib, librasterlite2, librttopo, libwebp, libxlsxwriter, lz4, minizip, openjpeg, postgresql, virtualpg, zstd. Remove libgaiagraphics and zlib. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index d43b1a4e56..a2f274b379 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -742,29 +742,39 @@ development.") (define-public spatialite-gui (package (name "spatialite-gui") - (version "1.7.1") + (version "2.1.0-beta1") (source (origin (method url-fetch) - (uri (string-append "https://www.gaia-gis.it/gaia-sins/spatialite_gui-" - version ".tar.gz")) + (uri (string-append + "https://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/" + "spatialite_gui-" version ".tar.gz")) (sha256 - (base32 - "1r05dz9pyc8vsd2wbqxcsracpfbaamz470rcyp2myfpqwznv376b")))) + (base32 "0cyv4cycl073p9lnnnglcb72qn71g8h9g5zn4gzw7swcy5nxjj5s")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("freexl" ,freexl) + `(("curl" ,curl) + ("freexl" ,freexl) ("geos" ,geos) - ("libgaiagraphics" ,libgaiagraphics) + ("giflib" ,giflib) ("libjpeg-turbo" ,libjpeg-turbo) + ("librasterlite2" ,librasterlite2) + ("librttopo" ,librttopo) ("libspatialite" ,libspatialite) + ("libwebp" ,libwebp) + ("libxlsxwriter" ,libxlsxwriter) ("libxml2" ,libxml2) - ("proj.4" ,proj.4) + ("lz4" ,lz4) + ("minizip" ,minizip) + ("openjpeg" ,openjpeg) + ("postgresql" ,postgresql) + ("proj" ,proj) ("sqlite" ,sqlite) - ("wxwidgets" ,wxwidgets-2) - ("zlib" ,zlib))) + ("virtualpg" ,virtualpg) + ("wxwidgets" ,wxwidgets) + ("zstd" ,zstd "lib"))) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-gui -- cgit v1.2.3 From 46884fc4dfb6647583c22e2c17cf92acf4b13670 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:23 +0200 Subject: gnu: libgaiagraphics: Remove package. The libgaiagraphics package was deprecated upstream in 2014 in favor of librasterlite2 and after the update of spatialite-gui there are no more packages that depend on it. * gnu/packages/geo.scm (libgaiagraphics): Remove variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a2f274b379..be05fbe711 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -294,36 +294,6 @@ and driving.") (home-page "https://wiki.gnome.org/Apps/Maps") (license license:gpl2+))) -(define-public libgaiagraphics - (package - (name "libgaiagraphics") - (version "0.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.gaia-gis.it/gaia-sins/libgaiagraphics-" - version ".tar.gz")) - (sha256 - (base32 - "076afqv417ag3hfvnif0qc7qscmnq1dsf6y431yygwgf34rjkayc")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("cairo" ,cairo) - ("libpng" ,libpng) - ("libjpeg-turbo" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libgeotiff" ,libgeotiff) - ("proj.4" ,proj.4) - ("libxml2" ,libxml2) - ("zlib" ,zlib))) - (synopsis "Gaia common graphics support") - (description "libgaiagraphics is a library supporting - common-utility raster handling methods.") - (home-page "https://www.gaia-gis.it/fossil/libgaiagraphics/index") - (license license:lgpl3+))) - (define-public libgeotiff (package (name "libgeotiff") -- cgit v1.2.3 From 7c9016bbadee306d1d470a1b44fc2b640842281e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 29 Mar 2021 13:33:18 +0200 Subject: gnu: sbcl-ironclad: Update to 0.55. * gnu/packages/lisp-xyz.scm (sbcl-ironclad): Update to 0.55. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ab258efdfd..1e6880f90f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2094,7 +2094,7 @@ also be supported.") (define-public sbcl-ironclad (package (name "sbcl-ironclad") - (version "0.54") + (version "0.55") (source (origin (method git-fetch) @@ -2102,7 +2102,7 @@ also be supported.") (url "https://github.com/sharplispers/ironclad/") (commit (string-append "v" version)))) (sha256 - (base32 "07g0wpvfqq2yk23prs890d4qvbnr3xd6w8ssd88g89xdg483wpvk")) + (base32 "1w4slnc4143w1gcff1wxsivzb8kcji0bpd7y9rld3sabay0qprwl")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (native-inputs -- cgit v1.2.3 From b53e7ae6b0307f88192b291a62509e65fc57e377 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:46:34 +0300 Subject: gnu: python-dropbox: Update to 11.5.0. * gnu/packages/file-systems.scm (python-dropbox): Update to 11.5.0. --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 9877e5c433..d7c34cd188 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1083,14 +1083,14 @@ compatible directories.") (define-public python-dropbox (package (name "python-dropbox") - (version "11.2.0") + (version "11.5.0") (source (origin (method url-fetch) (uri (pypi-uri "dropbox" version)) (sha256 (base32 - "0ml6z37k6nkhkiy483kvifs8im8z7vabd2g9jl6fkf1fzy3n6bym")))) + "16bxx9xqx2s4d9khrw57a0bj4q7nc6kq355wl4pfddn9cqvh9rg2")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; Tests require a network connection. (native-inputs -- cgit v1.2.3 From bece1445b80a7b22724aea5a1a281de53e5d7f8f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:47:18 +0300 Subject: gnu: python-pytest-flake8: Update to 1.0.7. * gnu/packages/python-check.scm (python-pytest-flake8): Update to 1.0.7. --- gnu/packages/python-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 2f449bf0eb..7f27966796 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -627,14 +627,14 @@ friendly library for concurrency and async I/O in Python.") (define-public python-pytest-flake8 (package (name "python-pytest-flake8") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "pytest-flake8" version)) (sha256 (base32 - "09vhn7r77s1yiqnlwfvh5585f904zpyd6620a90dpccfr1cbp0hv")))) + "0syx68xk5ss3hgp3nr2y122w0fgkzr5936ghsqrkymh3m5hrf9gh")))) (build-system python-build-system) (propagated-inputs `(("python-flake8" ,python-flake8))) -- cgit v1.2.3 From 2ccf9216456178ac837dcb6cd1ab9b5381ff6710 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:47:52 +0300 Subject: gnu: python-backcall: Update to 0.2.0. * gnu/packages/python-xyz.scm (python-backcall): Update to 0.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9f57992fdd..e6d8f7cd18 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7380,14 +7380,14 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (define-public python-backcall (package (name "python-backcall") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (pypi-uri "backcall" version)) (sha256 (base32 - "1r01dqch3f8fdj3n6fviw8hxqrs6w5v0qw4izmvqzry1w9dxiv1q")))) + "07jy4562lvnhkk6kfr3cphmizy88anlhmbwb8kdzlz2ypqkvzgaw")))) (build-system python-build-system) (home-page "https://github.com/takluyver/backcall/") (synopsis "Specifications for callback functions passed in to an API") -- cgit v1.2.3 From c4b3747ddfbab45c991f63d0e328d7e948393b0f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:48:17 +0300 Subject: gnu: python-astor: Update to 0.8.1. * gnu/packages/python-xyz.scm (python-astor): Update to 0.8.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6d8f7cd18..d15c70a77c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20472,14 +20472,14 @@ of Python libraries for building Python applications.") (define-public python-astor (package (name "python-astor") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "astor" version)) (sha256 (base32 - "13gv6f2xz9i564byp21gcpc0l3w4cs23k1wbcam8kky2ls3hvhwm")))) + "0ppscdzzvxpznclkmhhj53iz314x3pfv4yc7c6gwxqgljgdgyvka")))) (build-system python-build-system) ;; FIXME: There are two errors and two test failures. (arguments `(#:tests? #f)) -- cgit v1.2.3 From 07481fec26717bd60956bb1aa2d5ccabdab0b42f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:56:30 +0300 Subject: gnu: python-tornado: Update to 6.1. * gnu/packages/python-web.scm (python-tornado): Update to 6.1. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 21af15b0a9..c7dd18ad19 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1688,14 +1688,14 @@ connection to each user.") (define-public python-tornado-6 (package (name "python-tornado") - (version "6.0.4") + (version "6.1") (source (origin (method url-fetch) (uri (pypi-uri "tornado" version)) (sha256 (base32 - "1p5n7sw4580pkybywg93p8ddqdj9lhhy72rzswfa801vlidx9qhg")))) + "14cpzdv6p6qvk6vn02krdh5rcfdi174ifdbr5s6lcnymgcfyiiik")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 01cf99af9ccd4977fd46549b99172299814cdc6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:56:58 +0300 Subject: gnu: python-pycodestyle: Update to 2.7.0. * gnu/packages/python-xyz.scm (python-pycodestyle): Update to 2.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d15c70a77c..9a0285036d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5595,14 +5595,14 @@ a simple netcat replacement with chaining support.") (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0bhr6ia0hmgx3nhgibc9pmkzhlh1zcqk707i5fbxgs702ll7v2n5")))) + "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From d41d96d8360c3e68a421a576cdf9c96d1287ffc9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:57:24 +0300 Subject: gnu: python-pyzmq: Update to 22.0.3. * gnu/packages/python-xyz.scm (python-pyzmq): Update to 22.0.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9a0285036d..a439e35b11 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8475,13 +8475,13 @@ applications.") (define-public python-pyzmq (package (name "python-pyzmq") - (version "17.1.2") + (version "22.0.3") (source (origin (method url-fetch) (uri (pypi-uri "pyzmq" version)) (sha256 - (base32 "1pyxxrz60f88ffm0y6vpbx3q8jcr9ybz8fcilihwzwhh36n84ax7")))) + (base32 "0bgrn65cxfz1c1sjrgyq5dy1mkhppxxbizd5wvrl03cq4zhkrxpp")))) (build-system python-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 91741db5397174a2e96b4010c3c9ff53d34e8ef0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:57:47 +0300 Subject: gnu: python-pyflakes: Update to 2.3.1. * gnu/packages/python-xyz.scm (python-pyflakes): Update to 2.3.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a439e35b11..efdbcf896a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8564,14 +8564,14 @@ PEP 8.") (define-public python-pyflakes (package (name "python-pyflakes") - (version "2.2.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "1j3zqbiwkyicvww499bblq33x0bjpzdrxajhaysr7sk7x5gdgcim")))) + "1ny10364ciqh4ripasj4zzv4145l21l3s85m3qlrvfq5pk58xg7m")))) (build-system python-build-system) (home-page "https://github.com/pyflakes/pyflakes") -- cgit v1.2.3 From 9095fccd0ea7789d5b87e5d1948d875d2029f7da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:58:13 +0300 Subject: gnu: python-flake8: Update to 3.9.0. * gnu/packages/python-xyz.scm (python-flake8): Update to 3.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index efdbcf896a..cc9d9c2721 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8611,13 +8611,13 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "3.8.4") + (version "3.9.0") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0fvcrsbyzjpcli8ldbpsdbpmf238nkvwc1dy4hy82lf63rvfinma")))) + "1w65iyjnrwipv4dbcqxh725ri7mdx01d6pjyggd97c0j5cvkx1vq")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6960cfe9241c5f2ce05b65aaa901bf5e3e0cc198 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 17:03:24 +0300 Subject: gnu: python-beautifulsoup4: Update to 4.9.3. * gnu/packages/python-xyz.scm (python-beautifulsoup4): Update to 4.9.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cc9d9c2721..7b6c3aa9f9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7794,14 +7794,14 @@ the GObject Introspection bindings to libnotify for non-GTK applications.") (define-public python-beautifulsoup4 (package (name "python-beautifulsoup4") - (version "4.9.1") + (version "4.9.3") (source (origin (method url-fetch) (uri (pypi-uri "beautifulsoup4" version)) (sha256 (base32 - "1mvzlw3pzbhsvl3z8784s5h7iiflm2hggiy1fxyrrxwnbc8lvk3k")))) + "09gbd49mwz86k572r1231x2rdp82p42zlnw0bz9b9mfi58r9wwl4")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From dd880b6f53cce6bc845b19ad16a5948280665bf9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 17:04:04 +0300 Subject: gnu: python-soupsieve: Update to 2.2.1. * gnu/packages/python-xyz.scm (python-soupsieve): Update to 2.2.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7b6c3aa9f9..c90a89a411 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7837,14 +7837,14 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.") (define-public python-soupsieve (package (name "python-soupsieve") - (version "2.0.1") + (version "2.2.1") (source (origin (method url-fetch) (uri (pypi-uri "soupsieve" version)) (sha256 (base32 - "0ch2rhvsbwfpvzm4kzy81rclbzr533yv83hzg1gx55byfa0w37d5")))) + "1k70gpn2d3vgdyxbdy536dgm4kchcraxz6lmgsfg3324iy2789q5")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;;XXX: 2 tests fail currently despite claming they were to be -- cgit v1.2.3 From be34826886508a52babd05477d89d39bae6ff454 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 17:18:38 +0300 Subject: gnu: perl-test-output: Update to 1.033. * gnu/packages/perl-check.scm (perl-test-output): Update to 1.033. --- gnu/packages/perl-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 117acd5d1a..a761ebffcf 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1096,14 +1096,14 @@ classes in its inheritance tree in one single call.") (define-public perl-test-output (package (name "perl-test-output") - (version "1.031") + (version "1.033") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BD/BDFOY/" "Test-Output-" version ".tar.gz")) (sha256 (base32 - "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q")))) + "0vjm62c7g3xxs3h4lba55dnpr4pg71yrhkdg5b9glxdh80klia7n")))) (build-system perl-build-system) (propagated-inputs `(("perl-capture-tiny" ,perl-capture-tiny) -- cgit v1.2.3 From 5dbc2e339264c11ff74580b9d8033e55d7c3bf17 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 17:19:16 +0300 Subject: gnu: perl-params-util: Update to 1.102. * gnu/packages/perl.scm (perl-params-util): Update to 1.102. [source]: Update source URI. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7203481d74..bf6dabf611 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8135,16 +8135,16 @@ designed for the more complex job, such as @code{Params::Validate}") (define-public perl-params-util (package (name "perl-params-util") - (version "1.07") + (version "1.102") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-" + "mirror://cpan/authors/id/R/RE/REHSACK/Params-Util-" version ".tar.gz")) (sha256 (base32 - "0v67sx93yhn7xa0nh9mnbf8mixf54czk6wzrjsp6dzzr5hzyrw9h")))) + "00kl154zisf2zsl8yl6xa6yw54nhd9cja5d5fyigs96vhasb36s9")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Params-Util") (synopsis "Simple, compact and correct param-checking functions") -- cgit v1.2.3 From 35044d3e3ef183fd3b6986e3a86d6c7a1c8164a4 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:50 +0100 Subject: gnu: Add julia-constructionbase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-constructionbase): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 0d35cbde57..7fbb18347f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Nicolò Balzarotti +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -117,6 +118,27 @@ provides a macro that lets you use the latest syntax in a backwards-compatible way.") (license license:expat))) +(define-public julia-constructionbase + (let ((commit "de77e2865b554f9b078fd8c35b593cce0554ae02")) + (package + (name "julia-constructionbase") + (version "1.1.0") ;tag not created upstream + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaObjects/ConstructionBase.jl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y79sfj0rds1skl9j16p9161hwa9khm0xc2m4hgjcbh5zzvyr57v")))) + (build-system julia-build-system) + (home-page "https://juliaobjects.github.io/ConstructionBase.jl/dev/") + (synopsis "Primitive functions for construction of objects") + (description "This very lightweight package provides primitive functions +for construction of objects.") + (license license:expat)))) + (define-public julia-datastructures (package (name "julia-datastructures") -- cgit v1.2.3 From 45debc7b855a97604d73da2dbf1b65bb5a080955 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:51 +0100 Subject: gnu: Add julia-macrotools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-macrotools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 7fbb18347f..5ba85f8bc0 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -344,6 +344,27 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") and printing JSON documents.") (license license:expat))) +(define-public julia-macrotools + (package + (name "julia-macrotools") + (version "0.5.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluxML/MacroTools.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k4z2hyasd9cwxf4l61zk3w4ajs44k69wx6z1ghdn8f5p8xy217f")))) + (build-system julia-build-system) + (home-page "https://fluxml.ai/MacroTools.jl") + (synopsis "Tools for working with Julia code and expressions") + (description "This library provides tools for working with Julia code and +expressions. This includes a template-matching system and code-walking tools +that let you do deep transformations of code.") + (license license:expat))) + (define-public julia-mbedtls (package (name "julia-mbedtls") -- cgit v1.2.3 From a5edd83ddb3aec9a896848b6a8b40e8aefbf2f68 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:52 +0100 Subject: gnu: Add julia-nanmath. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-nanmath): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 5ba85f8bc0..6508fa52af 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -435,6 +435,26 @@ TLS} and cryptography C libary for Julia.") wrappers.") (license license:expat))) +(define-public julia-nanmath + (package + (name "julia-nanmath") + (version "0.3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mlubin/NaNMath.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hczhz00qj99w63vp627kwk02l2sr2qmzc2rkwwkdwvzy670p25q")))) + (build-system julia-build-system) + (home-page "https://github.com/mlubin/NaNMath.jl") + (synopsis "Implementations of basic math functions") + (description "Implementations of basic math functions which return +@code{NaN} instead of throwing a @code{DomainError}.") + (license license:expat))) + (define-public julia-orderedcollections (package (name "julia-orderedcollections") -- cgit v1.2.3 From 02543b524b0a73619d9ef6fae336015b12df3ffa Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:53 +0100 Subject: gnu: Add julia-reexport. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-reexport): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 6508fa52af..41acd06ee3 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -522,6 +522,25 @@ languages like Fortran.") utilities for Julia.") (license license:expat))) +(define-public julia-reexport + (package + (name "julia-reexport") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simonster/Reexport.jl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yhhja1zz6dy5f4fd19bdwd6jwgj7q4w3avzgyg1hjhmdl8jrh0s")))) + (build-system julia-build-system) + (home-page "https://github.com/simonster/Reexport.jl") + (synopsis "Re-export modules and symbols") + (description "This package provides tools to re-export modules and symbols.") + (license license:expat))) + (define-public julia-uris (package (name "julia-uris") -- cgit v1.2.3 From 57653707944f8907da23c729616902782d225ff0 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:54 +0100 Subject: gnu: Add julia-irtools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-irtools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 41acd06ee3..613b3bb9dc 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -276,6 +276,32 @@ implementing both a client and a server.") allows to interface with @file{.ini} files.") (license license:expat))) +(define-public julia-irtools + (package + (name "julia-irtools") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluxML/IRTools.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wwzy77jcdnffnd5fr6xan7162g4wydz67igrq82wflwnrhlcx5y")))) + (arguments + '(#:tests? #f)) ;require Documenter, not packaged yet + (build-system julia-build-system) + (propagated-inputs + `(("julia-macrotools" ,julia-macrotools))) + (home-page "https://github.com/FluxML/IRTools.jl") + (synopsis "Simple and flexible IR format") + (description "This package provides a simple and flexible IR format, +expressive enough to work with both lowered and typed Julia code, as well as +external IRs. It can be used with Julia metaprogramming tools such as +Cassette.") + (license license:expat))) + (define-public julia-jllwrappers (package (name "julia-jllwrappers") -- cgit v1.2.3 From be8022773741b4bb7b532511774246ea6d258106 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:55 +0100 Subject: gnu: Add julia-staticarrays. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-staticarrays): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 613b3bb9dc..45d18d028f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -567,6 +567,31 @@ utilities for Julia.") (description "This package provides tools to re-export modules and symbols.") (license license:expat))) +(define-public julia-staticarrays + (package + (name "julia-staticarrays") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaArrays/StaticArrays.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01z8bcqwpfkp8p1h1r36pr5cc3798y76zkas7g3206pcsdhvlkz1")))) + (build-system julia-build-system) + (inputs + `(("julia-benchmarktools" ,julia-benchmarktools))) + (home-page "https://github.com/JuliaArrays/StaticArrays.jl") + (synopsis "Statically sized arrays") + (description "This package provides a framework for implementing +statically sized arrays in Julia, using the abstract type +@code{StaticArray{Size,T,N} <: AbstractArray{T,N}}. Subtypes of +@code{StaticArray} will provide fast implementations of common array and +linear algebra operations.") + (license license:expat))) + (define-public julia-uris (package (name "julia-uris") -- cgit v1.2.3 From a8e3be6aa124151420282d2576af916a89a1b23f Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:56 +0100 Subject: gnu: Add julia-unitful. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-unitful): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 45d18d028f..7a3529fe8f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -625,3 +625,25 @@ linear algebra operations.") working with @acronym{URIs,Uniform Resource Identifiers}, as defined in RFC 3986.") (license license:expat))) + +(define-public julia-unitful + (package + (name "julia-unitful") + (version "1.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PainterQubits/Unitful.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g5bhlvay9yk11c5dqwbzmb3q7lzj0cq5zchyk39d59fkvvmxvq3")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-constructionbase" ,julia-constructionbase))) + (home-page "https://painterqubits.github.io/Unitful.jl/stable/") + (synopsis "Physical units in Julia") + (description "This package supports SI units and also many other unit +system.") + (license license:expat))) -- cgit v1.2.3 From 651a55738973c36524c05b3e65b02bccfc352743 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:57 +0100 Subject: gnu: Add julia-abstractffts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-abstractffts): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 7a3529fe8f..4abeaa765f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -24,6 +24,31 @@ #:use-module (guix build-system julia) #:use-module (gnu packages tls)) +(define-public julia-abstractffts + (package + (name "julia-abstractffts") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/AbstractFFTS.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0083pwdyxjb04i330ir9pc8kmp4bwk59lx1jgc9qi05y8j7xzbp0")))) + (build-system julia-build-system) + (inputs ;required for tests + `(("julia-unitful" ,julia-unitful))) + (home-page "https://github.com/JuliaGPU/Adapt.jl") + (synopsis "General framework for fast Fourier transforms (FFTs)") + (description "This package allows multiple FFT packages to co-exist with +the same underlying @code{fft(x)} and @code{plan_fft(x)} interface. It is +mainly not intended to be used directly. Instead, developers of packages that +implement FFTs (such as @code{FFTW.jl} or @code{FastTransforms.jl}) extend the +types/functions defined in AbstractFFTs.") + (license license:expat))) + (define-public julia-adapt (package (name "julia-adapt") -- cgit v1.2.3 From 9b8b132e639495d33098fd42a0d32d5117e5a799 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 23 Mar 2021 20:45:58 +0100 Subject: gnu: Add julia-colortypes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-colortypes): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 4abeaa765f..8d28aab7f1 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -121,6 +121,32 @@ operations. It can wrap any @code{IO} type automatically making incremental reading and writing faster.") (license license:expat))) +(define-public julia-colortypes + (package + (name "julia-colortypes") + (version "0.10.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaGraphics/ColorTypes.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "176hr3qbz7lncmykks2qaj3cqisnzim7wi5jwsca9ld26wwyvyqq")))) + (arguments + '(#:tests? #f)) ;require Documenter, not packaged yet + (build-system julia-build-system) + (propagated-inputs + `(("julia-fixedpointnumbers" ,julia-fixedpointnumbers))) + (home-page "https://github.com/JuliaGraphics/ColorTypes.jl") + (synopsis "Basic color types and constructor") + (description "This minimalistic package serves as the foundation for +working with colors in Julia. It defines basic color types and their +constructors, and sets up traits and show methods to make them easier to work +with.") + (license license:expat))) + (define-public julia-compat (package (name "julia-compat") -- cgit v1.2.3 From 13a8b866b193e65113620ee43eecbb8d94c1bbfb Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:58 +0100 Subject: gnu: Add julia-colors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-colors): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 8d28aab7f1..ab238161e9 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -121,6 +121,32 @@ operations. It can wrap any @code{IO} type automatically making incremental reading and writing faster.") (license license:expat))) +(define-public julia-colors + (package + (name "julia-colors") + (version "0.12.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaGraphics/Colors.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "156zsszgwh6bmznsan0zyha6yvcxw3c5mvc5vr2qfsgxbyh36ln6")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-colortypes" ,julia-colortypes) + ("julia-fixedpointnumbers" ,julia-fixedpointnumbers) + ("julia-reexport" ,julia-reexport))) + (home-page "https://github.com/JuliaGraphics/Colors.jl") + (synopsis "Tools for dealing with color") + (description "This package provides a wide array of functions for dealing +with color. This includes conversion between colorspaces, measuring distance +between colors, simulating color blindness, parsing colors, and generating +color scales for graphics.") + (license license:expat))) + (define-public julia-colortypes (package (name "julia-colortypes") -- cgit v1.2.3 From fffb1e725b31d59d6825e8902a72f33f27de44c2 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:59 +0100 Subject: gnu: Add julia-example. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-example): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index ab238161e9..f21ea0afb0 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -240,6 +240,26 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, @code{Accumulators}, @code{LinkedLists}, @code{SortedDicts} and many others.") (license license:expat))) +(define-public julia-example + (let ((commit "f968c69dea24f851d0c7e686db23fa55826b5388")) + (package + (name "julia-example") + (version "0.5.4") ;tag not created upstream + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaLang/Example.jl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v3z0d6gh6wfbypffy9m9rhh36px6fm5wjzq0y6rbmc95r0qpqlx")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaLang/Example.jl") + (synopsis "Module providing examples") + (description "This package provides various examples.") + (license license:expat)))) + (define-public julia-fixedpointnumbers (package (name "julia-fixedpointnumbers") -- cgit v1.2.3 From 658fca53e9dd04727144f1e7b30b77d1a1481f4f Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:00 +0100 Subject: gnu: Add julia-requires. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-requires): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index f21ea0afb0..8e95c8b7ed 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -664,6 +664,32 @@ utilities for Julia.") (description "This package provides tools to re-export modules and symbols.") (license license:expat))) +(define-public julia-requires + (package + (name "julia-requires") + (version "1.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaPackaging/Requires.jl/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03hyfy7c0ma45b0y756j76awi3az2ii4bz4s8cxm3xw9yy1z7b01")))) + (build-system julia-build-system) + (inputs ;required for test + `(("julia-example" ,julia-example))) + (propagated-inputs + `(("julia-colors" ,julia-colors))) + (home-page "https://github.com/JuliaPackaging/Requires.jl/") + (synopsis "Faster package loader") + (description "This package make loading packages faster, maybe. It +supports specifying glue code in packages which will load automatically when +another package is loaded, so that explicit dependencies (and long load times) +can be avoided.") + (license license:expat))) + (define-public julia-staticarrays (package (name "julia-staticarrays") -- cgit v1.2.3 From bb1ca1f372025e9e28513ae831c6e239404860a8 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:01 +0100 Subject: gnu: Add julia-chainrulescore. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-chainrulescore): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 8e95c8b7ed..0da2452b89 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -121,6 +121,31 @@ operations. It can wrap any @code{IO} type automatically making incremental reading and writing faster.") (license license:expat))) +(define-public julia-chainrulescore + (package + (name "julia-chainrulescore") + (version "0.9.29") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/ChainRulesCore.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1k0iayw39n1ikkkhvyi4498vsnzc94skqs41gnd15632gxjfvki4")))) + (build-system julia-build-system) + (inputs ;required for tests + `(("julia-benchmarktools" ,julia-benchmarktools) + ("julia-staticarrays" ,julia-staticarrays))) + (propagated-inputs + `(("julia-compat" ,julia-compat))) + (home-page "https://github.com/JuliaDiff/ChainRulesCore.jl") + (synopsis "Common utilities used by downstream automatic differentiation tools") + (description "The package provides a light-weight dependency for defining +sensitivities for functions without the need to depend on ChainRules itself.") + (license license:expat))) + (define-public julia-colors (package (name "julia-colors") -- cgit v1.2.3 From dd7a77c34566c450945facbca0c0fb634e4246a5 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:02 +0100 Subject: gnu: Add julia-richardson. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-richardson): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 0da2452b89..b56fa5427e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -715,6 +715,33 @@ another package is loaded, so that explicit dependencies (and long load times) can be avoided.") (license license:expat))) +(define-public julia-richardson + (package + (name "julia-richardson") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/Richardson.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06v9ii3d7hh41fsrfklaa8ap55z5s017f888mrd1c18y4fx9i4nx")))) + (build-system julia-build-system) + (home-page "https://juliapackages.com/p/richardson") + (synopsis "Extrapolate function using Richardson method") + (description "This package provides a function extrapolate that +extrapolates a given function @code{f(x)} to @code{f(x0)}, evaluating @code{f} +only at a geometric sequence of points @code{> x0} (or optionally @code{< +x0}). The key algorithm is Richardson extrapolation using a Neville–Aitken +tableau, which adaptively increases the degree of an extrapolation polynomial +until convergence is achieved to a desired tolerance (or convergence stalls +due to e.g. floating-point errors). This allows one to obtain @code{f(x0)} to +high-order accuracy, assuming that @code{f(x0+h)} has a Taylor series or some +other power series in @code{h}.") + (license license:expat))) + (define-public julia-staticarrays (package (name "julia-staticarrays") -- cgit v1.2.3 From f6c5a8982b40539a2908e9a7d7801147adbd30d9 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:03 +0100 Subject: gnu: Add julia-finitedifferences. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-finitedifferences): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b56fa5427e..ed05af6497 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -285,6 +285,32 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, (description "This package provides various examples.") (license license:expat)))) +(define-public julia-finitedifferences + (package + (name "julia-finitedifferences") + (version "0.12.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/FiniteDifferences.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dcx34026xdpfmbjls3mrknl8ww62kxxfr77kfihbazsfg2gp5b4")))) + (build-system julia-build-system) + (inputs + `(("julia-benchmarktools" ,julia-benchmarktools))) + (propagated-inputs + `(("julia-chainrulescore" ,julia-chainrulescore) + ("julia-richardson" ,julia-richardson) + ("julia-staticarrays" ,julia-staticarrays))) + (home-page "https://github.com/JuliaDiff/FiniteDifferences.jl") + (synopsis "Estimates derivatives with finite differences") + (description "This package calculates approximate derivatives numerically +using finite difference.") + (license license:expat))) + (define-public julia-fixedpointnumbers (package (name "julia-fixedpointnumbers") -- cgit v1.2.3 From 9eb293960a473c9cc56f66b6cae428516f9c3898 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:04 +0100 Subject: gnu: Add julia-chainrulestestutils. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-chainrulestestutils): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index ed05af6497..4e63c04c5e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -146,6 +146,38 @@ reading and writing faster.") sensitivities for functions without the need to depend on ChainRules itself.") (license license:expat))) +(define-public julia-chainrulestestutils + (package + (name "julia-chainrulestestutils") + (version "0.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/ChainRulesTestUtils.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pzs947adnb3cx1qd0cxp2fidk9szz0zsqbas90z1lhydykkvkil")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-chainrulescore" ,julia-chainrulescore) + ("julia-compat" ,julia-compat) + ("julia-finitedifference" ,julia-finitedifferences))) + (home-page "https://github.com/JuliaDiff/ChainRulesTestUtils.jl") + (synopsis "Common utilities used by downstream automatic differentiation tools") + (description "This package is designed to help in testing +@code{ChainRulesCore.frule} and @code{ChainRulesCore.rrule} methods. The main +entry points are @code{ChainRulesTestUtils.frule_test}, +@code{ChainRulesTestUtils.rrule_test}, and +@code{ChainRulesTestUtils.test_scalar}. Currently this is done via testing the +rules against numerical differentiation (using @code{FiniteDifferences.jl}). + +@code{ChainRulesTestUtils.jl} is separated from @code{ChainRulesCore.jl} so that it +can be a test-only dependency, allowing it to have potentially heavy +dependencies, while keeping @code{ChainRulesCore.jl} as light-weight as possible.") + (license license:expat))) + (define-public julia-colors (package (name "julia-colors") -- cgit v1.2.3 From a0d3a73fc617eccc8f21a2b1e1164ca1c856ddeb Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:05 +0100 Subject: gnu: Add julia-fillarrays. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-fillarrays): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 4e63c04c5e..e3d2c9ff89 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -317,6 +317,30 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, (description "This package provides various examples.") (license license:expat)))) +(define-public julia-fillarrays + (package + (name "julia-fillarrays") + (version "0.11.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaArrays/FillArrays.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q1qn9pb5dmppddnmf8gggdqyvivqh3ffvbblhn37smcf9r5sy7d")))) + (build-system julia-build-system) + (inputs ;required by tests + `(("julia-staticarrays" ,julia-staticarrays))) + (home-page "https://github.com/JuliaArrays/FillArrays.jl") + (synopsis "Lazy matrix representation") + (description "This package allows to lazily represent matrices filled with +a single entry, as well as identity matrices. This package exports the +following types: @code{Eye}, @code{Fill}, @code{Ones}, @code{Zeros}, +@code{Trues} and @code{Falses}.") + (license license:expat))) + (define-public julia-finitedifferences (package (name "julia-finitedifferences") -- cgit v1.2.3 From 2ca38ee4e70cdbd26a1faa719e1a4ec8ef6476e3 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:06 +0100 Subject: gnu: Add julia-commonsubexpressions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-commonsubexpressions): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index e3d2c9ff89..c5c04d6579 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -230,6 +230,28 @@ constructors, and sets up traits and show methods to make them easier to work with.") (license license:expat))) +(define-public julia-commonsubexpressions + (package + (name "julia-commonsubexpressions") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rdeits/CommonSubexpressions.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mgy90kk8ksv3l720kkk04gnhn4aqhh2dj4sp3x8yy3limngfjay")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-macrotools" ,julia-macrotools))) + (home-page "https://github.com/rdeits/CommonSubexpressions.jl") + (synopsis "Macro @code{@cse}") + (description "This package provides the @code{@cse} macro, which performs +common subexpression elimination.") + (license license:expat))) + (define-public julia-compat (package (name "julia-compat") -- cgit v1.2.3 From b91ad8324dec459181cb664863a36fd6616a63eb Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 23 Mar 2021 20:46:41 +0100 Subject: gnu: Add julia-calculus. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-calculus): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index c5c04d6579..75b46a1c7c 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -121,6 +121,30 @@ operations. It can wrap any @code{IO} type automatically making incremental reading and writing faster.") (license license:expat))) +(define-public julia-calculus + (package + (name "julia-calculus") + (version "0.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/Calculus.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xh0ak2ycsjw2h86ja24ch3kn2d18zx3frrds78aimwdnqb1gdc2")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaMath/Calculus.jl") + (synopsis "Common utilities for automatic differentiation") + (description "This package provides tools for working with the basic +calculus operations of differentiation and integration. The @code{Calculus} +package produces approximate derivatives by several forms of finite +differencing or produces exact derivative using symbolic differentiation. It +can also be used to compute definite integrals by different numerical +methods.") + (license license:expat))) + (define-public julia-chainrulescore (package (name "julia-chainrulescore") -- cgit v1.2.3 From 7bf791ee8fdc23f01307098410dcb45eea656d70 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:07 +0100 Subject: gnu: Add julia-diffresults. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-diffresults): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 75b46a1c7c..885a851375 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -343,6 +343,28 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, @code{Accumulators}, @code{LinkedLists}, @code{SortedDicts} and many others.") (license license:expat))) +(define-public julia-diffresults + (package + (name "julia-diffresults") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/DiffResults.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1w6p3yxajvclax5b9g7cr2jmbc7lvr5nk4gq0aljxdycdq1d2y3v")))) + (propagated-inputs + `(("julia-staticarrays" ,julia-staticarrays))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaDiff/DiffResults.jl") + (synopsis "In-place differentiation methods of primal values at multi-order") + (description "This package provides the @code{DiffResult} type, which can +be passed to in-place differentiation methods instead of an output buffer.") + (license license:expat))) + (define-public julia-example (let ((commit "f968c69dea24f851d0c7e686db23fa55826b5388")) (package -- cgit v1.2.3 From df4be2e910ff7a394856f4006ecd262cd0136456 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:08 +0100 Subject: gnu: Add julia-difftests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-difftests): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 885a851375..9b04e1bd67 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -365,6 +365,26 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, be passed to in-place differentiation methods instead of an output buffer.") (license license:expat))) +(define-public julia-difftests + (package + (name "julia-difftests") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/DiffTests.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rxpnd5zi3pxgdd38l5jm2sxc3q6p7g57fqgll2dsiin07y3my57")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaDiff/DiffTests.jl") + (synopsis "Common test functions for differentiation tools") + (description "This package contains a common suite of test functions for +stressing the robustness of differentiation tools.") + (license license:expat))) + (define-public julia-example (let ((commit "f968c69dea24f851d0c7e686db23fa55826b5388")) (package -- cgit v1.2.3 From 4d69758f5bc847c3bc36e1ae2b6b2416391c3913 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:09 +0100 Subject: gnu: Add julia-compilersupportlibraries-jll. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-compilersupportlibraries-jll): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 9b04e1bd67..bde72e364d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system julia) + #:use-module (gnu packages gcc) #:use-module (gnu packages tls)) (define-public julia-abstractffts @@ -298,6 +299,50 @@ provides a macro that lets you use the latest syntax in a backwards-compatible way.") (license license:expat))) +;;; TODO: Remove this autogenerated source package +;;; and build it from realse source using +(define-public julia-compilersupportlibraries-jll + (package + (name "julia-compilersupportlibraries-jll") + (version "0.4.0+1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl") + (commit (string-append "CompilerSupportLibraries-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03j6xdvps259mhdzpjqf41l65w2l9sahvxg4wrp34hcf69wkrzpy")))) + (build-system julia-build-system) + (arguments + `(#:tests? #f ; no runtests.jl + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"CompilerSupportLibraries\", \"" + (assoc-ref inputs "gfortran:lib") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$")) + #t))))) + (inputs ;required by artifacts + `(("gfortran:lib" ,gfortran "lib"))) + (propagated-inputs + `(("julia-jllwrappers" ,julia-jllwrappers))) + (home-page "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl") + (synopsis "Internal wrappers") + (description "This package provides compiler support for libraries. It is +an autogenerated source package constructed using @code{BinaryBuilder.jl}. The +originating @code{build_tarballs.jl} script can be found on the community +build tree Yggdrasil.") + (license license:expat))) + (define-public julia-constructionbase (let ((commit "de77e2865b554f9b078fd8c35b593cce0554ae02")) (package -- cgit v1.2.3 From 73052c70051cdbf54af9d88aac0b1a821c10b901 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:10 +0100 Subject: gnu: Add julia-openspecfun-jll. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-openspecfun-jll): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index bde72e364d..d99eadcfd4 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -23,6 +23,7 @@ #:use-module (guix git-download) #:use-module (guix build-system julia) #:use-module (gnu packages gcc) + #:use-module (gnu packages maths) #:use-module (gnu packages tls)) (define-public julia-abstractffts @@ -865,6 +866,52 @@ have arbitrary indices, similar to those found in some other programming languages like Fortran.") (license license:expat))) +;;; TODO: Remove this autogenerated source package +;;; and build it from realse source using +(define-public julia-openspecfun-jll +(let ((commit "6c505cce3bdcd9cd2b15b4f9362ec3a42c4da71c")) + (package + (name "julia-openspecfun-jll") + (version "0.5.3+4") ;tag not created upstream + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/OpenSpecFun_jll.jl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bl2gcgndsbiwhwy8fl070cjm1fyf9kxj6gkikgirmzgjl29iakn")))) + (build-system julia-build-system) + (arguments + `(#:tests? #f ; no runtests.jl + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"OpenSpecFun\", \"" + (assoc-ref inputs "openspecfun") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$")) + #t))))) + (inputs + `(("openspecfun" ,openspecfun))) + (propagated-inputs + `(("julia-jllwrappers" ,julia-jllwrappers) + ("julia-compilersupportlibraries-jll" ,julia-compilersupportlibraries-jll))) + (home-page "https://github.com/JuliaBinaryWrappers/OpenSpecFun_jll.jl") + (synopsis "Internal wrappers") + (description "This package provides a wrapper for OpenSpecFun. It is an +autogenerated source package constructed using @code{BinaryBuilder.jl}. The +originating @code{build_tarballs.jl} script can be found on the community +build tree Yggdrasil.") + (license license:expat)))) + (define-public julia-parsers (package (name "julia-parsers") -- cgit v1.2.3 From 3d98a16ab4d4f35211d79f25bb46bf74629c1408 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:11 +0100 Subject: gnu: Add julia-specialfunctions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-specialfunctions): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index d99eadcfd4..4bd5a1f9a3 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1004,6 +1004,33 @@ high-order accuracy, assuming that @code{f(x0+h)} has a Taylor series or some other power series in @code{h}.") (license license:expat))) +(define-public julia-specialfunctions + (package + (name "julia-specialfunctions") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/SpecialFunctions.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rfhrrkzi3ils7fklbn35ki1yp5x88fi71qknfwqyw4pk8cf8p80")))) + (build-system julia-build-system) + (inputs + `(("julia-chainrulestestutils" ,julia-chainrulestestutils))) + (propagated-inputs + `(("julia-chainrulescore" ,julia-chainrulescore) + ("julia-openspecfun-jll" ,julia-openspecfun-jll))) + (home-page "https://github.com/JuliaMath/SpecialFunctions.jl") + (synopsis "Special mathematical functions") + (description "This package provides special mathematical functions, +including Bessel, Hankel, Airy, error, Dawson, exponential (or sine and +cosine) integrals, eta, zeta, digamma, inverse digamma, trigamma, and +polygamma functions.") + (license license:expat))) + (define-public julia-staticarrays (package (name "julia-staticarrays") -- cgit v1.2.3 From 33e5152aeb1ae6d7dc4da792173492e92875a8d7 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:12 +0100 Subject: gnu: Add julia-diffrules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-diffrules): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 4bd5a1f9a3..fe1ecf0c9d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -411,6 +411,31 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, be passed to in-place differentiation methods instead of an output buffer.") (license license:expat))) +(define-public julia-diffrules + (package + (name "julia-diffrules") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/DiffRules.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cwjvj4gma7924fm3yas0nf0jlnwwx4v7fi79ii3s290lkdldzfl")))) + (propagated-inputs + `(("julia-nanmath" ,julia-nanmath) + ("julia-specialfunctions" ,julia-specialfunctions))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaDiff/DiffRules.jl") + (synopsis "Primitive differentiation rules") + (description "This package provides primitive differentiation rules that +can be composed via various formulations of the chain rule. Using +@code{DiffRules}, new differentiation rules can defined, query whether or not +a given rule exists, and symbolically apply rules to simple Julia expressions.") + (license license:expat))) + (define-public julia-difftests (package (name "julia-difftests") -- cgit v1.2.3 From 397f8c48747a3fbb76c3fe5a3a67b9eae21f9cbb Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:13 +0100 Subject: gnu: Add julia-chainrules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-chainrules): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index fe1ecf0c9d..b526306984 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -147,6 +147,37 @@ can also be used to compute definite integrals by different numerical methods.") (license license:expat))) +(define-public julia-chainrules + (package + (name "julia-chainrules") + (version "0.7.54") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/ChainRules.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1x4w71v8cw0vpba47h8f5xq4gyjfxbcvayzf7m41yg8gf49s9pkf")))) + (build-system julia-build-system) + (inputs ;required for test + `(("julia-chainrulestestutils" ,julia-chainrulestestutils) + ("julia-finitedifferences" ,julia-finitedifferences) + ("julia-nanmath" ,julia-nanmath) + ("julia-specialfunctions" ,julia-specialfunctions))) + (propagated-inputs + `(("julia-chainrulescore" ,julia-chainrulescore) + ("julia-compat" ,julia-compat) + ("julia-reexport" ,julia-reexport) + ("julia-requires" ,julia-requires))) + (home-page "https://github.com/JuliaDiff/ChainRules.jl") + (synopsis "Common utilities for automatic differentiation") + (description "The is package provides a variety of common utilities that +can be used by downstream automatic differentiation (AD) tools to define and +execute forward-, reverse-, and mixed-mode primitives.") + (license license:expat))) + (define-public julia-chainrulescore (package (name "julia-chainrulescore") -- cgit v1.2.3 From 57e034d568226b83974de817f8f09c3ba3ea2360 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:14 +0100 Subject: gnu: Add julia-forwarddiff. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-forwarddiff): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b526306984..9a414fc739 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -592,6 +592,38 @@ scaled by a constant factor. Consequently, they have a fixed number of digits (bits) after the decimal (radix) point.") (license license:expat))) +(define-public julia-forwarddiff + (package + (name "julia-forwarddiff") + (version "0.10.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/ForwardDiff.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17xaz4v0zr46p7w873w1fwf31phdnhr0vbdym9yr4flmpzi528jw")))) + (build-system julia-build-system) + (inputs ;required for tests + `(("julia-calculus" ,julia-calculus) + ("julia-difftests" ,julia-difftests))) + (propagated-inputs + `(("julia-commonsubexpressions" ,julia-commonsubexpressions) + ("julia-diffresults" ,julia-diffresults) + ("julia-diffrules" ,julia-diffrules) + ("julia-nanmath" ,julia-nanmath) + ("julia-specialfunctions" ,julia-specialfunctions) + ("julia-staticarrays" ,julia-staticarrays))) + (home-page "https://github.com/JuliaDiff/ForwardDiff.jl") + (synopsis "Methods to take multidimensional derivatives") + (description "This package implements methods to take derivatives, +gradients, Jacobians, Hessians, and higher-order derivatives of native Julia +functions (or any callable object, really) using forward mode automatic +differentiation (AD).") + (license license:expat))) + (define-public julia-http (package (name "julia-http") -- cgit v1.2.3 From 568cebc2583bc909b6ce3ed8fc53119d083f3864 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:15 +0100 Subject: gnu: Add julia-zygoterules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-zygoterules): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 9a414fc739..af8b41e82b 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1199,3 +1199,25 @@ working with @acronym{URIs,Uniform Resource Identifiers}, as defined in RFC (description "This package supports SI units and also many other unit system.") (license license:expat))) + +(define-public julia-zygoterules + (package + (name "julia-zygoterules") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluxML/ZygoteRules.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07i2mf6rr5b8i6l82qgwl5arsb5pwyyzyfasgnszhdqllk9501bs")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-macrotools" ,julia-macrotools))) + (home-page "https://github.com/FluxML/ZygoteRules.jl") + (synopsis "Add minimal custom gradients to Zygote") + (description "Minimal package which enables to add custom gradients to +Zygote, without depending on Zygote itself.") + (license license:expat))) -- cgit v1.2.3 From 13f7f06c498aa8cd9704ec78cd514c309042182d Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:16 +0100 Subject: gnu: Add julia-zygote. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-zygote): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index af8b41e82b..cbff69117d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1221,3 +1221,38 @@ system.") (description "Minimal package which enables to add custom gradients to Zygote, without depending on Zygote itself.") (license license:expat))) + +(define-public julia-zygote + (package + (name "julia-zygote") + (version "0.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluxML/Zygote.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h2ph0lsisbkh8y4xgwzgw9p5zi243q8zzp5gfh3zw9pzkx6a1rf")))) + (build-system julia-build-system) + (arguments + `(#:tests? #f)) ;require CUDA, not packaged yet + (propagated-inputs + `(("julia-abstractffs" ,julia-abstractffts) + ("julia-chainrules" ,julia-chainrules) + ("julia-diffrules" ,julia-diffrules) + ("julia-fillarrays" ,julia-fillarrays) + ("julia-forwarddiff" ,julia-forwarddiff) + ("julia-irtools" ,julia-irtools) + ("julia-macrotools" ,julia-macrotools) + ("julia-nanmath" ,julia-nanmath) + ("julia-requires" ,julia-requires) + ("julia-specialfunctions" ,julia-specialfunctions) + ("julia-zygote-rules" ,julia-zygoterules))) + (home-page "https://fluxml.ai/Zygote.jl") + (synopsis "Automatic differentiation in Julia") + (description "Zygote provides source-to-source automatic +differentiation (AD) in Julia, and is the next-generation AD system for the +Flux differentiable programming framework.") + (license license:expat))) -- cgit v1.2.3 From a8bbda7f941ef1cd60972e24455cd50ab5c63706 Mon Sep 17 00:00:00 2001 From: David Dashyan Date: Mon, 29 Mar 2021 18:13:04 +0300 Subject: gnu: rtl8812au-aircrack-ng-linux-module: Update to 5.6.4.2-4.059e06a Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 388b8aae8d..c5d3b31b8d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1167,8 +1167,8 @@ and should be used with caution, especially on untested models.") (license license:gpl3+))) ; see README.md (no licence headers) (define-public rtl8812au-aircrack-ng-linux-module - (let ((commit "62cb003043e4daeeba0b8805137fa604af450ed2") - (revision "3")) + (let ((commit "059e06a51be025fde5b2bec6565540b3d9981b0b") + (revision "4")) (package (name "rtl8812au-aircrack-ng-linux-module") (version (git-version "5.6.4.2" revision commit)) @@ -1180,7 +1180,7 @@ and should be used with caution, especially on untested models.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1kragxkjprjy7nl9h2rd0mwcry1ygw07zb1p2qkj7cmz0r2035yz")) + (base32 "0h6l2r3yj7j9zf11dw0zcdyn50ajnjw8yvv86dzlfj80dn75n98f")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From a1ed5c27baa91f31b3fc7b7befd1fe200321841f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 23:20:30 +0200 Subject: gnu: libgphoto2: Update to 2.5.27. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.27. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4d679c7f02..21923108c6 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -240,14 +240,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.26") + (version "2.5.27") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "1m5wxap3x9z6x8s2gj3sw9lqwlmbgz00dv6z3h3qk15prfizwh3p")))) + "1ms06b3dj1p33aypcb16gg5pn7fylbylsk9cnnqa0j29qiw59f7q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 4ccd3412162c41d7bf33274375b0ac9d2d84c2d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 23:20:34 +0200 Subject: gnu: gphoto2: Update to 2.5.27. * gnu/packages/photo.scm (gphoto2): Update to 2.5.27. --- gnu/packages/photo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 21923108c6..5fd57af4a5 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -271,14 +271,14 @@ from digital cameras.") (define-public gphoto2 (package (name "gphoto2") - (version "2.5.26") + (version "2.5.27") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/gphoto/" version "/gphoto2-" version ".tar.bz2")) (sha256 (base32 - "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn")))) + "0f4d3q381jnnkcqkb2dj1k709skp65qihl5xm80zandvl69lw19h")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c0e60ccf9a53a0eb40de4630f0ef12a82731c469 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 23:27:39 +0200 Subject: gnu: python-toml: Update to 0.10.2. * gnu/packages/python-build.scm (python-toml): Update to 0.10.2. --- gnu/packages/python-build.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 259fe163b5..15e671b2c2 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2018, 2021 Maxim Cournoyer +;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,14 +72,13 @@ installed with a newer @code{pip} or with wheel's own command line utility.") (define-public python-toml (package (name "python-toml") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (pypi-uri "toml" version)) (sha256 - (base32 - "03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj")))) + (base32 "13z6rff86bzdpl094x0vmfvls779931xj90dlbs9kpfm138s3gdk")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no tests suite in release -- cgit v1.2.3 From 6a2c78288a77ce6d860f52b6f600cab5f199a1b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 15:15:03 +0200 Subject: gnu: git-lfs: Update to 2.13.3. * gnu/packages/version-control.scm (git-lfs): Update to 2.13.3. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 95703e5e00..83780caef4 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2722,7 +2722,7 @@ interrupted, published, and collaborated on while in progress.") (define-public git-lfs (package (name "git-lfs") - (version "2.13.2") + (version "2.13.3") (source (origin (method git-fetch) (uri (git-reference @@ -2731,7 +2731,7 @@ interrupted, published, and collaborated on while in progress.") (file-name (git-file-name name version)) (sha256 (base32 - "0gfpzdya48phwln61746ii78sq55mhzj938lz8x062xkkcsdvbf4")))) + "0r7dmqhkhz91d3n7qfpny483x8f1n88yya22j2fvx75rgg33z2sg")))) (build-system go-build-system) (arguments `(#:import-path "github.com/git-lfs/git-lfs" -- cgit v1.2.3 From 692c75eaa6c87c73ad2e20cbded6c32b9ae6b8a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 17:06:18 +0200 Subject: gnu: flite: Update to 2.2. * gnu/packages/speech.scm (flite): Update to 2.2. [source]: Check out this git repository. --- gnu/packages/speech.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 687a3c10cf..093f6f957b 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Nicolas Goaziou @@ -55,15 +55,16 @@ (define-public flite (package (name "flite") - (version "2.1") + (version "2.2") (source (origin - (method url-fetch) - (uri - (string-append "http://www.festvox.org/" name "/packed/" name - "-" version "/" name "-" version "-release.tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/festvox/flite") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "119b7l7pjb1l5raqq24p8rmhdqni49vjh2mgdryrfr575rm3yg67")))) + (base32 "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf")))) (build-system gnu-build-system) (arguments ;; XXX: -- cgit v1.2.3 From 9aaeb9bd957daa988a63ddddee8f4e7efdd7d979 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 17:31:57 +0200 Subject: gnu: wsjtx-hamlib: Update to 2.3.1. * gnu/packages/radio.scm (wsjtx-hamlib): Update to 2.3.1. [arguments]: Remove alleged 'fix-tests phase. --- gnu/packages/radio.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index c10c91fd99..d669c43c87 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -844,7 +844,7 @@ users.") (package (inherit hamlib) (name "wsjtx-hamlib") - (version "2.3.0") + (version "2.3.1") (source (origin (method git-fetch) @@ -853,7 +853,7 @@ users.") (commit (string-append "wsjtx-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ampwqs7p0g8pdnwpdrbvwyqag065n96amgb3v4z332nw0nxvm10")))) + (base32 "0m4yzjcqs7a1w4lghyyckpkiy96jxdjijddxarqr3a37cl2rz23j")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -865,15 +865,7 @@ users.") "--with-lua-binding" "--with-python-binding" "--with-tcl-binding" - "--with-xml-support") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "tests/testloc.c" - (("dmmm2dec\\(deg, mmm, nesw\\);") - "dmmm2dec(deg, mmm, 0, nesw);")) - #t))))))) + "--with-xml-support"))))) (define-public wsjtx (package -- cgit v1.2.3 From 92dfa92d6d8a7df8b8e35096425445827fe4116b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 17:32:07 +0200 Subject: gnu: wsjtx: Update to 2.3.1. * gnu/packages/radio.scm (wsjtx): Update to 2.3.1. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index d669c43c87..826693a538 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -870,7 +870,7 @@ users.") (define-public wsjtx (package (name "wsjtx") - (version "2.3.0") + (version "2.3.1") (source (origin (method git-fetch) @@ -879,7 +879,7 @@ users.") (commit (string-append "wsjtx-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qf8r88ssara3pddvd3jpv5phzxwnanvdj00dxgmzq0c2jqcy2a8")))) + (base32 "0mdr4l7zii08615yn7z91spnvnqm5i9390bra9lz3aqyxrsiim91")))) (build-system qt-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit v1.2.3 From 193f18169711de125ca6954a3047f138b369a33e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 29 Mar 2021 18:33:34 +0100 Subject: gnu: Add texlive-mathdesign. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 86cb1ee455..4107cc118c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7810,3 +7810,29 @@ support packages. Others are cmbright, hvmath and kerkis.") (license (list license:silofl1.1 ;for Arev Sans license:lppl1.3a ;for TeX support files license:gpl2)))) ;for ams-mdbch.sty + +(define-public texlive-mathdesign + (package + (inherit (simple-texlive-package + "texlive-mathdesign" + (list "/doc/fonts/mathdesign/" + "/dvips/mathdesign/" + "/fonts/enc/dvips/mathdesign/" + "/fonts/map/dvips/mathdesign/" + "/fonts/tfm/public/mathdesign/" + "/fonts/type1/public/mathdesign/" + "/fonts/vf/public/mathdesign/" + "/tex/latex/mathdesign/") + (base32 + "0jcby2sd0l3ank2drxc0qcf5d1cwa8idzh4g91h4nxk8zrzxj8nr") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/mathdesign") + (synopsis "Mathematical fonts to fit with particular text fonts") + (description "The Math Design project offers free mathematical +fonts that match with existing text fonts. To date, three free font +families are available: Adobe Utopia, URW Garamond and Bitstream +Charter. Mathdesign covers the whole LaTeX glyph set including AMS +symbols. Both roman and bold versions of these symbols can be used. +Moreover, there is a choice between three greek fonts (two of them +created by the Greek Font Society).") + (license license:gpl2+))) -- cgit v1.2.3 From ebeb018ca32c3da0dc820440b2da8d229f78946b Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 28 Mar 2021 10:58:18 +0200 Subject: gnu: nyacc: Update to 1.03.6. * gnu/packages/mes.scm (nyacc): Update to 1.03.6. Signed-off-by: Christopher Baines --- gnu/packages/mes.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index b4b7bcb6b5..750ec2e67a 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,14 +99,14 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public nyacc (package (inherit nyacc-0.99) - (version "1.03.0") + (version "1.03.6") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/nyacc/nyacc-" version ".tar.gz")) (sha256 (base32 - "1vdiqpm3p0ndmpmkzcpkpjvgklfsk4wxrhkixdxbczpafdfl635p")) + "1s7kli288l4pizjaarx8m6jg7g0mgfy8rpbs9lpzg8la7wr5rvp4")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From ce29fa76f4d96a530ccc4c3ce5f0085c491f964c Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Tue, 23 Mar 2021 13:26:01 +0300 Subject: gnu: emacs-org-roam: Update to 1.2.3-0.8ad57b1. * gnu/packages/emacs-xyz.scm (emacs-org-roam): Update to 1.2.3-0.8ad57b1. [propagated-inputs]: Replace emacs-org-ref with emacs-org and remove emacs-company. Signed-off-by: Christopher Baines --- gnu/packages/emacs-xyz.scm | 50 ++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ead2144b42..52191f3ebc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26566,34 +26566,36 @@ snippets for Emacs.") (license license:expat)))) (define-public emacs-org-roam - (package - (name "emacs-org-roam") - (version "1.2.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/org-roam/org-roam") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0n8c0yxqb62i39kn0d5x83s96vwc0nbg0sx5hplffnbkfbj88bba")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-company" ,emacs-company) - ("emacs-dash" ,emacs-dash) - ("emacs-emacsql-sqlite3" ,emacs-emacsql-sqlite3) - ("emacs-f" ,emacs-f) - ("emacs-org-ref" ,emacs-org-ref) - ("emacs-s" ,emacs-s))) - (home-page "https://github.com/org-roam/org-roam/") - (synopsis "Non-hierarchical note-taking with Org mode") - (description "Emacs Org Roam is a solution for taking non-hierarchical + (let ((commit "8ad57b121831eda8d226faa14ff2ba7ab652849c") + (revision "0") + (version "1.2.3")) + (package + (name "emacs-org-roam") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/org-roam/org-roam") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "162qhb6rkpl1n0l8yhnwgagsx56ykaj9lchsny1id5z1257kgw9w")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-emacsql-sqlite3" ,emacs-emacsql-sqlite3) + ("emacs-f" ,emacs-f) + ("emacs-org" ,emacs-org) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/org-roam/org-roam/") + (synopsis "Non-hierarchical note-taking with Org mode") + (description "Emacs Org Roam is a solution for taking non-hierarchical notes with Org mode. Notes are captured without hierarchy and are connected by tags. Notes can be found and created quickly. Org Roam should also work as a plug-and-play solution for anyone already using Org mode for their personal wiki.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-org-roam-bibtex (package -- cgit v1.2.3 From 7162e5b88208d00188dd9c7b22e0fcde2871fb55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 22:38:18 +0200 Subject: gnu: gegl: Refer to dot. * gnu/packages/gimp.scm (gegl)[arguments]: Add a new 'refer-to-dot phase. --- gnu/packages/gimp.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 4bdc4ee42e..86b42e0fab 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) + #:use-module (gnu packages graphviz) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -229,6 +230,16 @@ provided, as well as a framework to add new color models and data types.") (list "-Dintrospection=false") #:phases (modify-phases %standard-phases + (add-after 'unpack 'refer-to-dot + ;; Without ‘dot’ in $PATH, (at least) the GIMP would fail to start + ;; with an extremely obtuse ‘GEGL operation missing!’ error. + (lambda _ + (substitute* "gegl/gegl-dot.c" + (("\"dot ") + (format #f "\"~a " (which "dot")))) + (substitute* "operations/common/introspect.c" + (("g_find_program_in_path \\(\"dot\"\\)") + (format #f "g_strdup (\"~a\")" (which "dot")))))) (add-after 'unpack 'extend-test-time-outs (lambda _ ;; Multiply some poorly-chosen time-outs for busy build machines. @@ -249,6 +260,7 @@ provided, as well as a framework to add new color models and data types.") ("json-glib" ,json-glib))) (inputs `(("cairo" ,cairo) + ("graphviz" ,graphviz) ("pango" ,pango) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo))) -- cgit v1.2.3 From 6aaa8269b82d50e43405847a479ffaeb0b569fa5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 29 Mar 2021 03:19:09 -0400 Subject: gnu: linphone-desktop: Fix linphone accounts functionality. The Linphone accounts were not able to do TLS authentication against the Linphone servers, and multiple plugins used by the Linphone accounts were not loaded. This change should fix this. * gnu/packages/linphone.scm (linphone-desktop)[phases](post-install): Modify phase. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 2107560aa0..deda49a4bc 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -839,10 +839,14 @@ and video calls or instant messaging capabilities to an application.") ;; Remove unnecessary Qt configuration file. (delete-file (string-append out "/bin/qt.conf")) ;; Not using the FHS exposes an issue where the client - ;; refers to its own "share" directory, which lacks files + ;; refers to its own directories, which lacks files ;; installed by the dependencies. + (symlink (string-append liblinphone "/lib") + (string-append out "/lib")) (symlink (string-append liblinphone "/share/sounds") (string-append out "/share/sounds")) + (symlink (string-append liblinphone "/share/linphone/rootca.pem") + (string-append out "/share/linphone/rootca.pem")) (mkdir-p (dirname grammar-dest)) (symlink (string-append liblinphone "/share/belr/grammars") grammar-dest))))))) -- cgit v1.2.3 From de2e36411feb2f29edfed563b3ad143f8a9ea3d7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 29 Mar 2021 17:31:32 +0200 Subject: gnu: metis: Add 'release-monitoring-url' property. * gnu/packages/maths.scm (metis)[properties]: New field. --- gnu/packages/maths.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 565f109f47..2e072e7d82 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2015 Fabian Harfert ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2018, 2020 Kei Kebreau -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019, 2020 Paul Garlick @@ -3305,6 +3305,9 @@ YACC = bison -pscotchyy -y -b y (sha256 (base32 "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn")))) + (properties + `((release-monitoring-url + . "http://glaros.dtc.umn.edu/gkhome/metis/metis/download"))) (build-system cmake-build-system) (inputs `(("blas" ,openblas))) -- cgit v1.2.3 From 3104a743f9b26ae0c41bcd2cbdc82588a5311be1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 29 Mar 2021 17:48:52 +0200 Subject: services: rottlog: Add /var/log/mcron.log to '%default-rotations'. Fixes . Reported by Leo Famulari . * gnu/services/admin.scm (%rotated-files): Add "/var/log/mcron.log". --- gnu/services/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index b34b990f32..763a4434e4 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. @@ -80,7 +80,7 @@ (define %rotated-files ;; Syslog files subject to rotation. '("/var/log/messages" "/var/log/secure" "/var/log/debug" - "/var/log/maillog")) + "/var/log/maillog" "/var/log/mcron.log")) (define %default-rotations (list (log-rotation ;syslog files -- cgit v1.2.3 From 02f664a0a3dd3a936213e687802bdc62f2a10983 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 10 Mar 2021 13:26:20 +1100 Subject: gnu: python-poppler-qt5: Update to 21.1.0. * gnu/packages/pdf.scm (python-poppler-qt5): Update to 21.1.0. --- gnu/packages/pdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 00468fa814..cbbdf68f5b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -309,14 +309,14 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (define-public python-poppler-qt5 (package (name "python-poppler-qt5") - (version "0.24.2") + (version "21.1.0") (source (origin (method url-fetch) (uri (pypi-uri "python-poppler-qt5" version)) (sha256 (base32 - "0l69llw1fzwz8y90q0qp9q5pifbrqjjbwii7di54dwghw5fc6w1r")))) + "0b82gm4i75q5v19kfbq0h4y0b2vcwr2213zkhxh6l0h45kdndmxd")))) (build-system python-build-system) (arguments `(;; There are no tests. The check phase just causes a rebuild. -- cgit v1.2.3 From aae012e91e66e3edcc486db7bd4939fb34ed3b24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 23:51:04 +0200 Subject: gnu: gimp: Properly handle missing optional ‘dot’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gimp.scm (gimp)[source]: Add a patch to fix a fatal error when ‘dot’ is not in $PATH. (gegl)[arguments]: Move the 'refer-to-dot phase... [inputs]: ...and graphviz... (gegl-for-glimpse)[arguments]: ...here, and... [inputs]: ...here, respectively. (glimpse)[inputs]: Use gegl-for-glimpse gegl variant. --- gnu/packages/gimp.scm | 63 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 86b42e0fab..a0f6b7ca11 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -230,16 +230,6 @@ provided, as well as a framework to add new color models and data types.") (list "-Dintrospection=false") #:phases (modify-phases %standard-phases - (add-after 'unpack 'refer-to-dot - ;; Without ‘dot’ in $PATH, (at least) the GIMP would fail to start - ;; with an extremely obtuse ‘GEGL operation missing!’ error. - (lambda _ - (substitute* "gegl/gegl-dot.c" - (("\"dot ") - (format #f "\"~a " (which "dot")))) - (substitute* "operations/common/introspect.c" - (("g_find_program_in_path \\(\"dot\"\\)") - (format #f "g_strdup (\"~a\")" (which "dot")))))) (add-after 'unpack 'extend-test-time-outs (lambda _ ;; Multiply some poorly-chosen time-outs for busy build machines. @@ -260,7 +250,6 @@ provided, as well as a framework to add new color models and data types.") ("json-glib" ,json-glib))) (inputs `(("cairo" ,cairo) - ("graphviz" ,graphviz) ("pango" ,pango) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo))) @@ -281,14 +270,25 @@ buffers.") (package (name "gimp") (version "2.10.22") - (source (origin - (method url-fetch) - (uri (string-append "https://download.gimp.org/pub/gimp/v" - (version-major+minor version) - "/gimp-" version ".tar.bz2")) - (sha256 - (base32 - "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.gimp.org/pub/gimp/v" + (version-major+minor version) + "/gimp-" version ".tar.bz2")) + (sha256 + (base32 "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d")) + (patches + (list (origin + ;; This upstream patch fixes a mandatory dependency on ‘dot’: + ;; . + (method url-fetch) + (uri (string-append "https://github.com/GNOME/gimp/commit/" + "2cae9b9acf9da98c4c9990819ffbd5aabe23017e" + ".patch")) + (sha256 + (base32 + "1xd5lmy1j9p6p1ka7dyj1b9jmfcra1r62rma07vzw2v4vig0khc0"))))))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML @@ -556,6 +556,29 @@ healing the border, increasing the resolution while adding detail, and transferring the style of an image.") (license license:gpl3+))) +(define gegl-for-glimpse + ;; Remove this when GIMP commit 2cae9b9acf9da98c4c9990819ffbd5aabe23017e + ;; makes it into Glimpse. + (package + (inherit gegl) + (arguments + (substitute-keyword-arguments (package-arguments gegl) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'refer-to-dot + ;; XXX Without ‘dot’ in $PATH, Glimpse would fail to start with an + ;; extremely obtuse ‘GEGL operation missing!’ error. + (lambda _ + (substitute* "gegl/gegl-dot.c" + (("\"dot ") + (format #f "\"~a " (which "dot")))) + (substitute* "operations/common/introspect.c" + (("g_find_program_in_path \\(\"dot\"\\)") + (format #f "g_strdup (\"~a\")" (which "dot")))))))))) + (inputs + `(,@(package-inputs gegl) + ("graphviz" ,graphviz))))) + (define-public glimpse (package (name "glimpse") @@ -635,7 +658,7 @@ transferring the style of an image.") ("poppler-data" ,poppler-data) ("python" ,python-2) ; optional, Python support ("python2-pygtk" ,python2-pygtk) ; optional, Python support - ("gegl" ,gegl))) + ("gegl" ,gegl-for-glimpse))) ; XXX see comment in gegl-for-glimpse (home-page "https://glimpse-editor.github.io/") (synopsis "Glimpse Image Editor") (description "The Glimpse Image Editor is an application for image -- cgit v1.2.3 From 9feef62b73e284e106717a386624d6da90750a3d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 30 Mar 2021 02:10:19 +0200 Subject: gnu: zstd: Downgrade to 1.4.4 and make security graft saner. * gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/compression.scm (zstd-1.4.9): Remove. (zstd/fixed): New variable. Apply patch. (zstd)[replacement]: Graft with zstd/fixed. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 19 +++--- .../zstd-CVE-2021-24031_CVE-2021-24032.patch | 68 ++++++++++++++++++++++ 3 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 40732ca696..deb4ddcede 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1824,6 +1824,7 @@ dist_patch_DATA = \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/ytnef-CVE-2021-3403.patch \ %D%/packages/patches/ytnef-CVE-2021-3404.patch \ + %D%/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch \ %D%/packages/patches/zziplib-CVE-2018-16548.patch MISC_DISTRO_FILES = \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ef73e6038b..5ed4b4ce98 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1409,7 +1409,7 @@ or junctions, and always follows hard links.") "v" version "/zstd-" version ".tar.gz")) (sha256 (base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr")))) - (replacement zstd-1.4.9) + (replacement zstd/fixed) (build-system gnu-build-system) (outputs '("out" ;1.2MiB executables and documentation "lib" ;1.2MiB shared library and headers @@ -1469,21 +1469,16 @@ speed.") license:public-domain ; zlibWrapper/examples/fitblk* license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h} -(define-public zstd-1.4.9 +(define zstd/fixed (package (inherit zstd) - (name "zstd") - (version "1.4.9") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/facebook/zstd/releases/download/" - "v" version "/zstd-" version ".tar.gz")) - (sha256 - (base32 "14yj7309gsvg39rki4xqnd6w5idmqi0655v1fc0mk1m2kvhp9b19")))) - (arguments - (substitute-keyword-arguments (package-arguments zstd) - ((#:tests? _ #t) #f))))) + (inherit (package-source zstd)) + (patches + (search-patches + ;; From Ubuntu focal-security + "zstd-CVE-2021-24031_CVE-2021-24032.patch")))))) (define-public pzstd (package/inherit zstd diff --git a/gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch b/gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch new file mode 100644 index 0000000000..48b5eb18eb --- /dev/null +++ b/gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch @@ -0,0 +1,68 @@ +Description: fix race condition allowing attackers to access destination file + This commit addresses https://github.com/facebook/zstd/issues/2491. + . + Note that a downside of this solution is that it is global: `umask()` affects + all file creation calls in the process. I believe this is safe since + `fileio.c` functions should only ever be used in the zstd binary, and these + are (almost) the only files ever created by zstd, and AIUI they're only + created in a single thread. So we can get away with messing with global state. + . + Note that this doesn't change the permissions of files created by `dibio.c`. + I'm not sure what those should be... +Author: W. Felix Handte +Origin: upstream +Bug: https://github.com/facebook/zstd/issues/2491 +Bug-Debian: https://github.com/facebook/zstd/issues/2491 +Applied-Upstream: commit:a774c5797399040af62db21d8a9b9769e005430e +Reviewed-by: Étienne Mollier +Last-Update: 2021-03-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/programs/fileio.c ++++ b/programs/fileio.c +@@ -606,11 +606,11 @@ FIO_openDstFile(FIO_prefs_t* const prefs + FIO_remove(dstFileName); + } } + +- { FILE* const f = fopen( dstFileName, "wb" ); ++ { const int old_umask = UTIL_umask(0177); /* u-x,go-rwx */ ++ FILE* const f = fopen( dstFileName, "wb" ); ++ UTIL_umask(old_umask); + if (f == NULL) { + DISPLAYLEVEL(1, "zstd: %s: %s\n", dstFileName, strerror(errno)); +- } else if(srcFileName != NULL && strcmp (srcFileName, stdinmark)) { +- chmod(dstFileName, 00600); + } + return f; + } +--- a/programs/util.c ++++ b/programs/util.c +@@ -54,6 +54,15 @@ int UTIL_getFileStat(const char* infilen + return 1; + } + ++int UTIL_umask(int mode) { ++#if PLATFORM_POSIX_VERSION > 0 ++ return umask(mode); ++#else ++ /* do nothing, fake return value */ ++ return mode; ++#endif ++} ++ + int UTIL_setFileStat(const char *filename, stat_t *statbuf) + { + int res = 0; +--- a/programs/util.h ++++ b/programs/util.h +@@ -136,6 +136,10 @@ int UTIL_isSameFile(const char* file1, c + int UTIL_compareStr(const void *p1, const void *p2); + int UTIL_isCompressedFile(const char* infilename, const char *extensionList[]); + const char* UTIL_getFileExtension(const char* infilename); ++/** ++ * Wraps umask(). Does nothing when the platform doesn't have that concept. ++ */ ++int UTIL_umask(int mode); + + #ifndef _MSC_VER + U32 UTIL_isFIFO(const char* infilename); -- cgit v1.2.3 From aed51ecea87f9b5045cc888cd1d9653a27813164 Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 26 Mar 2021 09:05:15 +0100 Subject: gnu: guix: Fix openrc init scripts. Fixes . * gnu/packages/package-management.scm (guix)[arguments]: Fix openrc init. * nix/local.mk (openrcservicedir): Likewise. Signed-off-by: Efraim Flashner --- gnu/packages/package-management.scm | 2 +- nix/local.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index de549fd094..6ee0bc74e9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -212,7 +212,7 @@ $(prefix)/etc/init.d\n"))) (substitute* "nix/local.mk" (("^openrcservicedir = .*$") (string-append "openrcservicedir = \ -$(prefix)/etc/init.d\n"))) +$(prefix)/etc/openrc\n"))) (invoke "sh" "bootstrap"))) (add-before 'build 'use-host-compressors diff --git a/nix/local.mk b/nix/local.mk index d2ce349d9c..7c438ea78c 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -181,7 +181,7 @@ etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ mv "$@.tmp" "$@" # The service script for openrc. -openrcservicedir = $(sysconfdir)/init.d +openrcservicedir = $(sysconfdir)/openrc nodist_openrcservice_DATA = etc/openrc/guix-daemon etc/openrc/guix-daemon: etc/openrc/guix-daemon.in \ -- cgit v1.2.3 From d978c1cfeb3dbb09c3921e56ed0616ad8ea6e85e Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 29 Mar 2021 21:45:26 +0200 Subject: gnu: grokmirror: Update to 2.0.8. * gnu/packages/version-control.scm (grokmirror): Update to 2.0.8. Signed-off-by: Efraim Flashner --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 83780caef4..e7fa6e6777 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2330,7 +2330,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (define-public grokmirror (package (name "grokmirror") - (version "2.0.5") + (version "2.0.8") (source (origin (method git-fetch) @@ -2340,7 +2340,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "006ar3kc6fw1sq300ar9np4a63qzzsdama6cv30wh65v5mqw1mnv")))) + (base32 "0zfiwjw02df3mzpawp9jx61iwp0nhcf6y03cs8022l0hkvc7blbr")))) (build-system python-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From 9098745b181b3022587a35afd255f7ff1d41ac86 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Mar 2021 11:03:08 +0300 Subject: gnu: zziplib/fixed: Add missing library symlinks. Fixes , , . * gnu/packages/compression.scm (zziplib/fixed)[arguments]: Add new phase to create missing library symlinks. --- gnu/packages/compression.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5ed4b4ce98..37a7d230fe 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice @@ -1786,7 +1786,20 @@ timestamps in the file header with a fixed time (1 January 2008). (sha256 (base32 "0i6bpa2b13z19alm6ig80364dnin1w28cvif18k6wkkb0w3dzp8y")))) - (arguments `()) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-compatibility-symlinks + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") "/lib") + (map (lambda (lib new-symlink) + (symlink lib new-symlink)) + (list "libzzip.so.13" "libzzipfseeko.so.13" + "libzzipmmapped.so.13" "libzzipwrap.so.13") + (list "libzzip-0.so.13" "libzzipfseeko-0.so.13" + "libzzipmmapped-0.so.13" "libzzipwrap-0.so.13"))) + #t))))) (native-inputs `(("python" ,python) ,@(alist-delete "python" -- cgit v1.2.3 From 1b6e7157cd30ffc2b29779fe6d5cb4ddbbc6f331 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 30 Mar 2021 17:14:12 +0100 Subject: gnu: Add texlive-bera. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4107cc118c..85678ff4be 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7836,3 +7836,26 @@ symbols. Both roman and bold versions of these symbols can be used. Moreover, there is a choice between three greek fonts (two of them created by the Greek Font Society).") (license license:gpl2+))) + +(define-public texlive-bera + (package + (inherit (simple-texlive-package + "texlive-bera" + (list "/doc/fonts/bera/" + "/fonts/afm/public/bera/" + "/fonts/map/dvips/bera/" + "/fonts/tfm/public/bera/" + "/fonts/type1/public/bera/" + "/fonts/vf/public/bera/" + "/tex/latex/bera/") + (base32 + "1pkmhhr6ah44xhipjr7nianv03hr4w4bn45xcvp264yw6ymqzqwr") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/bera") + (synopsis "Bera fonts") + (description "The @code{bera} package contains the Bera Type 1 +fonts and files to use the fonts with LaTeX. Bera is a set of three +font families: Bera Serif (a slab-serif Roman), Bera Sans (a Frutiger +descendant) and Bera Mono (monospaced/typewriter). The Bera family is +a repackaging, for use with TeX, of the Bitstream Vera family.") + (license license:silofl1.1))) -- cgit v1.2.3 From 3c5e1412e3ef769df8e4826d0aedabaa3aa0d631 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:30:55 -0400 Subject: gnu: WebKitGTK: Update to 2.32.0 [fixes CVE-2021-{1788,1844,1871}]. * gnu/packages/webkit.scm (webkitgtk): Update to 2.32.0. [arguments]: Add -DENABLE_GAMEPAD=OFF to #:configure-flags. --- gnu/packages/webkit.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index d8378354bd..083c8ccb08 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -226,14 +226,14 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.30.6") + (version "2.32.0") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh")) + "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx")) (patches (search-patches "webkitgtk-share-store.patch" "webkitgtk-bind-all-fonts.patch")))) (build-system cmake-build-system) @@ -244,6 +244,9 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") #:configure-flags (list "-DPORT=GTK" "-DENABLE_GTKDOC=ON" ; No doc by default + ;; Requires libmanette, new dependency added in 2.32.0. + ;; TODO Decide if we should enable this + "-DENABLE_GAMEPAD=OFF" "-DUSE_SYSTEMD=OFF" (string-append ; uses lib64 by default "-DLIB_INSTALL_DIR=" -- cgit v1.2.3 From 254b3310501e42f0bf4f016f46881fc3cbea7c5d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 11:30:01 +0200 Subject: gnu: minicom: Update to 2.8. * gnu/packages/engineering.scm (minicom): Update to 2.8. --- gnu/packages/engineering.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8d7ba9c1da..57464e1834 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018, 2019 Jonathan Brielmaier ;;; Copyright © 2018, 2019, 2020 Arun Isaac @@ -1248,7 +1248,7 @@ replacement for the OpenDWG libraries.") (define-public minicom (package (name "minicom") - (version "2.7.1") + (version "2.8") (source (origin (method git-fetch) @@ -1256,13 +1256,16 @@ replacement for the OpenDWG libraries.") (url "https://salsa.debian.org/minicom-team/minicom.git") (commit (string-append "v" version)))) (sha256 - (base32 "0f36wv015zpz1x895qv0z6marlynzyh0d5mfkyd7lfyy2xd1i2w0")) + (base32 "0kfihxbh9qkjk9m1932ajyqx384c2aj3d9yaphh3i9i7y1shxlpx")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-lock-dir=/var/lock") #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) (replace 'bootstrap ;; autogen.sh needlessly hard-codes aclocal-1.14. (lambda _ -- cgit v1.2.3 From f7158350b2c4df3186297effdef94574ceec7d88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 11:48:02 +0200 Subject: gnu: xscreensaver: Update to 5.45. * gnu/packages/xdisorg.scm (xscreensaver): Update to 5.45. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 56ac53edec..6ee997add0 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1473,7 +1473,7 @@ less if you are working in front of the screen at night.") (define-public xscreensaver (package (name "xscreensaver") - (version "5.44") + (version "5.45") (source (origin (method url-fetch) @@ -1481,7 +1481,7 @@ less if you are working in front of the screen at night.") (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "15bv05vpfjwsrqbazrjmm382jd7vvw0mp6y9vasn6wvxzjf0in3k")))) + (base32 "03fmyjlwjinzv7mih6n07glmys8s877snd8zijk2c0ds6rkxy5kh")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 6ff782683bb07ffb5564a26db342a870e9a55e8e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 11:58:43 +0200 Subject: gnu: autocutsel: Update to 0.10.1. * gnu/packages/xdisorg.scm (autocutsel): Update to 0.10.1. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 6ee997add0..725ea0afd6 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2249,7 +2249,7 @@ Wayland.") (define-public autocutsel (package (name "autocutsel") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/sigmike/autocutsel" @@ -2257,7 +2257,7 @@ Wayland.") "autocutsel-" version ".tar.gz")) (sha256 (base32 - "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2")))) + "05zb85imp42birvrc320q20r98qddc5vxx169dnl753l5za0czpi")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit v1.2.3 From 5cf90c43cab457ca789862e456556af7f092063a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 12:03:31 +0200 Subject: gnu: hikari: Update to 2.2.3. * gnu/packages/wm.scm (hikari): Update to 2.2.3. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6105a98f14..d3c76d7988 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2404,14 +2404,14 @@ read and write, and compatible with JSON.") (define-public hikari (package (name "hikari") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (string-append "https://hikari.acmelabs.space/releases/" "hikari-" version ".tar.gz")) (sha256 - (base32 "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (base32 "1d023cphzi15k434n60l1rp5awxmdijvsxfrm59fmsvd5rjxh9q7")))) (build-system gnu-build-system) (native-inputs `(("bmake" ,bmake) -- cgit v1.2.3 From 634d9845a6b4e362f32ba369ae42851719455ba3 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 11:18:09 +0200 Subject: gnu: vsftpd: Use CentOS version and patches. * gnu/packages/ftp.scm (vftpd)[source]: Use CentOS source RPM. [arguments]: Adapt the 'unpack phase, and apply CentOS patches in a new 'apply-CentOS-patches phase. [inputs]: Add openssl, linux-pam, and libcap. [native-inputs]: Add p7zip and cpio. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/ftp.scm | 117 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 81 insertions(+), 36 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index b178063556..78c496c378 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -2,8 +2,9 @@ ;;; Copyright © 2014, 2015, 2018 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rene Saavedra +;;; Copyright © 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,12 +29,14 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages cpio) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) @@ -251,40 +254,82 @@ directory comparison and more.") (properties '((upstream-name . "FileZilla"))))) (define-public vsftpd - (package - (name "vsftpd") - (version "3.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://security.appspot.com/downloads/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags '("LDFLAGS=-lcrypt") - #:tests? #f ; No tests exist. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr") (assoc-ref outputs "out"))) - #t)) - (add-before 'install 'mkdir - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (mkdir (string-append out "/sbin")) - (mkdir (string-append out "/man")) - (mkdir (string-append out "/man/man5")) - (mkdir (string-append out "/man/man8")) - #t))) - (delete 'configure)))) - (synopsis "vsftpd FTP daemon") - (description "@command{vsftpd} is a daemon that listens on a TCP socket + ;; Use a significantly patched CentOS variant supporting TLSv1.2, ‘email + ;; passwords’, and XXX davidl: anything else? + (let ((upstream-version "3.0.3") + (centos-version "8.3.2011") + (revision "32.el8")) + (package + (name "vsftpd") + (version (string-append upstream-version "." revision)) + (source + (origin + (method url-fetch) + (uri (string-append + "https://vault.centos.org/centos/" centos-version + "/AppStream/Source/SPackages/vsftpd-" upstream-version "-" + revision ".src.rpm")) + (sha256 + (base32 "1xl0kqcismf82hl99klqbvvpylpyk1yr1qjy5hd8f80cj4lyl0f4")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("LDFLAGS=-lcrypt -lssl -pie") + #:tests? #f ; no tests exist + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (invoke "7z" "e" source "-ocpio") + (invoke "cpio" "-idmv" + (string-append "--file=cpio/vsftpd-" + ,upstream-version "-" ,revision + ".src.cpio")) + (invoke "tar" "xvf" + (string-append "vsftpd-" ,upstream-version ".tar.gz")) + (chdir (string-append "vsftpd-" ,upstream-version)))) + (add-after 'unpack 'apply-CentOS-patches + ;; Apply all patches as enumerated in vsftpd.spec, in order: + ;; simply using FIND-FILES would silently corrupt the result. + (lambda _ + (call-with-input-file "../vsftpd.spec" + (lambda (port) + (use-modules (ice-9 rdelim)) + (let loop () + (let ((line (read-line port))) + (unless (eof-object? line) + (when (string-prefix? "Patch" line) + (let* ((space (string-rindex line #\space)) + (patch (string-drop line (+ 1 space)))) + (format #t "Applying '~a'.\n" patch) + (invoke "patch" "-Np1" + "-i" (string-append "../" patch)))) + (loop)))))))) + (add-after 'unpack 'patch-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr") (assoc-ref outputs "out"))) + #t)) + (add-before 'install 'mkdir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p out) + (mkdir (string-append out "/sbin")) + (mkdir (string-append out "/man")) + (mkdir (string-append out "/man/man5")) + (mkdir (string-append out "/man/man8")) + #t))) + (delete 'configure)))) + (native-inputs + ;; Used to unpack the source RPM. + `(("p7zip" ,p7zip) + ("cpio" ,cpio))) + (inputs + `(("libcap" ,libcap) + ("linux-pam" ,linux-pam) + ("openssl" ,openssl))) + (home-page "https://security.appspot.com/vsftpd.html") + (synopsis "Share files securely over FTP or FTPS") + (description "@command{vsftpd} is a daemon that listens on a TCP socket for clients and gives them access to local files via File Transfer Protocol.") - (home-page "https://security.appspot.com/vsftpd.html") - (license gpl2))) + (license gpl2)))) -- cgit v1.2.3 From e04c04683bdc5a12868295c126b67136b7bbd25a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:32:59 +0200 Subject: gnu: nq: Update to 0.4. * gnu/packages/admin.scm (nq): Update to 0.4. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index df7973395d..292a4bc2a2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4502,7 +4502,7 @@ the XMODEM/YMODEM/ZMODEM file transfer protocols.") (define-public nq (package (name "nq") - (version "0.3.1") + (version "0.4") (source (origin (method git-fetch) @@ -4511,7 +4511,7 @@ the XMODEM/YMODEM/ZMODEM file transfer protocols.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99")))) + (base32 "0sdamjzvmf6cxhjmd1rjvn7zm6k10fp5n6vabyxd3yl30cgrxw2i")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From 614defcd765508ea135e754f9a01fdc8a8aaa1cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:33:59 +0200 Subject: gnu: vsftp: Apply unstaged fixes. * gnu/packages/ftp.scm (vsftpd): Update comment. [version]: Separate version and revision with a hyphen. --- gnu/packages/ftp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 78c496c378..9715c3e770 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -254,14 +254,14 @@ directory comparison and more.") (properties '((upstream-name . "FileZilla"))))) (define-public vsftpd - ;; Use a significantly patched CentOS variant supporting TLSv1.2, ‘email - ;; passwords’, and XXX davidl: anything else? + ;; Use a significantly patched CentOS variant with TLSv1.2 support and + ;; further bug and security fixes. (let ((upstream-version "3.0.3") (centos-version "8.3.2011") (revision "32.el8")) (package (name "vsftpd") - (version (string-append upstream-version "." revision)) + (version (string-append upstream-version "-" revision)) (source (origin (method url-fetch) -- cgit v1.2.3 From 9abfeefa9532a45e775783f410332fd03f26abfb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:48:03 +0200 Subject: gnu: nginx: Update to 1.19.9. * gnu/packages/web.scm (nginx): Update to 1.19.9. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ae41588037..eb225eea45 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -367,14 +367,14 @@ the same, being completely separated from the Internet.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.19.8") + (version "1.19.9") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "01cb6hsaik1sfjihbrldmwrcn54gk4plfy350sl1b4rml6qik29h")))) + "0hfqqyfgqa6wqazmb3d434nb3r5p8szfisa0m6nfh9lqdbqdyd9f")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit v1.2.3 From 8b61b6f5122f1e88019991269ab3c8c647ccbced Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:54:15 +0200 Subject: gnu: nginx-documentation: Update to 1.19.9-2696-f85798c1c70a. * gnu/packages/web.scm (nginx-documentation): Update to 1.19.9-2696-f85798c1c70a. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eb225eea45..7bc638ba88 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -457,9 +457,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.19.8") - (revision 2673) - (changeset "4398fd0f0341")) + (let ((version "1.19.9") + (revision 2696) + (changeset "f85798c1c70a")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -471,7 +471,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (file-name (string-append name "-" version)) (sha256 (base32 - "1pds76h19fadmymyr6pnfh72ql6vizpv2628lqcrpqhxgwa6hcbg")))) + "1ksl32jw6h3qzyxxlsdjag7fcjvk3md3hdxn6ljs8pr2nhk1v6cs")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit v1.2.3 From a8b59a032d56664348d270cfb6713f9424baf4c9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:54:44 +0200 Subject: gnu: avidemux: Update to 2.7.8. * gnu/packages/video.scm (avidemux): Update to 2.7.8. [arguments]: Adjust to updated bundled ffmpeg-4.2.4. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 05502a1d1a..09bf701ae5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2686,7 +2686,7 @@ for use with HTML5 video.") (define-public avidemux (package (name "avidemux") - (version "2.7.6") + (version "2.7.8") (source (origin (method url-fetch) (uri (string-append @@ -2694,7 +2694,7 @@ for use with HTML5 video.") "avidemux_" version ".tar.gz")) (sha256 (base32 - "1kwkn976ppahrcr74bnv6sqx75pzl9y21m1mvr5ksi1m6lgp924s")) + "00blv5455ry3bb86zyzk1xmq3rbqmbif62khc0kq3whza97l12k2")) (patches (search-patches "avidemux-install-to-lib.patch")))) (build-system cmake-build-system) (native-inputs @@ -2727,7 +2727,7 @@ for use with HTML5 video.") #:phases ;; Make sure files inside the included ffmpeg tarball are ;; patch-shebanged. - (let ((ffmpeg "ffmpeg-4.2.3")) + (let ((ffmpeg "ffmpeg-4.2.4")) (modify-phases %standard-phases (add-before 'patch-source-shebangs 'unpack-ffmpeg (lambda _ -- cgit v1.2.3 From e8aa983cd0695a262d498f47ac6520b475b47059 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 23:02:10 +0200 Subject: gnu: vim: Update to 8.2.2677. * gnu/packages/vim.scm (vim): Update to 8.2.2677. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 0a73d9e402..92ce1213c4 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -71,7 +71,7 @@ (define-public vim (package (name "vim") - (version "8.2.2632") + (version "8.2.2677") (source (origin (method git-fetch) (uri (git-reference @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0f80im1swja58n99696zslyzapsx8pyf545pmpzvy173ymnvm6nq")))) + "13y58h0nnd5jpqk8nhpcdhg6m2drfnrfbiv4cjh9qmkjw47i0qir")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From c9b852a99022c8b23a8e5b507a437f92b01a9301 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 23:05:45 +0200 Subject: gnu: quickjs: Update to 2021-03-27. * gnu/packages/javascript.scm (quickjs): Update to 2021-03-27. --- gnu/packages/javascript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 00e89612a5..bb3a8063e3 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -597,14 +597,14 @@ roots, or wrestle with obscure build systems.") (define-public quickjs (package (name "quickjs") - (version "2020-11-08") + (version "2021-03-27") (source (origin (method url-fetch) (uri (string-append "https://bellard.org/quickjs/quickjs-" version ".tar.xz")) (sha256 (base32 - "0yqqcjxi3cqagw184mqrxpvqg486x7c233r3cp9mxachngd6779f")))) + "06pywwpmfwjz225h59wf90q96a2fd66qfcw5xa6m6y9k9k7glnx4")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From de3fe06ab7bc56be65f041d38b8390ed1fbcb3ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 23:13:24 +0200 Subject: gnu: sg3-utils: Update to 1.46. * gnu/packages/scsi.scm (sg3-utils): Update to 1.46. --- gnu/packages/scsi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index 803f49931e..4c3bfd7e33 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Chris Marusich -;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +27,14 @@ (define-public sg3-utils (package (name "sg3-utils") - (version "1.45") + (version "1.46") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "1vmjb17y33a73sv7jg8fzs6bhr7yh2k9sba81sjiyf1pvi3vbnn7")))) + "185rlxppnsmi6q7garfhglmw31gji2ff24xg2yjk3klk1fqnihjr")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") -- cgit v1.2.3 From 4b8c687a7c1addb6c81e0a6fad45b7736bf8a6e1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 23:13:39 +0200 Subject: gnu: libupnp: Update to 1.14.4. * gnu/packages/upnp.scm (libupnp): Update to 1.14.4. --- gnu/packages/upnp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 33f3fb21c0..307ea14e96 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -96,14 +96,14 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.14.2") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/pupnp/pupnp/releases/download" "/release-" version "/libupnp-" version".tar.bz2")) (sha256 - (base32 "0w62sn95fnp12qwz5nid6ksg2h9k0k6rinz00p8m3jd4j5dh9qzz")))) + (base32 "0qxydxf11dnq5rd33pa35mc5i5li7xdysc7ph23bisbh63srwr6d")))) (native-inputs `(("pkg-config" ,pkg-config))) (build-system gnu-build-system) -- cgit v1.2.3 From b4635adf859a209ccc50dcdfa9eb71c97bcb194e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Mar 2021 00:48:54 +0200 Subject: gnu: butt: Update to 0.1.29. * gnu/packages/audio.scm (butt): Update to 0.1.29. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 32ca4d65e8..eff45af80f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5129,14 +5129,14 @@ while still staying in time.") (define-public butt (package (name "butt") - (version "0.1.28") + (version "0.1.29") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/butt/butt/butt-" version "/butt-" version ".tar.gz")) (sha256 (base32 - "1rbp4v6dlyapld6y4aqbpfmcaiafa06f2zqd1rhk4r3ld3bndafm")))) + "0nbz0z4d7krvhmnwn10594gwc61gn2dlb5fazmynjfisrfdswqlg")))) (build-system gnu-build-system) (arguments `(#:phases @@ -5173,7 +5173,7 @@ while still staying in time.") version "_manual.pdf")) (sha256 (base32 - "04wz2sqhk22h9gymwh5r6kp6sxc994mia8rg9lwpmy1r18w4pvsl")))))) + "1hhgdhdg5s86hjcbwh856gcd3kcch0i5xgi3i3v02zz3xmzl7gg3")))))) (home-page "https://danielnoethen.de/butt/") (synopsis "Audio streaming tool") (description "Butt is a tool to stream audio to a ShoutCast or -- cgit v1.2.3 From e3dc5819f9c6c5fdcbfa14775372a9e443744f71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Mar 2021 00:49:07 +0200 Subject: gnu: youtube-dl: Update to 2021.03.31. * gnu/packages/video.scm (youtube-dl): Update to 2021.03.31. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 09bf701ae5..a22b73b24f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.03.25") + (version "2021.03.31") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3")) + "1svcgrhq1yxpcd6k3piqs5paalrcsq9bm79h5ras1g7yjzid05gj")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit v1.2.3 From fea1eea452e9659b79f88fa80a45ca7c03cded1f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Mar 2021 00:58:17 +0200 Subject: gnu: perl-net-dns: Update to 1.30. * gnu/packages/networking.scm (perl-net-dns): Update to 1.30. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ecc6f57f4e..7dd484fa94 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1922,7 +1922,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.28") + (version "1.30") (source (origin (method url-fetch) @@ -1933,7 +1933,7 @@ private (reserved).") (string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-" version ".tar.gz"))) (sha256 - (base32 "0kh2qbhxv005pqb35mdk2bld7cg7xnxl12qvdwv30sgd91aqica7")))) + (base32 "1nm560xjg173wvv736ai3ib1gwssyy41gi0yv4j5fqamfav70ph5")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit v1.2.3 From fa76e52d874549582a1e21e2ec2ca0b6b41362cb Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 28 Mar 2021 15:12:38 +0200 Subject: gnu: Add guile-imanifest. * gnu/packages/guile-xyz.scm (guile-imanifest): New variable. Signed-off-by: Christopher Baines --- gnu/packages/guile-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c798bed817..e2ee5454a0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -91,6 +91,7 @@ #:use-module (gnu packages networking) #:use-module (gnu packages noweb) #:use-module (gnu packages nss) + #:use-module (gnu packages package-management) #:use-module (gnu packages password-utils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -1745,6 +1746,35 @@ The library is shipped with documentation in Info format and usage examples.") (define-public guile3.0-ics (deprecated-package "guile3.0-ics" guile-ics)) +(define-public guile-imanifest + (let ((commit "ccd5a2111b008d778106f5595a3a585954d95d0") + (revision "0")) + (package + (name "guile-imanifest") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~brown121407/guile-imanifest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i5qllcrhdjhspyj7j9h4dc9y37d3cfbpackmybm3030qgfxqirf")))) + (build-system guile-build-system) + (native-inputs + `(("guile" ,guile-3.0))) + (propagated-inputs + `(("guile-readline" ,guile-readline) + ("guile-colorized" ,guile-colorized) + ("guix" ,guix))) + (home-page "https://sr.ht/~brown121407/guile-imanifest") + (synopsis "Interactive Guix manifests") + (description "This package provides functions to generate Guix manifests +interactively. It works by scanning an alist of package categories, to ask the +user which package sets would they like to install from it.") + (license license:gpl3+)))) + (define-public guile-wisp (package (name "guile-wisp") -- cgit v1.2.3 From f92e8e5ed1c01ec87a88b1bb71a898da5f20fb8c Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 24 Mar 2021 04:04:05 +0100 Subject: gnu: Add emacs-julia-repl. * gnu/packages/emacs-xyz.scm (emacs-julia-repl): New variable. Signed-off-by: Christopher Baines --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 52191f3ebc..92aa2e40b4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -95,6 +95,7 @@ ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Stefan Reichör +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -8736,6 +8737,29 @@ E-Prime forbids the use of the \"to be\" form to strengthen your writing.") programming language.") (license license:expat))) +(define-public emacs-julia-repl + (package + (name "emacs-julia-repl") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpapp/julia-repl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11vpqqnxqj9nxh8kccj4y6h3f8lib6jxnsk6vxc2j2fqw6alnafm")))) + (build-system emacs-build-system) + (home-page "https://github.com/tpapp/julia-repl") + (synopsis "Minor mode for interacting with a Julia REPL") + (description "This package provides a minor mode for interacting with a +Julia REPL running inside Emacs. The julia process is started in an ANSI +terminal (term), which allows text formatting and colors, and interaction with +the help system and the debugger. It is recommended that you use this minor +mode with the package emacs-julia-mode.") + (license license:expat))) + (define-public emacs-smex (package (name "emacs-smex") -- cgit v1.2.3 From f27bdad0a7a3c3d6edbfa2c6809f19592fe5ba56 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 24 Mar 2021 04:04:06 +0100 Subject: gnu: Add emacs-julia-snail. * gnu/packages/emacs-xyz.scm (emacs-julia-snail): New variable. Signed-off-by: Christopher Baines --- gnu/packages/emacs-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 92aa2e40b4..7fe8ab5c83 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8760,6 +8760,46 @@ the help system and the debugger. It is recommended that you use this minor mode with the package emacs-julia-mode.") (license license:expat))) +(define-public emacs-julia-snail + (package + (name "emacs-julia-snail") + (version "1.0.0rc4") ;rc5 requires CSTParser (julia package) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gcv/julia-snail") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'JuliaSnail-jl + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "JuliaSnail.jl" + (string-append out "/share/emacs/site-lisp/"))) + #t))))) + (inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s) + ("emacs-spinner" ,emacs-spinner) + ("emacs-xref" ,emacs-xref))) + (propagated-inputs + `(("libvterm" ,libvterm) + ("emacs-julia-mode" ,emacs-julia-mode) ;required by parser + ("emacs-parsec" ,emacs-parsec) ;required by parser + ("emacs-vterm" ,emacs-vterm))) + (home-page "https://github.com/gcv/julia-snail") + (synopsis "Development environment and REPL interaction package for Julia") + (description "This package provides a development environment and REPL +interaction package for Julia in the spirit of Common Lisp’s SLIME and +Clojure’s CIDER. It enables convenient and dynamic REPL-driven development.") + (license license:gpl3))) + (define-public emacs-smex (package (name "emacs-smex") -- cgit v1.2.3 From 9ce963d8b3dc480c3bb4b797cf7e2eda0a3aca99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 31 Mar 2021 09:44:27 +0200 Subject: gnu: mumi: Update to 0.0.1-4.887471f. * gnu/packages/mail.scm (mumi): Update to 0.0.1-4.887471f. --- gnu/packages/mail.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 68c2fe2433..fdbbaf1784 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Langlois ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2019, 2020 Tanguy Le Carrour ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Justus Winter @@ -3873,8 +3873,8 @@ It is a replacement for the @command{urlview} program.") (license license:gpl2+))) (define-public mumi - (let ((commit "8c82c8f104ff0013e2bfb3d6b4277280f32446a6") - (revision "3")) + (let ((commit "887471f7785c74dd8ee5d300d3b1fb58e011c2cb") + (revision "4")) (package (name "mumi") (version (git-version "0.0.1" revision commit)) @@ -3886,7 +3886,7 @@ It is a replacement for the @command{urlview} program.") (file-name (git-file-name name version)) (sha256 (base32 - "1gkwagy7qplzq2x2zqsbrwhlilxviqb0dqhrvnnhxd7z8wvyzcsi")))) + "1lmnnfa42j0bcscxbyx5y48v4l0hyvnh4kq4sjrqw92v0h93iksg")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From b0b0257ed30084ff95694653482890bc7061f9c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 12:42:57 +0300 Subject: gnu: python-icalendar: Update to 4.0.7. * gnu/packages/python-xyz.scm (python-icalendar): Update to 4.0.7. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c90a89a411..74aee4a3c2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11060,13 +11060,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.5") + (version "4.0.7") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "14ynjj65kfmlcvpb7k097w789wvxncd3cr3xz5m1jz9yl9v6vv5q")))) + "19574j3jwssm2dkqykih4568xqfgjsa3hcd79yl5s2vfys3qvh8g")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.2.3 From 26133b1f33c8fbce63ed058df80f3e5181803f68 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 31 Mar 2021 12:08:50 +0100 Subject: gnu: Add texlive-fourier. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 85678ff4be..66844ed321 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7859,3 +7859,28 @@ font families: Bera Serif (a slab-serif Roman), Bera Sans (a Frutiger descendant) and Bera Mono (monospaced/typewriter). The Bera family is a repackaging, for use with TeX, of the Bitstream Vera family.") (license license:silofl1.1))) + +(define-public texlive-fourier + (package + (inherit (simple-texlive-package + "texlive-fourier" + (list "/doc/fonts/fourier/" + "/fonts/afm/public/fourier/" + "/fonts/map/dvips/fourier/" + "/fonts/tfm/public/fourier/" + "/fonts/type1/public/fourier/" + "/fonts/vf/public/fourier/" + "/tex/latex/fourier/") + (base32 + "1vs2xdx6f6hd01zlslx3y93g3dsa7k3yhqpnhgkizgjmz0r9ipz1") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/fourier") + (synopsis "Utopia fonts for LaTeX documents") + (description "Fourier-GUTenberg is a LaTeX typesetting system +which uses Adobe Utopia as its standard base font. Fourier-GUTenberg +provides all complementary typefaces needed to allow Utopia based TeX +typesetting including an extensive mathematics set and several other +symbols. The system is absolutely stand-alone; apart from Utopia and +Fourier no other typefaces are required. Utopia is a registered +trademark of Adobe Systems Incorporated.") + (license license:lppl))) -- cgit v1.2.3 From 58e9e0e1428e362777ccbb317df2d051ff76ce5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 14:12:24 +0300 Subject: gnu: plink-ng: Update to 2.00a2.3. * gnu/packages/bioinformatics.scm (plink-ng): Update to 2.00a2.3. [arguments]: Adjust make-flags. --- gnu/packages/bioinformatics.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a81c873371..49ae8b155f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6290,7 +6290,7 @@ subsequent visualization, annotation and storage of results.") (define-public plink-ng (package (inherit plink) (name "plink-ng") - (version "1.90b4") + (version "2.00a2.3") (source (origin (method git-fetch) @@ -6299,14 +6299,13 @@ subsequent visualization, annotation and storage of results.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02npdwgkpfkdnhw819rhj5kw02a5k5m90b14zq9zzya4hyg929c0")))) + (base32 "1p88lz9agzjlspjhciz61qjc36cfniv4nkxszyy0njqyc5rzc0cd")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;no "check" target #:make-flags (list "BLASFLAGS=-llapack -lopenblas" "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" - "ZLIB=-lz" - "-f" "Makefile.std") + "ZLIB=-lz") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir -- cgit v1.2.3 From 977ea2c0a35da76a034f1a14f7af26b937d795fb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 14:14:48 +0300 Subject: gnu: plink-ng: Sort inputs alphabetically. * gnu/packages/bioinformatics.scm (plink-ng)[inputs]: Sort alphabetically. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 49ae8b155f..5af8d0b412 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6318,9 +6318,9 @@ subsequent visualization, annotation and storage of results.") (install-file "plink" bin) #t)))))) (inputs - `(("zlib" ,zlib) - ("lapack" ,lapack) - ("openblas" ,openblas))) + `(("lapack" ,lapack) + ("openblas" ,openblas) + ("zlib" ,zlib))) (home-page "https://www.cog-genomics.org/plink/") (license license:gpl3+))) -- cgit v1.2.3 From 5f3f2a7cc8e186a33c0c3175f765afdc3e78be18 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 14:20:08 +0300 Subject: gnu: plink-ng: Remove custom install phase. * gnu/packages/bioinformatics.scm (plink-ng)[arguments]: Adjust make-flags and remove custom 'install phase. --- gnu/packages/bioinformatics.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5af8d0b412..cf2a8deea2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6305,18 +6305,14 @@ subsequent visualization, annotation and storage of results.") '(#:tests? #f ;no "check" target #:make-flags (list "BLASFLAGS=-llapack -lopenblas" "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" - "ZLIB=-lz") + "ZLIB=-lz" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + "DESTDIR=") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "1.9") #t)) - (delete 'configure) ; no "configure" script - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") - "/bin/"))) - (install-file "plink" bin) - #t)))))) + (delete 'configure)))) ; no "configure" script (inputs `(("lapack" ,lapack) ("openblas" ,openblas) -- cgit v1.2.3 From 04ba7a196ab23539f1c7897ca5349fa635c5e88d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 14:27:41 +0300 Subject: gnu: plink-ng: Build prettify binary. * gnu/packages/bioinformatics.scm (plink-ng)[arguments]: Adjust make-flags to also build prettify. --- gnu/packages/bioinformatics.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cf2a8deea2..ae45ff8d3c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6302,10 +6302,12 @@ subsequent visualization, annotation and storage of results.") (base32 "1p88lz9agzjlspjhciz61qjc36cfniv4nkxszyy0njqyc5rzc0cd")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;no "check" target + `(#:tests? #f ;no "check" target #:make-flags (list "BLASFLAGS=-llapack -lopenblas" "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" "ZLIB=-lz" + "BIN=plink prettify" + (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out")) "DESTDIR=") #:phases -- cgit v1.2.3 From 383b02a370252c08eb1d43ac94d659c1d3993a35 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:22 +0000 Subject: gnu: libvirt: Update to 7.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (libvirt): Update to 7.1.0. [source]: Remove libvirt-create-machine-cgroup.patch, add libvirt-do-not-create-var-dirs.patch. [build-system]: Switch to meson-build-system. [arguments]: Use meson-0.55. Adapt #:configure-flags for meson, there is no need for --docdir anymore. Remove fix-BOURNE_SHELL-definition phase. Add fix-sysconfdir-and-localstatedir phase. Adapt disable-broken-tests to meson. [native-inputs]: Add python-docutils and rpcsvc-proto. * gnu/packages/patches/libvirt-create-machine-cgroup.patch: Delete. * gnu/packages/patches/libvirt-do-not-create-var-dirs.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add new patch, remove the other. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 +- .../patches/libvirt-create-machine-cgroup.patch | 48 ------------- .../patches/libvirt-do-not-create-var-dirs.patch | 30 +++++++++ gnu/packages/virtualization.scm | 78 +++++++++------------- 4 files changed, 64 insertions(+), 94 deletions(-) delete mode 100644 gnu/packages/patches/libvirt-create-machine-cgroup.patch create mode 100644 gnu/packages/patches/libvirt-do-not-create-var-dirs.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index deb4ddcede..d8c548b0eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1262,7 +1262,7 @@ dist_patch_DATA = \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ - %D%/packages/patches/libvirt-create-machine-cgroup.patch \ + %D%/packages/patches/libvirt-do-not-create-var-dirs.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/patches/libvirt-create-machine-cgroup.patch b/gnu/packages/patches/libvirt-create-machine-cgroup.patch deleted file mode 100644 index 585ac237e1..0000000000 --- a/gnu/packages/patches/libvirt-create-machine-cgroup.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= - -Date: Fri, 1 Nov 2019 17:29:00 +0100 -Subject: [PATCH] vircgroup: Ensure /machine group is associated with its - parent. - -Call first virCgroupNew on the parent group virCgroupNewPartition if -it is available on before the creation of the child group. This -ensures that the creation of a first level group on the unified -architecture, as the check at virCgroupV2ParseControllersFile as the -parent file is there. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1760233 ---- - src/util/vircgroup.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c -index b46f20abfd..33c61f2d45 100644 ---- a/src/util/vircgroup.c -+++ b/src/util/vircgroup.c -@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path, - if (virCgroupSetPartitionSuffix(path, &newPath) < 0) - goto cleanup; - -- if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) -- goto cleanup; -- - if (STRNEQ(newPath, "/")) { - char *tmp; - parentPath = g_strdup(newPath); -@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path, - - if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) - goto cleanup; -+ } - -+ if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) -+ goto cleanup; -+ -+ if (parent) { - if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) - goto cleanup; - } --- -2.23.0 - diff --git a/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch new file mode 100644 index 0000000000..6b89d49fd4 --- /dev/null +++ b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch @@ -0,0 +1,30 @@ +We define localstatedir as /var, and so we shouldn't be installing empty +directories there. + +diff --git a/src/meson.build b/src/meson.build +index f13b85b74e..58040f2c5d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -893,22 +893,6 @@ if conf.has('WITH_DTRACE_PROBES') + ) + endif + +- +-# Install empty directories +- +-virt_install_dirs += [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', +-] +- +-meson.add_install_script( +- meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.path(), +- virt_install_dirs, +-) +- +- + # Check driver files + + if host_machine.system() == 'linux' diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c6929b9f1a..7a34f8db1f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1065,64 +1066,49 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "5.8.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) + (base32 "0v50ckf56h6jd9bmqwp0lh2cmb7qqjmcb6y3mz2i2r15h06ih3w7")) (patches - (search-patches "libvirt-create-machine-cgroup.patch")))) - (build-system gnu-build-system) + (search-patches "libvirt-do-not-create-var-dirs.patch")))) + (build-system meson-build-system) (arguments - `(#:configure-flags - (list "--with-qemu" - "--with-qemu-user=nobody" - "--with-qemu-group=kvm" - "--with-polkit" - (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" - ,name "-" ,version) - "--sysconfdir=/etc" - "--localstatedir=/var") + `(#:meson ,meson-0.55 ;; libvirt requires meson 0.54 or higher. + #:configure-flags + (list "-Ddriver_qemu=enabled" + "-Dqemu_user=nobody" + "-Dqemu_group=kvm" + "-Dpolkit=enabled") #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-BOURNE_SHELL-definition - ;; BOURNE_SHELL is hard-#defined to ‘/bin/sh’, causing test failures. + (add-after 'unpack 'fix-sysconfdir-and-localstatedir (lambda _ - (substitute* "config.h.in" - (("/bin/sh") (which "sh"))) - #t)) - (add-before 'configure 'patch-libtirpc-file-names - (lambda* (#:key inputs #:allow-other-keys) - ;; libvirt uses an m4 macro instead of pkg-config to determine where - ;; the RPC headers are located. Tell it to look in the right place. - (substitute* "configure" - (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 - (string-append (assoc-ref inputs "libtirpc") - "/include/tirpc"))) + (substitute* "meson.build" + ;; We set the prefix to be the package output, but we need + ;; localstatedir to be /var. Sadly the build system doesn't + ;; seem to allow that easily. + (("localstatedir = prefix / get_option\\('localstatedir'\\)") + "localstatedir = get_option('localstatedir')") + ;; On the other hand, we keep sysconfdir using the prefix so + ;; that we install configuration files in the package output. + ;; However, we need to make sure the C code refers to /etc via + ;; SYSCONFDIR, and not the read-only configuration in the + ;; package output. + (("set_quoted\\('SYSCONFDIR', sysconfdir\\)") + "set_quoted('SYSCONFDIR', '/etc')")) #t)) (add-before 'configure 'disable-broken-tests (lambda _ - (let ((tests (list "commandtest" ; hangs idly - "qemuxml2argvtest" ; fails - "qemuhotplugtest" ; fails - "virnetsockettest" ; tries to network - "virshtest"))) ; fails - (substitute* "tests/Makefile.in" - (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|"))) - "")) - #t))) - (replace 'install - ;; Since the sysconfdir and localstatedir should be /etc and /var - ;; at runtime, we must prevent writing to them at installation - ;; time. - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install" - "sysconfdir=/tmp/etc" - "localstatedir=/tmp/var" - make-flags)))))) + (substitute* "tests/meson.build" + (("\\{ 'name': 'commandtest'.*") "") ; hangs idly + (("\\{ 'name': 'qemuxml2argvtest'.*") "") ; fails + (("\\{ 'name': 'virnetsockettest'.*") "")) ; tries to network + #t))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) @@ -1149,7 +1135,9 @@ manage system or application containers.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-docutils" ,python-docutils) ;for rst2html + ("rpcsvc-proto" ,rpcsvc-proto))) ;for 'rpcgen' (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization -- cgit v1.2.3 From 52ed12afcb4618f0a9801b10799d8bbdffe87878 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:23 +0000 Subject: gnu: python-libvirt: Update to 7.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (python-libvirt): Update to 7.1.0. Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7a34f8db1f..e1b780bbe1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1191,14 +1191,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "5.8.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) + (base32 "0dq0qn0xx5hflaq5apj5pm79ba0wcl3w0j9klx8bg73z80gd7bzs")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 7573ab22d7400a16d81228c6500331a293887cae Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:24 +0000 Subject: gnu: libvirt-glib: Update to 4.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (libvirt-glib): Update to 4.0.0. [build-system]: Switch to meson-build-system. Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e1b780bbe1..8fcdb660ce 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1149,15 +1149,15 @@ to integrate other virtualization mechanisms if needed.") (define-public libvirt-glib (package (name "libvirt-glib") - (version "3.0.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "ftp://libvirt.org/libvirt/glib/" - "libvirt-glib-" version ".tar.gz")) + "libvirt-glib-" version ".tar.xz")) (sha256 (base32 - "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz")))) - (build-system gnu-build-system) + "1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4")))) + (build-system meson-build-system) (inputs `(("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From 5eb05ede0bf0cfe3080a24eea783f0fbc2ed4015 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:25 +0000 Subject: gnu: virt-manager: Update to 3.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (virt-manager): Update to 3.2.0. [arguments]: Remove #:test-target. Remove fix-qemu-img-reference phase. Adapt check phase to use pytest, although they still do not run. [native-inputs]: Add python-docutils. Suggest adding python-pytest to enable tests. Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8fcdb660ce..ab7d8deec6 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1230,7 +1230,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "2.2.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -1238,11 +1238,10 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) + "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command - #:test-target "test_ui" #:tests? #f ; TODO The tests currently fail ; RuntimeError: Loop condition wasn't ; met @@ -1260,12 +1259,6 @@ virtualization library.") (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) - (add-after 'unpack 'fix-qemu-img-reference - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "virtconv/formats.py" - (("/usr(/bin/qemu-img)" _ suffix) - (string-append (assoc-ref inputs "qemu") suffix))) - #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. @@ -1296,11 +1289,12 @@ virtualization library.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") + (setenv "XDG_CACHE_HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be enabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) + (invoke "dbus-run-session" "--" "pytest" "--uitests")) #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) @@ -1330,7 +1324,9 @@ virtualization library.") ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool) + ("rst2man" ,python-docutils) ;; The following are required for running the tests + ;; ("python-pytest" ,python-pytest) ;; ("python-dogtail" ,python-dogtail) ;; ("xvfb" ,xorg-server-for-tests) ;; ("dbus" ,dbus) -- cgit v1.2.3 From fe0826d5c9264184cc7c9e754d8a486d03865c05 Mon Sep 17 00:00:00 2001 From: Valentin Herrmann Date: Sun, 21 Mar 2021 12:23:23 +0100 Subject: services: xorg: Export %default-xorg-server-arguments. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/xorg.scm (%default-xorg-server-arguments): Export. Signed-off-by: Ludovic Courtès --- gnu/services/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 60611dc77d..17d983ff8d 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -68,6 +68,8 @@ %default-xorg-modules %default-xorg-fonts + %default-xorg-server-arguments + xorg-wrapper xorg-start-command xinitrc -- cgit v1.2.3 From 4f547c50f9bc478fd7c8bb9d481e2e376b969e8a Mon Sep 17 00:00:00 2001 From: muradm Date: Mon, 22 Mar 2021 19:09:48 +0300 Subject: services: sysctl: Export record field accessors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/sysctl.scm (sysctl-configuration-sysctl) (sysctl-configuration-settings): Export. Signed-off-by: Ludovic Courtès --- gnu/services/sysctl.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/services/sysctl.scm b/gnu/services/sysctl.scm index aaea7cc30d..80ed2ff46f 100644 --- a/gnu/services/sysctl.scm +++ b/gnu/services/sysctl.scm @@ -25,6 +25,8 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (sysctl-configuration + sysctl-configuration-sysctl + sysctl-configuration-settings sysctl-service-type %default-sysctl-settings)) -- cgit v1.2.3 From 1410383dee23da457eabcf9162196c3a57fb8950 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 31 Mar 2021 15:40:40 +0200 Subject: gnu: Remove unnecessary imports from (gnu packages gnome). * gnu/packages/gnome.scm: Remove unnecessary #:use-module forms. In particular, the (guix store) import led to a name clash with 'build' from (gnu packages build-tools). --- gnu/packages/gnome.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e8af1c41f..1e2ee4a46e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014, 2016, 2020 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa @@ -201,7 +201,6 @@ #: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) @@ -215,8 +214,6 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix gexp) - #:use-module (guix monads) - #:use-module (guix store) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -- cgit v1.2.3 From f233bb170b072cf4801b2f229593b9680ea0224c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 31 Mar 2021 15:57:02 +0200 Subject: gnu: julia-commonsubexpressions: Fix Texinfo syntax. * gnu/packages/julia-xyz.scm (julia-commonsubexpressions)[synopsis] [description]: Fix Texinfo syntax. --- gnu/packages/julia-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index cbff69117d..85949ec9e8 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -304,8 +304,8 @@ with.") (propagated-inputs `(("julia-macrotools" ,julia-macrotools))) (home-page "https://github.com/rdeits/CommonSubexpressions.jl") - (synopsis "Macro @code{@cse}") - (description "This package provides the @code{@cse} macro, which performs + (synopsis "@code{@@cse} macro for Julia") + (description "This package provides the @code{@@cse} macro, which performs common subexpression elimination.") (license license:expat))) -- cgit v1.2.3 From cb7b577bcfa19d28a4c5dcc42449a6e019285539 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 31 Mar 2021 17:06:19 +0200 Subject: gnu: guix: Update to 8f9052d. * gnu/packages/package-management.scm (guix): Update to 8f9052d. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6ee0bc74e9..a6469e133d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "6e7ba45357078b31a369b23f8a9f38302dfcbb10") - (revision 18)) + (commit "8f9052d5434a3a11e7b4ff14d6b0090256e08aa4") + (revision 19)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "14zzhjdd7igkc8vpv06hn375085n10mljv8wwpnk6r4a6r8qg5d3")) + "0jqxabl9sqn7dd1l9q62zm9f7w274q44dya24akina8wwfi5yc4k")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From fbc186c1562a7d6513c3c306c044b08d3e857624 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 30 Mar 2021 17:12:15 -0400 Subject: gnu: git-annex: Update to 8.20210330. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20210330. Signed-off-by: Efraim Flashner --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index d7d5a0223a..8128c5425e 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -342,14 +342,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20210310") + (version "8.20210330") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1a4pr9z2li3wns1xycz7735nzzsv3cs8milr0q74k5qcqk5f22nx")))) + (base32 "07dhxlmnj48drgndcplafc7xhby0w3rks68fz9wsppxan929240p")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ce4ffdef9c081d8428ea6da115d072235b00d2e1 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 31 Mar 2021 18:04:41 +1100 Subject: gnu: strawberry: Update to 0.9.2. * gnu/packages/music.scm (strawberry): Update to 0.9.2. [arguments]: Remove unused configure flags. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 98cd3583cc..41e9372c6f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Leo Prikler ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -449,7 +450,7 @@ playing your music.") (define-public strawberry (package (name "strawberry") - (version "0.8.5") + (version "0.9.2") (source (origin (method git-fetch) (uri (git-reference @@ -458,7 +459,7 @@ playing your music.") (file-name (git-file-name name version)) (sha256 (base32 - "0lfbbmhfzwlhnjhzfk5zn8h71cabx47pzfkcw2nylkbqkz83r57r")) + "0d9asg21j9ai23sb35cimws8bd8fsnpha777rgscraa7i09q0rx2")) (modules '((guix build utils) (ice-9 regex))) (snippet @@ -482,9 +483,6 @@ playing your music.") (build-system cmake-build-system) (arguments `(#:test-target "run_strawberry_tests" - #:configure-flags - (list "-DUSE_SYSTEM_TAGLIB=TRUE" - "-DBUILD_TESTS=TRUE") #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program -- cgit v1.2.3 From c891799bc7945f44490fc51d81d9115c30352662 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:10:25 -0400 Subject: gnu: linux-libre: Update to 5.11.11. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.11. (linux-libre-5.11-pristine-source): Update hash. * gnu/packages/aux-files/linux-libre/5.11-x86_64.conf: Update for linux-libre@5.11.11. --- gnu/packages/aux-files/linux-libre/5.11-x86_64.conf | 2 +- gnu/packages/linux.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf index 178bb220d7..99d3cf74e2 100644 --- a/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf @@ -8212,7 +8212,7 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_XEN_BALLOON=y CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 +CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c5d3b31b8d..77980b9980 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.10") +(define-public linux-libre-5.11-version "5.11.11") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "07fw48sy8p17jmm24x3rl99cwxiwhwjrxnmy3g542w9kzawaqwnk"))) + (hash (base32 "1fc3yl4srzla3cbihgnry0pqmgcc17zv0zlkk9zpx99371hpay0a"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit v1.2.3 From 60dfd36fda23b619b969f3cde6b3dd238996e2b1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:10:37 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.27. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.27. (linux-libre-5.10-pristine-source): Update hash. * gnu/packages/aux-files/linux-libre/5.10-x86_64.conf: Update for linux-libre@5.10.27. --- gnu/packages/aux-files/linux-libre/5.10-x86_64.conf | 2 +- gnu/packages/linux.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf index 4836307163..189e4e16b4 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf @@ -8146,7 +8146,7 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_XEN_BALLOON=y CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 +CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 77980b9980..f22b421b61 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.26") +(define-public linux-libre-5.10-version "5.10.27") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "10hlc020imxxh71nvxhnnmd66bcxndfyi78v7wv7y5mcy4rjhlzw"))) + (hash (base32 "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 771f2e7c5654bfc6420e82892e0eca9cbe4ef535 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:10:54 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.109. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.109. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f22b421b61..5d098ed0ce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.108") +(define-public linux-libre-5.4-version "5.4.109") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj"))) + (hash (base32 "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 02db13e02348ac5ba07474634142d183faa73f1a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:11:12 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.184. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.184. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5d098ed0ce..7b299c08d7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.183") +(define-public linux-libre-4.19-version "4.19.184") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs"))) + (hash (base32 "0z5pgal8775rf7pvpxq47dnghr42al2k9py0s9jl3js2wamgdyix"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 4a5aec9c4224d3e7c9fd5cd004605867c84d8e38 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:11:29 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.228. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.228. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7b299c08d7..79e7f83454 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.227") +(define-public linux-libre-4.14-version "4.14.228") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7"))) + (hash (base32 "0nw1jf6x5a990n69aw2da4s4lc1c7mnwiwcda40bl2rkmd24s1qm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 38894abe6a53aa235261159e321bac091b79f5fe Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:11:46 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.264. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.264. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 79e7f83454..08d83fcd10 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.263") +(define-public linux-libre-4.9-version "4.9.264") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz"))) + (hash (base32 "1df2dv26c9z6zsdlqzbcc60f2pszh0hx1n94v65jswlb72a2mipc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 9287c6d8f56fae1928e4e253065a93fc747c8a2e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:12:00 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.264. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.264. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 08d83fcd10..8a6ae502dc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.263") +(define-public linux-libre-4.4-version "4.4.264") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1qqh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2"))) + (hash (base32 "1b0d735qnk0bcqn9gdsjqxhk8pkb3597ya9f34lv1vjfaqkkxk7l"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 172b85aa99e62f3b765df530f38e465c7eb4ac8d Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 17 Mar 2021 21:14:12 +0100 Subject: gnu: r-bisquerna: Move to (gnu packages bioconductor). * gnu/packages/cran.scm (r-bisquerna): Move this variable from here... * gnu/packages/bioconductor.scm (r-bisquerna): ...to here. --- gnu/packages/bioconductor.scm | 26 ++++++++++++++++++++++++++ gnu/packages/cran.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0bcd9a67cd..87822419c4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1315,6 +1315,32 @@ naming and share the same rich and consistent \"Vector API\" as much as possible.") (license license:artistic2.0))) +;; This is a CRAN package, but it depends on r-biobase from Bioconductor. +(define-public r-bisquerna + (package + (name "r-bisquerna") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (cran-uri "BisqueRNA" version)) + (sha256 + (base32 + "01g34n87ml7n3pck77497ddgbv3rr5p4153ac8ninpgjijlm3jw2")))) + (properties `((upstream-name . "BisqueRNA"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-limsolve" ,r-limsolve))) + (home-page "https://www.biorxiv.org/content/10.1101/669911v1") + (synopsis "Decomposition of bulk expression with single-cell sequencing") + (description "This package provides tools to accurately estimate cell type +abundances from heterogeneous bulk expression. A reference-based method +utilizes single-cell information to generate a signature matrix and +transformation of bulk expression for accurate regression based estimates. +A marker-based method utilizes known cell-specific marker genes to measure +relative abundances across samples.") + (license license:gpl3))) + ;; This is a CRAN package, but it depends on r-bsgenome-hsapiens-ucsc-hg19 ;; from Bioconductor. (define-public r-deconstructsigs diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e90e2b3363..18a614e7e4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2839,31 +2839,6 @@ where the bound function accepts additional arguments.") bindings that call a C++ function.") (license license:expat))) -(define-public r-bisquerna - (package - (name "r-bisquerna") - (version "1.0.4") - (source (origin - (method url-fetch) - (uri (cran-uri "BisqueRNA" version)) - (sha256 - (base32 - "01g34n87ml7n3pck77497ddgbv3rr5p4153ac8ninpgjijlm3jw2")))) - (properties `((upstream-name . "BisqueRNA"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-limsolve" ,r-limsolve))) - (home-page "https://www.biorxiv.org/content/10.1101/669911v1") - (synopsis "Decomposition of bulk expression with single-cell sequencing") - (description "This package provides tools to accurately estimate cell type -abundances from heterogeneous bulk expression. A reference-based method -utilizes single-cell information to generate a signature matrix and -transformation of bulk expression for accurate regression based estimates. -A marker-based method utilizes known cell-specific marker genes to measure -relative abundances across samples.") - (license license:gpl3))) - (define-public r-auc (package (name "r-auc") -- cgit v1.2.3 From 928221850883482f1c8c30c678a43b8a887aef3e Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 17 Mar 2021 21:14:13 +0100 Subject: gnu: r-absfiltergsea: Move to (gnu packages bioconductor). * gnu/packages/cran.scm (r-absfiltergsea): Move this variable from here... * gnu/packages/bioconductor.scm (r-absfiltergsea): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/cran.scm | 27 --------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 87822419c4..3d147bcb0a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1315,6 +1315,34 @@ naming and share the same rich and consistent \"Vector API\" as much as possible.") (license license:artistic2.0))) +;; This is a CRAN package, but it depends on r-biobase and r-limma from Bioconductor. +(define-public r-absfiltergsea + (package + (name "r-absfiltergsea") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "AbsFilterGSEA" version)) + (sha256 + (base32 "15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w")))) + (properties `((upstream-name . "AbsFilterGSEA"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-deseq" ,r-deseq) + ("r-limma" ,r-limma) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) + (home-page "https://cran.r-project.org/web/packages/AbsFilterGSEA/") + (synopsis "Improved false positive control of gene-permuting with absolute filtering") + (description + "This package provides a function that performs gene-permuting of a gene-set +enrichment analysis (GSEA) calculation with or without the absolute filtering. + Without filtering, users can perform (original) two-tailed or one-tailed +absolute GSEA.") + (license license:gpl2))) + ;; This is a CRAN package, but it depends on r-biobase from Bioconductor. (define-public r-bisquerna (package diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 18a614e7e4..044ad8f5bb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26618,33 +26618,6 @@ include Markov models of discrete and continuous trait evolution and constant rate speciation and extinction.") (license license:gpl2+))) -(define-public r-absfiltergsea - (package - (name "r-absfiltergsea") - (version "1.5.1") - (source - (origin - (method url-fetch) - (uri (cran-uri "AbsFilterGSEA" version)) - (sha256 - (base32 "15srxkxsvn38kd5frdrwfdf0ad8gskrd0h01wmdf9hglq8fjrp7w")))) - (properties `((upstream-name . "AbsFilterGSEA"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-deseq" ,r-deseq) - ("r-limma" ,r-limma) - ("r-rcpp" ,r-rcpp) - ("r-rcpparmadillo" ,r-rcpparmadillo))) - (home-page "https://cran.r-project.org/web/packages/AbsFilterGSEA/") - (synopsis "Improved false positive control of gene-permuting with absolute filtering") - (description - "This package provides a function that performs gene-permuting of a gene-set -enrichment analysis (GSEA) calculation with or without the absolute filtering. - Without filtering, users can perform (original) two-tailed or one-tailed -absolute GSEA.") - (license license:gpl2))) - (define-public r-calculus (package (name "r-calculus") -- cgit v1.2.3 From 23686ba3eb7c56fc9aeb5785df8703c7f795f766 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 17 Mar 2021 21:14:14 +0100 Subject: Revert "Revert some commits that caused `guix pull` to fail." This reverts commit 8ec0ca8faff62f19426f22aeb1bd59a8950ca05a. --- gnu/packages/bioconductor.scm | 333 ++++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 305 ------------------------------------ 2 files changed, 333 insertions(+), 305 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3d147bcb0a..ccf468e420 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1233,6 +1233,39 @@ data. In addition, provides numerous plotting functions for commonly used visualizations.") (license license:artistic2.0))) +(define-public r-delayedarray + (package + (name "r-delayedarray") + (version "0.16.2") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "DelayedArray" version)) + (sha256 + (base32 + "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) + (properties + `((upstream-name . "DelayedArray"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-s4vectors" ,r-s4vectors) + ("r-iranges" ,r-iranges) + ("r-matrix" ,r-matrix) + ("r-matrixgenerics" ,r-matrixgenerics))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/DelayedArray") + (synopsis "Delayed operations on array-like objects") + (description + "Wrapping an array-like object (typically an on-disk object) in a +@code{DelayedArray} object allows one to perform common array operations on it +without loading the object in memory. In order to reduce memory usage and +optimize performance, operations on the object are either delayed or executed +using a block processing mechanism. Note that this also works on in-memory +array-like objects like @code{DataFrame} objects (typically with Rle columns), +@code{Matrix} objects, and ordinary arrays and data frames.") + (license license:artistic2.0))) + (define-public r-bluster (package (name "r-bluster") @@ -1613,6 +1646,35 @@ structure.") microarrays.") (license license:artistic2.0))) +(define-public r-annotationdbi + (package + (name "r-annotationdbi") + (version "1.52.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "AnnotationDbi" version)) + (sha256 + (base32 + "0zqxgh3nx6y8ry12s2vss2f4axz5vpqxha1y4ifhhcx4zhpzsglr")))) + (properties + `((upstream-name . "AnnotationDbi"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-dbi" ,r-dbi) + ("r-iranges" ,r-iranges) + ("r-rsqlite" ,r-rsqlite) + ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/AnnotationDbi") + (synopsis "Annotation database interface") + (description + "This package provides user interface and database connection code for +annotation data packages using SQLite data storage.") + (license license:artistic2.0))) + (define-public r-annotationforge (package (name "r-annotationforge") @@ -1645,6 +1707,148 @@ microarrays.") databases. Packages produced are intended to be used with AnnotationDbi.") (license license:artistic2.0))) +(define-public r-biobase + (package + (name "r-biobase") + (version "2.50.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Biobase" version)) + (sha256 + (base32 + "11kgc4flywlm3i18603558l8ksv91c24vkc5fnnbcd375i2dhhd4")))) + (properties + `((upstream-name . "Biobase"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics))) + (home-page "https://bioconductor.org/packages/Biobase") + (synopsis "Base functions for Bioconductor") + (description + "This package provides functions that are needed by many other packages +on Bioconductor or which replace R functions.") + (license license:artistic2.0))) + +(define-public r-biomart + (package + (name "r-biomart") + (version "2.46.3") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "biomaRt" version)) + (sha256 + (base32 + "0gwmd0ykpv0gyh34c56g5m12lil20fvig49f3ih1jxrxf3q4wmq7")))) + (properties + `((upstream-name . "biomaRt"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-biocfilecache" ,r-biocfilecache) + ("r-httr" ,r-httr) + ("r-openssl" ,r-openssl) + ("r-progress" ,r-progress) + ("r-rappdirs" ,r-rappdirs) + ("r-stringr" ,r-stringr) + ("r-xml" ,r-xml) + ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/biomaRt") + (synopsis "Interface to BioMart databases") + (description + "biomaRt provides an interface to a growing collection of databases +implementing the @url{BioMart software suite, http://www.biomart.org}. The +package enables retrieval of large amounts of data in a uniform way without +the need to know the underlying database schemas or write complex SQL queries. +Examples of BioMart databases are Ensembl, COSMIC, Uniprot, HGNC, Gramene, +Wormbase and dbSNP mapped to Ensembl. These major databases give biomaRt +users direct access to a diverse set of data and enable a wide range of +powerful online queries from gene annotation to database mining.") + (license license:artistic2.0))) + +(define-public r-biocparallel + (package + (name "r-biocparallel") + (version "1.24.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "BiocParallel" version)) + (sha256 + (base32 + "1iryicvmcagcrj29kp49mqhiq2kn72j4idj380hi9illmdrg9ism")))) + (properties + `((upstream-name . "BiocParallel"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + ;; Remove generated documentation. + (for-each delete-file + '("inst/doc/BiocParallel_BatchtoolsParam.pdf" + "inst/doc/Introduction_To_BiocParallel.pdf" + "inst/doc/Errors_Logs_And_Debugging.pdf" + "inst/doc/BiocParallel_BatchtoolsParam.R" + "inst/doc/Introduction_To_BiocParallel.R" + "inst/doc/Errors_Logs_And_Debugging.R")) + + ;; Remove time-dependent macro + (substitute* '("inst/doc/BiocParallel_BatchtoolsParam.Rnw" + "inst/doc/Introduction_To_BiocParallel.Rnw" + "inst/doc/Errors_Logs_And_Debugging.Rnw" + "vignettes/BiocParallel_BatchtoolsParam.Rnw" + "vignettes/Introduction_To_BiocParallel.Rnw" + "vignettes/Errors_Logs_And_Debugging.Rnw") + (("\\today") "later")) + + ;; Initialize the random number generator seed when building. + (substitute* "R/internal_rng_stream.R" + (("\"L'Ecuyer-CMRG\"\\)" m) + (string-append + m "; if (!is.na(Sys.getenv(\"SOURCE_DATE_EPOCH\"))) {set.seed(100)}\n")))))))) + (propagated-inputs + `(("r-futile-logger" ,r-futile-logger) + ("r-snow" ,r-snow) + ("r-bh" ,r-bh))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/BiocParallel") + (synopsis "Bioconductor facilities for parallel evaluation") + (description + "This package provides modified versions and novel implementation of +functions for parallel evaluation, tailored to use with Bioconductor +objects.") + (license (list license:gpl2+ license:gpl3+)))) + +(define-public r-biostrings + (package + (name "r-biostrings") + (version "2.58.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Biostrings" version)) + (sha256 + (base32 + "1rbqhs73mhfr1gi0rx28jiyan7i3hb45ai3jpl1656fnrhgjfxq5")))) + (properties + `((upstream-name . "Biostrings"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-crayon" ,r-crayon) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/Biostrings") + (synopsis "String objects and algorithms for biological sequences") + (description + "This package provides memory efficient string containers, string +matching algorithms, and other utilities, for fast manipulation of large +biological sequences or sets of sequences.") + (license license:artistic2.0))) + (define-public r-category (package (name "r-category") @@ -1845,6 +2049,37 @@ translation between different chromosome sequence naming conventions (e.g., names in their natural, rather than lexicographic, order.") (license license:artistic2.0))) +(define-public r-genomicranges + (package + (name "r-genomicranges") + (version "1.42.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "GenomicRanges" version)) + (sha256 + (base32 + "0j4py5g6pdj35xhlaqhxxhg55j9l4mcdk3yck4dgyavv5f2dh24i")))) + (properties + `((upstream-name . "GenomicRanges"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/GenomicRanges") + (synopsis "Representation and manipulation of genomic intervals") + (description + "This package provides tools to efficiently represent and manipulate +genomic annotations and alignments is playing a central role when it comes to +analyzing high-throughput sequencing data (a.k.a. NGS data). The +GenomicRanges package defines general purpose containers for storing and +manipulating genomic intervals and variables defined along a genome.") + (license license:artistic2.0))) + (define-public r-gostats (package (name "r-gostats") @@ -1925,6 +2160,25 @@ Enrichment Analysis} (GSEA).") the Human Protein Atlas project.") (license license:artistic2.0))) +(define-public r-limma + (package + (name "r-limma") + (version "3.46.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "limma" version)) + (sha256 + (base32 + "1xxv493q1kip9bjfv7v7k5dnq7hz7gvl80i983v4mvwavhgnbxfz")))) + (build-system r-build-system) + (home-page "http://bioinf.wehi.edu.au/limma") + (synopsis "Package for linear models for microarray and RNA-seq data") + (description "This package can be used for the analysis of gene expression +studies, especially the use of linear models for analysing designed experiments +and the assessment of differential expression. The analysis methods apply to +different technologies, including microarrays, RNA-seq, and quantitative PCR.") + (license license:gpl2+))) + (define-public r-rbgl (package (name "r-rbgl") @@ -2029,6 +2283,49 @@ reports together for a particular project that can be viewed in a web browser.") (license license:artistic2.0))) +(define-public r-rsamtools + (package + (name "r-rsamtools") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Rsamtools" version)) + (sha256 + (base32 + "040pggkwglc6wy90qnc7xcdnaj0v3iqlykvvsl74241409qly554")))) + (properties + `((upstream-name . "Rsamtools"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-zlib + (lambda _ + (substitute* "DESCRIPTION" + (("zlibbioc, ") "")) + (substitute* "NAMESPACE" + (("import\\(zlibbioc\\)") "")) + #t))))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biostrings" ,r-biostrings) + ("r-bitops" ,r-bitops) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-rhtslib" ,r-rhtslib) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") + (synopsis "Interface to samtools, bcftools, and tabix") + (description + "This package provides an interface to the @code{samtools}, +@code{bcftools}, and @code{tabix} utilities for manipulating SAM (Sequence +Alignment / Map), FASTA, binary variant call (BCF) and compressed indexed +tab-delimited (tabix) files.") + (license license:expat))) + (define-public r-shortread (package (name "r-shortread") @@ -2164,6 +2461,42 @@ annotation infrastructure.") coding changes and predict coding outcomes.") (license license:artistic2.0))) +(define-public r-xvector + (package + (name "r-xvector") + (version "0.30.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "XVector" version)) + (sha256 + (base32 + "1pqljikg4f6jb7wgm5537zwgq5b013nyz1agjrwfq2cljb0ym6lq")))) + (properties + `((upstream-name . "XVector"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-zlib + (lambda _ + (substitute* "DESCRIPTION" + (("zlibbioc, ") "")) + (substitute* "NAMESPACE" + (("import\\(zlibbioc\\)") "")) + #t))))) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://bioconductor.org/packages/XVector") + (synopsis "Representation and manpulation of external sequences") + (description + "This package provides memory efficient S4 classes for storing sequences +\"externally\" (behind an R external pointer, or on disk).") + (license license:artistic2.0))) + (define-public r-geneplotter (package (name "r-geneplotter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ae45ff8d3c..9e7423637c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7693,311 +7693,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-limma - (package - (name "r-limma") - (version "3.46.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "limma" version)) - (sha256 - (base32 - "1xxv493q1kip9bjfv7v7k5dnq7hz7gvl80i983v4mvwavhgnbxfz")))) - (build-system r-build-system) - (home-page "http://bioinf.wehi.edu.au/limma") - (synopsis "Package for linear models for microarray and RNA-seq data") - (description "This package can be used for the analysis of gene expression -studies, especially the use of linear models for analysing designed experiments -and the assessment of differential expression. The analysis methods apply to -different technologies, including microarrays, RNA-seq, and quantitative PCR.") - (license license:gpl2+))) - -(define-public r-xvector - (package - (name "r-xvector") - (version "0.30.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "XVector" version)) - (sha256 - (base32 - "1pqljikg4f6jb7wgm5537zwgq5b013nyz1agjrwfq2cljb0ym6lq")))) - (properties - `((upstream-name . "XVector"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-zlib - (lambda _ - (substitute* "DESCRIPTION" - (("zlibbioc, ") "")) - (substitute* "NAMESPACE" - (("import\\(zlibbioc\\)") "")) - #t))))) - (inputs - `(("zlib" ,zlib))) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors))) - (home-page "https://bioconductor.org/packages/XVector") - (synopsis "Representation and manpulation of external sequences") - (description - "This package provides memory efficient S4 classes for storing sequences -\"externally\" (behind an R external pointer, or on disk).") - (license license:artistic2.0))) - -(define-public r-genomicranges - (package - (name "r-genomicranges") - (version "1.42.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "GenomicRanges" version)) - (sha256 - (base32 - "0j4py5g6pdj35xhlaqhxxhg55j9l4mcdk3yck4dgyavv5f2dh24i")))) - (properties - `((upstream-name . "GenomicRanges"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/GenomicRanges") - (synopsis "Representation and manipulation of genomic intervals") - (description - "This package provides tools to efficiently represent and manipulate -genomic annotations and alignments is playing a central role when it comes to -analyzing high-throughput sequencing data (a.k.a. NGS data). The -GenomicRanges package defines general purpose containers for storing and -manipulating genomic intervals and variables defined along a genome.") - (license license:artistic2.0))) - -(define-public r-biobase - (package - (name "r-biobase") - (version "2.50.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Biobase" version)) - (sha256 - (base32 - "11kgc4flywlm3i18603558l8ksv91c24vkc5fnnbcd375i2dhhd4")))) - (properties - `((upstream-name . "Biobase"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics))) - (home-page "https://bioconductor.org/packages/Biobase") - (synopsis "Base functions for Bioconductor") - (description - "This package provides functions that are needed by many other packages -on Bioconductor or which replace R functions.") - (license license:artistic2.0))) - -(define-public r-annotationdbi - (package - (name "r-annotationdbi") - (version "1.52.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "AnnotationDbi" version)) - (sha256 - (base32 - "0zqxgh3nx6y8ry12s2vss2f4axz5vpqxha1y4ifhhcx4zhpzsglr")))) - (properties - `((upstream-name . "AnnotationDbi"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-dbi" ,r-dbi) - ("r-iranges" ,r-iranges) - ("r-rsqlite" ,r-rsqlite) - ("r-s4vectors" ,r-s4vectors))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/AnnotationDbi") - (synopsis "Annotation database interface") - (description - "This package provides user interface and database connection code for -annotation data packages using SQLite data storage.") - (license license:artistic2.0))) - -(define-public r-biomart - (package - (name "r-biomart") - (version "2.46.3") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "biomaRt" version)) - (sha256 - (base32 - "0gwmd0ykpv0gyh34c56g5m12lil20fvig49f3ih1jxrxf3q4wmq7")))) - (properties - `((upstream-name . "biomaRt"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotationdbi" ,r-annotationdbi) - ("r-biocfilecache" ,r-biocfilecache) - ("r-httr" ,r-httr) - ("r-openssl" ,r-openssl) - ("r-progress" ,r-progress) - ("r-rappdirs" ,r-rappdirs) - ("r-stringr" ,r-stringr) - ("r-xml" ,r-xml) - ("r-xml2" ,r-xml2))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/biomaRt") - (synopsis "Interface to BioMart databases") - (description - "biomaRt provides an interface to a growing collection of databases -implementing the @url{BioMart software suite, http://www.biomart.org}. The -package enables retrieval of large amounts of data in a uniform way without -the need to know the underlying database schemas or write complex SQL queries. -Examples of BioMart databases are Ensembl, COSMIC, Uniprot, HGNC, Gramene, -Wormbase and dbSNP mapped to Ensembl. These major databases give biomaRt -users direct access to a diverse set of data and enable a wide range of -powerful online queries from gene annotation to database mining.") - (license license:artistic2.0))) - -(define-public r-biocparallel - (package - (name "r-biocparallel") - (version "1.24.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "BiocParallel" version)) - (sha256 - (base32 - "1iryicvmcagcrj29kp49mqhiq2kn72j4idj380hi9illmdrg9ism")))) - (properties - `((upstream-name . "BiocParallel"))) - (build-system r-build-system) - (propagated-inputs - `(("r-futile-logger" ,r-futile-logger) - ("r-snow" ,r-snow) - ("r-bh" ,r-bh))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/BiocParallel") - (synopsis "Bioconductor facilities for parallel evaluation") - (description - "This package provides modified versions and novel implementation of -functions for parallel evaluation, tailored to use with Bioconductor -objects.") - (license (list license:gpl2+ license:gpl3+)))) - -(define-public r-biostrings - (package - (name "r-biostrings") - (version "2.58.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Biostrings" version)) - (sha256 - (base32 - "1rbqhs73mhfr1gi0rx28jiyan7i3hb45ai3jpl1656fnrhgjfxq5")))) - (properties - `((upstream-name . "Biostrings"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-crayon" ,r-crayon) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (home-page "https://bioconductor.org/packages/Biostrings") - (synopsis "String objects and algorithms for biological sequences") - (description - "This package provides memory efficient string containers, string -matching algorithms, and other utilities, for fast manipulation of large -biological sequences or sets of sequences.") - (license license:artistic2.0))) - -(define-public r-rsamtools - (package - (name "r-rsamtools") - (version "2.6.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Rsamtools" version)) - (sha256 - (base32 - "040pggkwglc6wy90qnc7xcdnaj0v3iqlykvvsl74241409qly554")))) - (properties - `((upstream-name . "Rsamtools"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-zlib - (lambda _ - (substitute* "DESCRIPTION" - (("zlibbioc, ") "")) - (substitute* "NAMESPACE" - (("import\\(zlibbioc\\)") "")) - #t))))) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-biocparallel" ,r-biocparallel) - ("r-biostrings" ,r-biostrings) - ("r-bitops" ,r-bitops) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicranges" ,r-genomicranges) - ("r-iranges" ,r-iranges) - ("r-rhtslib" ,r-rhtslib) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") - (synopsis "Interface to samtools, bcftools, and tabix") - (description - "This package provides an interface to the @code{samtools}, -@code{bcftools}, and @code{tabix} utilities for manipulating SAM (Sequence -Alignment / Map), FASTA, binary variant call (BCF) and compressed indexed -tab-delimited (tabix) files.") - (license license:expat))) - -(define-public r-delayedarray - (package - (name "r-delayedarray") - (version "0.16.2") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "DelayedArray" version)) - (sha256 - (base32 - "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) - (properties - `((upstream-name . "DelayedArray"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-s4vectors" ,r-s4vectors) - ("r-iranges" ,r-iranges) - ("r-matrix" ,r-matrix) - ("r-matrixgenerics" ,r-matrixgenerics))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/DelayedArray") - (synopsis "Delayed operations on array-like objects") - (description - "Wrapping an array-like object (typically an on-disk object) in a -@code{DelayedArray} object allows one to perform common array operations on it -without loading the object in memory. In order to reduce memory usage and -optimize performance, operations on the object are either delayed or executed -using a block processing mechanism. Note that this also works on in-memory -array-like objects like @code{DataFrame} objects (typically with Rle columns), -@code{Matrix} objects, and ordinary arrays and data frames.") - (license license:artistic2.0))) - (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") -- cgit v1.2.3 From 6b703a9aa872d26639359d56ac2811c11ed84b14 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 31 Mar 2021 21:23:28 +0200 Subject: gnu: mumi: Update to 0.0.1-5.9f070bd. * gnu/packages/mail.scm (mumi): Update to 0.0.1-5.9f070bd. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fdbbaf1784..489053544b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3873,8 +3873,8 @@ It is a replacement for the @command{urlview} program.") (license license:gpl2+))) (define-public mumi - (let ((commit "887471f7785c74dd8ee5d300d3b1fb58e011c2cb") - (revision "4")) + (let ((commit "9f070bd90adc67064cd8aff4e40f303d5957ef4a") + (revision "5")) (package (name "mumi") (version (git-version "0.0.1" revision commit)) @@ -3886,7 +3886,7 @@ It is a replacement for the @command{urlview} program.") (file-name (git-file-name name version)) (sha256 (base32 - "1lmnnfa42j0bcscxbyx5y48v4l0hyvnh4kq4sjrqw92v0h93iksg")))) + "1ym1j3nzy8qhd1ydadccbgm0nckkmnq3vnz9qh9x8rasx7zg1ldp")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From 94c77c9a0f7a1a4d7665d8fe566547016d2588d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Mar 2021 22:01:21 +0200 Subject: gnu: gimp: Ship a copy of the gegl patch. As Ludo' rightly points out, GitHub's patches are probably as stable as their tarballs. * gnu/packages/gimp.scm (gimp)[source]: Use SEARCH-PATCHES instead of an origin. * gnu/packages/patches/gimp-make-gegl-introspect-optional.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gimp.scm | 12 +----- .../gimp-make-gegl-introspect-optional.patch | 43 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/gimp-make-gegl-introspect-optional.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d8c548b0eb..3eeae5e96a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1082,6 +1082,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ + %D%/packages/patches/gimp-make-gegl-introspect-optional.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glib-CVE-2021-27218.patch \ diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index a0f6b7ca11..eee958171c 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -278,17 +278,7 @@ buffers.") "/gimp-" version ".tar.bz2")) (sha256 (base32 "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d")) - (patches - (list (origin - ;; This upstream patch fixes a mandatory dependency on ‘dot’: - ;; . - (method url-fetch) - (uri (string-append "https://github.com/GNOME/gimp/commit/" - "2cae9b9acf9da98c4c9990819ffbd5aabe23017e" - ".patch")) - (sha256 - (base32 - "1xd5lmy1j9p6p1ka7dyj1b9jmfcra1r62rma07vzw2v4vig0khc0"))))))) + (patches (search-patches "gimp-make-gegl-introspect-optional.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML diff --git a/gnu/packages/patches/gimp-make-gegl-introspect-optional.patch b/gnu/packages/patches/gimp-make-gegl-introspect-optional.patch new file mode 100644 index 0000000000..4dd1ab74a8 --- /dev/null +++ b/gnu/packages/patches/gimp-make-gegl-introspect-optional.patch @@ -0,0 +1,43 @@ +From 2cae9b9acf9da98c4c9990819ffbd5aabe23017e Mon Sep 17 00:00:00 2001 +From: Jehan +Date: Mon, 14 Dec 2020 19:53:38 +0100 +Subject: [PATCH] app: make "gegl:introspect" an optional operation dependency. + +Check at runtime for the operation availability and set the "Show Image +Graph" action active depending on this check. + +This goes with discussions to make this operation optional with a +runtime check for the tool `dot`. +See: https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/84 +--- + app/actions/debug-actions.c | 6 ++++++ + app/sanity.c | 1 - + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/app/actions/debug-actions.c b/app/actions/debug-actions.c +index 6be4422b228..22ca38b15ea 100644 +--- a/app/actions/debug-actions.c ++++ b/app/actions/debug-actions.c +@@ -103,4 +103,10 @@ void + debug_actions_update (GimpActionGroup *group, + gpointer data) + { ++#define SET_SENSITIVE(action,condition) \ ++ gimp_action_group_set_action_sensitive (group, action, (condition) != 0) ++ ++ SET_SENSITIVE ("debug-show-image-graph", gegl_has_operation ("gegl:introspect")); ++ ++#undef SET_SENSITIVE + } +diff --git a/app/sanity.c b/app/sanity.c +index 015801a396e..6374ac1ad20 100644 +--- a/app/sanity.c ++++ b/app/sanity.c +@@ -650,7 +650,6 @@ sanity_check_gegl_ops (void) + "gegl:hue-chroma", + "gegl:illusion", + "gegl:image-gradient", +- "gegl:introspect", + "gegl:invert-gamma", + "gegl:invert-linear", + "gegl:lens-blur", -- cgit v1.2.3 From 82cdde4f4c23f3f80856766492104062bd631940 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 1 Apr 2021 09:07:52 +0200 Subject: gnu: emacs-gif-screencast: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-gif-screencast): Update to 1.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7fe8ab5c83..f2f94c497f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19280,7 +19280,7 @@ try completing. See @code{fish-completion-fallback-on-bash-p}.") (define-public emacs-gif-screencast (package (name "emacs-gif-screencast") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -19290,7 +19290,7 @@ try completing. See @code{fish-completion-fallback-on-bash-p}.") (file-name (git-file-name name version)) (sha256 (base32 - "1g1by8lvf8c9vzm4wwsi5kp285kaj0ahsl54048ympin4pi0njw9")))) + "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh")))) (build-system emacs-build-system) (inputs `(("scrot" ,scrot) -- cgit v1.2.3 From 3772f95dc7bca694446121e1cef9bf4d78bfba55 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Apr 2021 10:47:06 +0300 Subject: gnu: ilmbase: Update to 2.5.5. * gnu/packages/graphics.scm (ilmbase): Update to 2.5.5. --- gnu/packages/graphics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4a301d387a..3c9cf18bbc 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus -;;; Copyright © 2016, 2018 Efraim Flashner +;;; Copyright © 2016, 2018, 2021 Efraim Flashner ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017, 2018 Ben Woodcroft @@ -753,7 +753,7 @@ many more.") (define-public ilmbase (package (name "ilmbase") - (version "2.5.2") + (version "2.5.5") (source (origin (method git-fetch) (uri (git-reference @@ -762,7 +762,7 @@ many more.") (file-name (git-file-name "ilmbase" version)) (sha256 (base32 - "1vf8bqld2bpcdi99jbr043y6vp01cp3fvbiasrn66xn91mf6imbn")) + "0mjzb3fd8b9pcqmrgy5cdsmvqd70hmlvjnfypi66v59h3fhrmgd8")) (patches (search-patches "ilmbase-fix-tests.patch")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 7e0e98aed6d9c9003d09ce156602a74b48b01d66 Mon Sep 17 00:00:00 2001 From: pricly_yellow Date: Tue, 30 Mar 2021 11:31:17 +0000 Subject: gnu: waybar: Update to 0.9.5. * gnu/packages/wm.scm (waybar): Update to 0.9.5. [inputs]: Replace fmt-6 with fmt, spdlog-1.7 with spdlog. * gnu/packages/logging.scm (spdlog-1.7): Remove variable. * gnu/packages/pretty-print.scm (fmt-6): Same. Signed-off-by: Efraim Flashner --- gnu/packages/logging.scm | 16 ---------------- gnu/packages/pretty-print.scm | 13 ------------- gnu/packages/wm.scm | 8 ++++---- 3 files changed, 4 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index b879fecebc..6a4975e435 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -214,19 +214,3 @@ library.") ;; spdlog is under Expat license, but the bundled fmt library in ;; "include/spdlog/fmt/bundled" is under BSD 2 clause license. (license (list license:expat license:bsd-2)))) - -(define-public spdlog-1.7 - (package - (inherit spdlog) - (name "spdlog") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gabime/spdlog") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j")))))) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index af02fd91a9..4662a1e717 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -189,19 +189,6 @@ to @code{IOStreams}.") ;; The library is bsd-2, but documentation and tests include other licenses. (license (list bsd-2 bsd-3 psfl)))) -(define-public fmt-6 - (package - (inherit fmt) - (name "fmt") - (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")))))) - (define-public source-highlight (package (name "source-highlight") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d3c76d7988..4df1af27cb 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1569,7 +1569,7 @@ modules for building a Wayland compositor.") (define-public waybar (package (name "waybar") - (version "0.9.4") + (version "0.9.5") (source (origin (method git-fetch) @@ -1578,10 +1578,10 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy")))) + (base32 "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q")))) (build-system meson-build-system) (inputs `(("date" ,date) - ("fmt" ,fmt-6) + ("fmt" ,fmt) ("gtk-layer-shell" ,gtk-layer-shell) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) @@ -1590,7 +1590,7 @@ modules for building a Wayland compositor.") ("libmpdclent" ,libmpdclient) ("libnl" ,libnl) ("pulseaudio" ,pulseaudio) - ("spdlog" ,spdlog-1.7) + ("spdlog" ,spdlog) ("wayland" ,wayland))) (native-inputs `(("gcc" ,gcc-8) ; for #include -- cgit v1.2.3 From 9ece9f162b793637ab89aadb14d39ce75179fc91 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Tue, 30 Mar 2021 18:14:46 +1100 Subject: gnu: taglib: Update to 1.12. * gnu/packages/mp3.scm (taglib): Update to 1.12. Signed-off-by: Efraim Flashner --- gnu/packages/mp3.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 675e18ed7e..dadaccdd88 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -208,7 +208,7 @@ a highly stable and efficient implementation.") (define-public taglib (package (name "taglib") - (version "1.12-beta-1") + (version "1.12") (source (origin (method git-fetch) (uri (git-reference @@ -217,7 +217,7 @@ a highly stable and efficient implementation.") (file-name (git-file-name name version)) (sha256 (base32 - "1mp6w2ikniw8w6d5wr0h20j0ijg8jw7s9dli5a8k9znpznvxpym4")))) + "0q7dkn5rh9v6b0scmcp2qmjv3iransafmpn6jvgid0yq75m2nqd2")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; Tests are not ran with BUILD_SHARED_LIBS on. -- cgit v1.2.3 From 190912cb8e4011c7a4ffe6c2baa69d7b39139580 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 30 Mar 2021 19:49:17 +0100 Subject: gnu: services: web: Cleanup whitespace. Replace tabs with spaces, and delete trailing whitespace. * gnu/services/web.scm: Cleanup whitespace. --- gnu/services/web.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index aa688a4328..1aad695c8b 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -840,8 +840,8 @@ of index files." (requirement '(networking)) (start #~(make-forkexec-constructor '(#$(file-append package "/sbin/fcgiwrap") - "-s" #$socket) - #:user #$user #:group #$group)) + "-s" #$socket) + #:user #$user #:group #$group)) (stop #~(make-kill-destructor))))))) (define fcgiwrap-activation @@ -863,7 +863,7 @@ of index files." (extensions (list (service-extension shepherd-root-service-type fcgiwrap-shepherd-service) - (service-extension account-service-type + (service-extension account-service-type fcgiwrap-accounts) (service-extension activation-service-type fcgiwrap-activation))) @@ -1946,24 +1946,24 @@ root=/srv/gemini (documentation "Run the agate Gemini server.") (start (let ((agate (file-append package "/bin/agate"))) #~(make-forkexec-constructor - (list #$agate - "--content" #$content - "--cert" #$cert - "--key" #$key - "--addr" #$@addr + (list #$agate + "--content" #$content + "--cert" #$cert + "--key" #$key + "--addr" #$@addr #$@(if lang (list "--lang" lang) '()) - #$@(if hostname - (list "--hostname" hostname) - '()) - #$@(if silent? '("--silent") '()) - #$@(if serve-secret? '("--serve-secret") '()) - #$@(if log-ip? '("--log-ip") '())) - #:user #$user #:group #$group - #:log-file #$log-file))) + #$@(if hostname + (list "--hostname" hostname) + '()) + #$@(if silent? '("--silent") '()) + #$@(if serve-secret? '("--serve-secret") '()) + #$@(if log-ip? '("--log-ip") '())) + #:user #$user #:group #$group + #:log-file #$log-file))) (stop #~(make-kill-destructor))))))) - + (define agate-accounts (match-lambda (($ _ _ _ _ _ -- cgit v1.2.3 From 264f7189e8fa20f4ab3da7f5e98fdd15d5eb4231 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 30 Mar 2021 19:57:38 +0100 Subject: gnu: services: web: Have fcgiwrap log to a file. This makes it easier to access the output. * gnu/services/web.scm (fcgiwrap-shepherd-service): Pass #:log-file to make-forkexec-constructor. --- gnu/services/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 1aad695c8b..bfcdfe7421 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -841,7 +841,8 @@ of index files." (start #~(make-forkexec-constructor '(#$(file-append package "/sbin/fcgiwrap") "-s" #$socket) - #:user #$user #:group #$group)) + #:user #$user #:group #$group + #:log-file "/var/log/fcgiwrap.log")) (stop #~(make-kill-destructor))))))) (define fcgiwrap-activation -- cgit v1.2.3 From 3db4a00d43fe64e02d9452ba203a3015790f5167 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 31 Mar 2021 22:36:39 +0100 Subject: gnu: sbcl-postmodern: Update to 1.32.9. * gnu/packages/lisp-xyz.scm (sbcl-postmodern): Update to 1.32.9. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1e6880f90f..6ea2f0966c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10021,7 +10021,7 @@ approach to templating.") (define-public sbcl-postmodern (package (name "sbcl-postmodern") - (version "1.32.8") + (version "1.32.9") (source (origin (method git-fetch) @@ -10030,7 +10030,7 @@ approach to templating.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0vr5inbr8dldf6dsl0qj3h2yrnnsayzfwxfzwkn1pk7xbns2l78q")))) + (base32 "137jci4hn4vlxf48y39k0di27kc89kvxy3brmn3vl9xq56sy6mhz")))) (build-system asdf-build-system/sbcl) (native-inputs `(("fiveam" ,sbcl-fiveam))) -- cgit v1.2.3 From a266c9fab88954b7c0fc0516e0a4c9834819dbc5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 31 Mar 2021 22:32:32 +0100 Subject: gnu: Add cl-conspack. * gnu/packages/lisp-xyz.scm: (sbcl-cl-conspack, cl-conspack, ecl-cl-conspack): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6ea2f0966c..658f0fbd2a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15516,3 +15516,51 @@ immediately loaded.") (define-public cl-bodge-math (sbcl-package->cl-source-package sbcl-bodge-math)) + +(define-public sbcl-cl-conspack + (let ((commit "fc8473bc6f929696b03b43820596b7c976c4678e") + (revision "1")) + (package + (name "sbcl-cl-conspack") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/conspack/cl-conspack") + (commit commit))) + (file-name (git-file-name "cl-conspack" version)) + (sha256 + (base32 "0b7qzvsrpvnw12hqhjmz0b02sigj0kdjy55j4k7xzmj8684cs8bx")))) + (build-system asdf-build-system/sbcl) + ;; FIXME: (Sharlatan-20210331T220652+0100): Test are disabled because of: + ;; + ;; Error while trying to load definition for system cl-conspack-test + ;; from pathname .../cl-conspack/cl-conspack-test.asd: + ;; Error opening .../checkl/formalize-tmpGHU3ALSV.fasl": Permission denied + ;; + ;; It looks like the issues is in CheckL itself as other packages keep + ;; failing test where it's in use. + (arguments + '(#:tests? #f + #:asd-files '("cl-conspack.asd"))) + (native-inputs + `(("checkl" ,sbcl-checkl))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("closer-mop" ,sbcl-closer-mop) + ("fast-io" ,sbcl-fast-io) + ("ieee-floats" ,sbcl-ieee-floats) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (home-page "https://github.com/conspack/cl-conspack") + (synopsis "CONSPACK implementation for Common Lisp") + (description + "This package provides a CONSPACK implementation for Common Lisp.") + (license license:bsd-3)))) + +(define-public ecl-cl-conspack + (sbcl-package->ecl-package sbcl-cl-conspack)) + +(define-public cl-conspack + (sbcl-package->cl-source-package sbcl-cl-conspack)) -- cgit v1.2.3 From bbd04a4cc832a6d40a128fe449efe88cf5fd7bc9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 1 Apr 2021 12:06:06 +0200 Subject: gnu: cuirass: Update home page. * gnu/packages/ci.scm (cuirass)[home-page]: Update it. --- gnu/packages/ci.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 15d1cb5317..cdfe725a65 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -175,5 +175,5 @@ (description "Cuirass is a continuous integration tool using GNU Guix. It is intended as a replacement for Hydra.") - (home-page "https://www.gnu.org/software/guix/") + (home-page "https://guix.gnu.org/cuirass/") (license l:gpl3+)))) -- cgit v1.2.3 From b82cc0b90e271ef1cd1bd91f3f1ae729918eccd0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Apr 2021 13:00:52 +0300 Subject: gnu: qemu-for-american-fuzzy-lop: Fix build. * gnu/packages/debug.scm (qemu-for-american-fuzzy-lop)[source]: Add patch. * gnu/packages/patches/qemu-glibc-2.30.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/debug.scm | 5 +-- gnu/packages/patches/qemu-glibc-2.30.patch | 57 ++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/qemu-glibc-2.30.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3eeae5e96a..b037b397c3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1610,6 +1610,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-CVE-2021-20203.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ + %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qpdfview-qt515-compat.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index b3a000e6e3..f67f32a7f8 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier -;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pkill -9 @@ -269,7 +269,8 @@ down the road.") (base32 "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")) (patches - (search-patches "qemu-glibc-2.27.patch")))) + (search-patches "qemu-glibc-2.27.patch" + "qemu-glibc-2.30.patch")))) (build-system gnu-build-system) (arguments `(;; Running tests in parallel can occasionally lead to failures, like: diff --git a/gnu/packages/patches/qemu-glibc-2.30.patch b/gnu/packages/patches/qemu-glibc-2.30.patch new file mode 100644 index 0000000000..1b74dee4ac --- /dev/null +++ b/gnu/packages/patches/qemu-glibc-2.30.patch @@ -0,0 +1,57 @@ +This patch was taken from NixOS +https://raw.githubusercontent.com/Mindavi/nixpkgs/1a737743a829746e48f4869ac517ff29c23c9d09/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff +It is based on an unmerged patch against american-fuzzy-lop and was +never merged upstream because the author was unable to sign Google's CLA. +Based on https://github.com/google/AFL/commit/6c917e3d63a2a0685d58c3518524f9615b001893.patch + +--- qemu-2.10.0-clean/linux-user/syscall.c 2020-03-12 18:47:47.898592169 +0100 ++++ qemu-2.10.0/linux-user/syscall.c 2020-03-13 09:13:42.461809699 +0100 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include // https://lkml.org/lkml/2019/6/3/988 + #include + #include + #ifdef __ia64__ +@@ -256,7 +257,9 @@ static type name (type1 arg1,type2 arg2, + #endif + + #ifdef __NR_gettid +-_syscall0(int, gettid) ++// taken from https://patchwork.kernel.org/patch/10862231/ ++#define __NR_sys_gettid __NR_gettid ++_syscall0(int, sys_gettid) + #else + /* This is a replacement for the host gettid() and must return a host + errno. */ +@@ -6219,7 +6222,7 @@ static void *clone_func(void *arg) + cpu = ENV_GET_CPU(env); + thread_cpu = cpu; + ts = (TaskState *)cpu->opaque; +- info->tid = gettid(); ++ info->tid = sys_gettid(); + task_settid(ts); + if (info->child_tidptr) + put_user_u32(info->tid, info->child_tidptr); +@@ -6363,9 +6366,9 @@ static int do_fork(CPUArchState *env, un + mapping. We can't repeat the spinlock hack used above because + the child process gets its own copy of the lock. */ + if (flags & CLONE_CHILD_SETTID) +- put_user_u32(gettid(), child_tidptr); ++ put_user_u32(sys_gettid(), child_tidptr); + if (flags & CLONE_PARENT_SETTID) +- put_user_u32(gettid(), parent_tidptr); ++ put_user_u32(sys_gettid(), parent_tidptr); + ts = (TaskState *)cpu->opaque; + if (flags & CLONE_SETTLS) + cpu_set_tls (env, newtls); +@@ -11402,7 +11405,7 @@ abi_long do_syscall(void *cpu_env, int n + break; + #endif + case TARGET_NR_gettid: +- ret = get_errno(gettid()); ++ ret = get_errno(sys_gettid()); + break; + #ifdef TARGET_NR_readahead + case TARGET_NR_readahead: -- cgit v1.2.3 From 4172b2eef592012baf64c91cc425e097bde10c7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Apr 2021 13:02:54 +0300 Subject: gnu: american-fuzzy-lop: Update to 2.57b. * gnu/packages/debug.scm (american-fuzzy-lop): Update to 2.57b. --- gnu/packages/debug.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index f67f32a7f8..4ead19c398 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -184,7 +184,7 @@ tools that process C/C++ code.") (_ "UNSUPPORTED")))) (package (name "american-fuzzy-lop") - (version "2.56b") ;It seems all releases have the 'b' suffix + (version "2.57b") ;It seems all releases have the 'b' suffix (source (origin (method git-fetch) @@ -192,7 +192,7 @@ tools that process C/C++ code.") (url "https://github.com/google/AFL") (commit (string-append "v" version)))) (sha256 - (base32 "1q1g59gkm48aa4cg9h70jx4i2gapmypgp5rzs156b2avd95vwkn1")) + (base32 "0ks0s8iizp7mpc9mlpv126rsny0dkljfsw68689g9jiisjz2z530")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From ae15c3fa7ee4e5f6f37ed6faa89df7f797c712e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 May 2020 22:16:44 +0300 Subject: gnu: american-fuzzy-lop: Add support for powerpc-linux. * gnu/packages/debug.scm (american-fuzzy-lop): Add case for powerpc-linux. (qemu-for-american-fuzzy-lop): Same. --- gnu/packages/debug.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 4ead19c398..3a29886b0e 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -179,6 +179,7 @@ tools that process C/C++ code.") ("aarch64-linux" "aarch64") ("armhf-linux" "arm") ("mips64el-linux" "mips64el") + ("powerpc-linux" "ppc") ;; Prevent errors when querying this package on unsupported ;; platforms, e.g. when running "guix package --search=" (_ "UNSUPPORTED")))) @@ -254,6 +255,7 @@ down the road.") ("aarch64-linux" "aarch64") ("armhf-linux" "arm") ("mips64el-linux" "mips64el") + ("powerpc-linux" "ppc") ;; Prevent errors when querying this package on unsupported ;; platforms, e.g. when running "guix package --search=" (_ "UNSUPPORTED")))) -- cgit v1.2.3 From aa03d32eb1d2c41ee6251b3df59eb5177bdf5d82 Mon Sep 17 00:00:00 2001 From: qblade Date: Sun, 28 Mar 2021 00:54:47 +0000 Subject: services: kmscon: Add font-engine and font-size fields. * gnu/services/base.scm (): Add font-engine and font-size fields. (kmscon-service-type): Honor them. * doc/guix.texi (Base Services): Document them. --- doc/guix.texi | 6 ++++++ gnu/services/base.scm | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index f08c529c63..115a7d9bd7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15190,6 +15190,12 @@ in automatically without prompting for their login name or password. @item @code{hardware-acceleration?} (default: #f) Whether to use hardware acceleration. +@item @code{font-engine} (default: @code{"pango"}) +Font engine used in Kmscon. + +@item @code{font-size} (default: @code{12}) +Font size used in Kmscon. + @item @code{kmscon} (default: @var{kmscon}) The Kmscon package to use. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index f50bcfdcb4..a8214ae96f 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2021 qblade ;;; ;;; This file is part of GNU Guix. ;;; @@ -2304,7 +2305,11 @@ This service is not part of @var{%base-services}." (auto-login kmscon-configuration-auto-login (default #f)) (hardware-acceleration? kmscon-configuration-hardware-acceleration? - (default #f))) ; #t causes failure + (default #f)) ; #t causes failure + (font-engine kmscon-configuration-font-engine + (default "pango")) + (font-size kmscon-configuration-font-size + (default 12))) (define kmscon-service-type (shepherd-service-type @@ -2315,13 +2320,17 @@ This service is not part of @var{%base-services}." (login-program (kmscon-configuration-login-program config)) (login-arguments (kmscon-configuration-login-arguments config)) (auto-login (kmscon-configuration-auto-login config)) - (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config))) + (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config)) + (font-engine (kmscon-configuration-font-engine config)) + (font-size (kmscon-configuration-font-size config))) (define kmscon-command #~(list #$(file-append kmscon "/bin/kmscon") "--login" "--vt" #$virtual-terminal "--no-switchvt" ;Prevent a switch to the virtual terminal. + "--font-engine" #$font-engine + "--font-size" #$(number->string font-size) #$@(if hardware-acceleration? '("--hwaccel") '()) "--login" "--" #$login-program #$@login-arguments -- cgit v1.2.3 From 95ef58f03e7fc9edbe5758a85ac7b3f983c0c5ae Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 1 Apr 2021 13:00:55 +0100 Subject: gnu: Add texlive-utopia. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 66844ed321..d45fe3045b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7884,3 +7884,25 @@ symbols. The system is absolutely stand-alone; apart from Utopia and Fourier no other typefaces are required. Utopia is a registered trademark of Adobe Systems Incorporated.") (license license:lppl))) + +(define-public texlive-utopia + (package + (inherit (simple-texlive-package + "texlive-utopia" + (list "/doc/fonts/utopia/" + "/fonts/afm/adobe/utopia/" + "/fonts/tfm/adobe/utopia/" + "/fonts/type1/adobe/utopia/" + "/fonts/vf/adobe/utopia/") + (base32 + "113wgkfz4z0ls2grxxfj17l42a1yv9r5ipcd0156xnfsrqvqzxfc") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/utopia") + (synopsis "Adobe Utopia fonts") + (description "The Adobe Standard Encoding set of the Utopia font +family, as contributed to the X Consortium. The set comprises upright +and italic shapes in medium and bold weights. Macro support and +matching maths fonts are provided by the @code{fourier} and +@code{mathdesign} font packages.") + (license (license:fsf-free + "http://mirrors.ctan.org/fonts/utopia/README")))) -- cgit v1.2.3 From 6def029ab90b7e31d2ab02a97a15c3ca51b11be3 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:38 +0100 Subject: gnu: python-urwid: Update to 2.1.2. * gnu/packages/python-xyz.scm (python-urwid): Update to 2.1.2. [properties]: New field. (python2-urwid): Stay at 2.1.0. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 74aee4a3c2..38b35ee9bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7631,24 +7631,35 @@ computing.") (define-public python-urwid (package (name "python-urwid") - (version "2.1.0") + (version "2.1.2") (source (origin (method url-fetch) (uri (pypi-uri "urwid" version)) (sha256 (base32 - "11ndnhxd41m13darf5s0c6bafdpkzq1l6mfb04wbzdmyc1hg75h8")))) + "1bky2bra6673xx8jy0826znw6cmxs89wcwwzda8d025j3jffx2sq")))) (build-system python-build-system) (home-page "http://urwid.org") (synopsis "Console user interface library for Python") (description "Urwid is a curses-based UI/widget library for Python. It includes many features useful for text console applications.") + (properties `((python2-variant . ,(delay python2-urwid)))) (license license:lgpl2.1+))) (define-public python2-urwid - (package-with-python2 python-urwid)) + (let ((base (package-with-python2 + (strip-python2-variant python-urwid)))) + (package/inherit base + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urwid" version)) + (sha256 + (base32 + "11ndnhxd41m13darf5s0c6bafdpkzq1l6mfb04wbzdmyc1hg75h8"))))))) (define-public python-urwidtrees (package -- cgit v1.2.3 From a45c110c9d77fe7969b992c3090f8b09aa461205 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:39 +0100 Subject: gnu: Add python-urwid-readline. * gnu/packages/python-xyz.scm (python-urwid-readline): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 38b35ee9bf..bcf5d05b20 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7661,6 +7661,40 @@ features useful for text console applications.") (base32 "11ndnhxd41m13darf5s0c6bafdpkzq1l6mfb04wbzdmyc1hg75h8"))))))) +(define-public python-urwid-readline + (package + (name "python-urwid-readline") + (version "0.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rr-/urwid_readline") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sq5qgxj7gcfww3ww7idr87isnmp0hi36n241b3q395x1zafdv22")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest")) + #t))))) + (propagated-inputs + `(("python-urwid" ,python-urwid))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/rr-/urwid_readline") + (synopsis "Text input widget for urwid that supports readline shortcuts") + (description + "This package provides a textbox edit widget for @code{python-urwid} that +supports @code{readline} shortcuts.") + (license license:expat))) + (define-public python-urwidtrees (package (name "python-urwidtrees") -- cgit v1.2.3 From 536fa1bd236f958fdbdb518cd406d28493755538 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:40 +0100 Subject: gnu: Add python-matrix-client. * gnu/packages/matrix.scm (python-matrix-client): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/matrix.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index a8d9d66ee7..5c2b194d07 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Michael Rohleder +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,30 @@ #:use-module (guix download) #:use-module (guix packages)) +(define-public python-matrix-client + (package + (name "python-matrix-client") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "matrix-client" version)) + (sha256 + (base32 + "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw")))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-responses" ,python-responses))) + (home-page + "https://github.com/matrix-org/matrix-python-sdk") + (synopsis "Client-Server SDK for Matrix") + (description "This package provides client-server SDK for Matrix.") + (license license:asl2.0))) + (define-public python-matrix-synapse-ldap3 (package (name "python-matrix-synapse-ldap3") -- cgit v1.2.3 From b8ebe6dee815ad5611707c29d9ffed50595fdb55 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:41 +0100 Subject: gnu: Add python-flake8-continuation. * gnu/packages/python-xyz.scm (python-flake8-continuation): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bcf5d05b20..e24a9410f0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8735,6 +8735,34 @@ design problems in your program. It contains warnings that don't belong in pyflakes and pycodestyle.") (license license:expat))) +(define-public python-flake8-continuation + (package + (name "python-flake8-continuation") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8-continuation" version)) + (sha256 + (base32 + "0dzaw8jr7yhlabxhrblnrizxx17xa9ngjnbr1kidg5lapq6b9q1y")))) + (build-system python-build-system) + (propagated-inputs + `(("python-flake8" ,python-flake8) + ("python-pycodestyle" ,python-pycodestyle) + ("python-six" ,python-six))) + (home-page "https://github.com/planetlabs/flake8-continuation") + (synopsis "Flake8 Line Continuation Plugin") + (description "A Flake8 plugin that checks for the line continuation +style to be in the preferred method according to PEP-8, specifically: +@quotation +The preferred way of wrapping long lines is by using Python's implied +line continuation inside parentheses, brackets and braces. Long lines +can be broken over multiple lines by wrapping expressions in parentheses. +These should be used in preference to using a backslash for line continuation. +@end quotation") + (license license:asl2.0))) + (define-public python-flake8-implicit-str-concat (package (name "python-flake8-implicit-str-concat") -- cgit v1.2.3 From f7c7ccde2912ce7825e3ca5ef38dd2fe9644f441 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:42 +0100 Subject: gnu: Add python-flake8-quotes. * gnu/packages/python-xyz.scm (python-flake8-quotes): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e24a9410f0..dac857a83d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8901,6 +8901,25 @@ first-class forward references that stub files use.") lints.") (license license:bsd-2))) +(define-public python-flake8-quotes + (package + (name "python-flake8-quotes") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8-quotes" version)) + (sha256 + (base32 + "0ph5s6lxgpzz4an0ax6s5xjqypqmngwr5b1i0h9pqhzghplic49z")))) + (build-system python-build-system) + (propagated-inputs + `(("python-flake8" ,python-flake8))) + (home-page "https://github.com/zheller/flake8-quotes/") + (synopsis "Flake8 lint for quotes") + (description "This package provides a Flake8 lint for quotes.") + (license license:expat))) + (define-public python-autoflake (package (name "python-autoflake") -- cgit v1.2.3 From 685fa3f55f242d7884a3b6fac3fe4bbf9409064c Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:44 +0100 Subject: gnu: Add python-zulip. * gnu/packages/python-xyz.scm (python-zulip): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 5c55e08fb2..329b5f3322 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020, 2021 Robert Karszniewicz +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +90,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages matrix) #:use-module (gnu packages mono) #:use-module (gnu packages mpd) #:use-module (gnu packages ncurses) @@ -2859,4 +2861,51 @@ social and chat platform.") designed for experienced users.") (license license:gpl2+))) +(define-public python-zulip + (package + (name "python-zulip") + (version "0.7.1") + (source + (origin + ;; There is no source on Pypi. + (method git-fetch) + (uri (git-reference + (url "https://github.com/zulip/python-zulip-api") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0da1ki1v252avy27j6d7snnc0gyq0xa9fypm3qdmxhw2w79d6q36")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'cd-to-zulip-dir + (lambda _ + (chdir "zulip") + #t)) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (let ((test-zulip "../tools/test-zulip")) + (when tests? + (add-installed-pythonpath inputs outputs) + (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) + (patch-shebang test-zulip) + (invoke test-zulip)) + #t)))))) + (propagated-inputs + `(("python-matrix-client" ,python-matrix-client) + ("python-pyopenssl" ,python-pyopenssl) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-distro" ,python-distro) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/zulip/python-zulip-api") + (synopsis "Zulip's API Python bindings") + (description + "This package provides Python bindings to Zulip's API.") + (license license:asl2.0))) + ;;; messaging.scm ends here -- cgit v1.2.3 From 673031c7628ed7ad9accfb98aa45f3da7cbc75ce Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:45 +0100 Subject: gnu: Add zulip-term. * gnu/packages/messaging.scm (zulip-term): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 329b5f3322..388e7f2ead 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -103,6 +103,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -2908,4 +2909,55 @@ designed for experienced users.") "This package provides Python bindings to Zulip's API.") (license license:asl2.0))) +(define-public zulip-term + (package + (name "zulip-term") + (version "0.5.2") + (source + (origin + ;; Pypi package doesn't ship tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/zulip/zulip-terminal") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "setup.py" + (("\\=\\=1\\.7") ">=1.7") ; pytest-mock + (("\\=\\=2\\.5") ">=2.5") ; pytest-cov + (("4\\.5\\.2") "4.4.2")) ; lxml + #t)))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Delete failing tests. + (delete-file "tests/cli/test_run.py") + (invoke "pytest")) + #t))))) + (inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-lxml" ,python-lxml) + ("python-mypy-extensions" ,python-mypy-extensions) + ("python-urwid" ,python-urwid) + ("python-urwid-readline" ,python-urwid-readline) + ("python-zulip" ,python-zulip))) + (native-inputs + `(("python-distro" ,python-distro) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-mock" ,python-pytest-mock))) + (home-page "https://github.com/zulip/zulip-terminal") + (synopsis "Zulip's official terminal client") + (description "This package contains Zulip's official terminal client.") + (license license:asl2.0))) + ;;; messaging.scm ends here -- cgit v1.2.3 From f1442560906de4863c89a6f8c1c08169ee0738cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 13:29:52 +0200 Subject: gnu: foo2zjs: Update to 20200610.1. No functional changes. * gnu/packages/cups.scm (foo2zjs): Update to 20200610.1. [source]: Use a Web-archived tarball. --- gnu/packages/cups.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b18273109e..5213563a6a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -749,14 +749,15 @@ printer/driver specific, but spooler-independent PPD file.") (define-public foo2zjs (package (name "foo2zjs") - (version "20200610") - (source (origin - (method url-fetch) - ;; XXX: This is an unversioned URL! - (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") - (sha256 - (base32 - "11ddx6wf8b5ksl4fqw6fnyz9m3y470lryyrskkya2bsch2bvj9lg")))) + (version "20200610.1") + (source + (origin + (method url-fetch) + ;; The upstream tarball is unversioned: use a stable snapshot. + (uri (string-append "https://web.archive.org/web/20210224094943if_/" + "http://foo2zjs.rkkda.com/foo2zjs.tar.gz")) + (sha256 + (base32 "03ncif50n7ck7drggqxbc7w0kgzdb90ha0dbvqk98ky8lw3k76xd")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 3a638b105941525b428cf83e454e387a025d132a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 14:03:47 +0200 Subject: gnu: mame: Update to 0.230. * gnu/packages/emulators.scm (mame): Update to 0.230. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 1cd23c3e6c..c4611bf34f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1589,7 +1589,7 @@ This is a part of the TiLP project.") (define-public mame (package (name "mame") - (version "0.229") + (version "0.230") (source (origin (method git-fetch) @@ -1598,7 +1598,7 @@ This is a part of the TiLP project.") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "0s5q6fjk739p1bfh72fmh35xi13fwbrgjqrn45i5xzx3v3gadmbg")) + (base32 "0dk8q2691pycv9mq77h6sdfwjnwdrfwrblf8nwyykrmdawzi56ks")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From 36934d5060ff7d9c126ea9f13db9306c93c8585a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 14:17:58 +0200 Subject: gnu: youtube-dl: Update to 2021.04.01. * gnu/packages/video.scm (youtube-dl): Update to 2021.04.01. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a22b73b24f..4cd36cbd7f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.03.31") + (version "2021.04.01") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "1svcgrhq1yxpcd6k3piqs5paalrcsq9bm79h5ras1g7yjzid05gj")) + "1vw9l32bv115129v1lfar626y3vivvxkp36bc1phjcrsjfayz67h")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit v1.2.3 From 9be20668ebed006d156882e4d604a9e19bf45b59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 14:28:57 +0200 Subject: gnu: librsvg@2.50: Update to 2.50.3. * gnu/packages/crates-io.scm (rust-lopdf-0.25): Rename to... (rust-lopdf-0.26): ...to this, updated to 0.26.0. [arguments]: Update #:cargo-inputs' rust-time-0.1 to rust-time-0.2. * gnu/packages/gnome.scm (librsvg): Update to 2.50.3. [arguments]: Update #:cargo-development-inputs's rust-lopdf-0.25 to rust-lopdf-0.26. --- gnu/packages/crates-io.scm | 9 ++++----- gnu/packages/gnome.scm | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f3d6c92e11..ae4e91f764 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22307,10 +22307,10 @@ explosion.") image together with its neighboring pixels.") (license license:expat))) -(define-public rust-lopdf-0.25 +(define-public rust-lopdf-0.26 (package (name "rust-lopdf") - (version "0.25.0") + (version "0.26.0") (source (origin (method url-fetch) @@ -22318,8 +22318,7 @@ image together with its neighboring pixels.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1yb4yj1a8a88w78hz9msg65xbkyx5n4d9gm1xb2c67zaj1xvyw1i")))) + (base32 "1wqnmibs8qzi6pr3ig4h3sg6bfkkgyv4ngdng81x069725r056ml")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -22335,7 +22334,7 @@ image together with its neighboring pixels.") ("rust-nom" ,rust-nom-5) ("rust-pom" ,rust-pom-3) ("rust-rayon" ,rust-rayon-1) - ("rust-time" ,rust-time-0.1)))) + ("rust-time" ,rust-time-0.2)))) (home-page "https://github.com/J-F-Liu/lopdf") (synopsis "Rust library for PDF document manipulation") (description diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e2ee4a46e..ed6d433cf9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3367,7 +3367,7 @@ library.") (define-public librsvg-next (package (name "librsvg") - (version "2.50.2") + (version "2.50.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -3375,7 +3375,7 @@ library.") "librsvg-" version ".tar.xz")) (sha256 (base32 - "1lsnl08b5pjf01q3agixjd53islw5rqkc38r31rlmm2crrqz44b2")) + "0n79i4wj9hm0d3bbn4xvknq5ylhqs16pvhaqr1rxspx9wfc8lad4")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "vendor") @@ -3431,7 +3431,7 @@ library.") ("rust-chrono" ,rust-chrono-0.4) ("rust-criterion" ,rust-criterion-0.3) ("rust-float-cmp" ,rust-float-cmp-0.8) - ("rust-lopdf" ,rust-lopdf-0.25) + ("rust-lopdf" ,rust-lopdf-0.26) ("rust-png" ,rust-png-0.16) ("rust-predicates" ,rust-predicates-1) ("rust-tempfile" ,rust-tempfile-3)) -- cgit v1.2.3 From 5e4ddfb5374fc6b0aad6aa19b2c7a09b012c68e6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 1 Apr 2021 14:15:14 +0200 Subject: gnu: psm2: Update to 11.2.185. Fixes a bug introduced with the Open MPI 4.1.0 update in commit ee21803288cb2fd4dcfa9091d4fe4080a795a1ab, whereby the new version of Open MPI would not compile PSM2 support because our version of PSM2 was too old. Consequently, Open MPI would fall back to UCX and users would get poor performance on Omni-Path networks. * gnu/packages/linux.scm (psm2): Update to 11.2.185. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8a6ae502dc..5e08331652 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7126,7 +7126,7 @@ privileges.") (define-public psm2 (package (name "psm2") - (version "11.2.86") + (version "11.2.185") (source (origin (method git-fetch) (uri (git-reference @@ -7135,7 +7135,7 @@ privileges.") (file-name (git-file-name name version)) (sha256 (base32 - "1hiqzcmc97lzhaqjva82vf8irgg038cciypsv2brw90ak09n6vwf")))) + "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3 From 8ec03ed5475ca7919a7d11541ff8cbf33a9ffe67 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 1 Apr 2021 15:34:38 +0200 Subject: gnu: perl-data-validate-ip: Update to 0.30 [fixes CVE-2021-29662]. * gnu/packages/networking.scm (perl-data-validate-ip): Update to 0.30. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7dd484fa94..75f0fa5d95 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1895,7 +1895,7 @@ loop.") (define-public perl-data-validate-ip (package (name "perl-data-validate-ip") - (version "0.27") + (version "0.30") (source (origin (method url-fetch) @@ -1903,7 +1903,7 @@ loop.") "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-" version ".tar.gz")) (sha256 - (base32 "1mmppyzsh1w2z2h86kvzqxy56wxgs62a3kf8nvcnz76bblir5ap1")))) + (base32 "074adrlvkiahj1fdc9nvb95dpfyjzm2jzhi90m8xaw4bw5ipcbzy")))) (build-system perl-build-system) (native-inputs `(("perl-test-requires" ,perl-test-requires))) -- cgit v1.2.3 From 24652f9cdc66ae13b6b2159a2bddd4375ec4d3fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 1 Apr 2021 15:48:13 +0200 Subject: gnu: fe: Fix hash. * gnu/packages/text-editors.scm (fe): Update hash. Development version (2.0) has been rebased on top of latest stable release (1.9). --- gnu/packages/text-editors.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index c671095793..3af1aec94b 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -965,7 +965,7 @@ The basic features of Geany are: (define-public fe (package (name "fe") - ;; Stable release is 1.8. However, this development version + ;; Stable release is 1.9. However, this development version ;; introduces support for UTF-8. (version "2.0") (source (origin @@ -974,7 +974,7 @@ The basic features of Geany are: "fe-" version ".tar.gz")) (sha256 (base32 - "1hwws7si1752z6hp61zxznvgsb6846lp8zl1hn5ddhsbafwalwb9")))) + "10mk5wc3dsdp46b3hkjyd740gcdv6m1gvlr3p8xjxf55b3vfs0la")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no test -- cgit v1.2.3 From ae40c478b53e91679b5ed87bd6840ef79c31b377 Mon Sep 17 00:00:00 2001 From: qblade Date: Thu, 1 Apr 2021 15:59:53 +0200 Subject: gnu: Add emacs-showtip. * gnu/packages/emacs-xyz.scm (emacs-showtip): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f2f94c497f..1147ad5f00 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25598,6 +25598,28 @@ can specify how popup-displaying functions occupy the screen.") (home-page "https://github.com/wasamasa/shackle") (license license:gpl3+)))) +(define-public emacs-showtip + (let ((commit "930da302809a4257e8d69425455b29e1cc91949b") + (revision "0")) + (package + (name "emacs-showtip") + (version (git-version "0.01" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsorphanage/showtip") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7")))) + (build-system emacs-build-system) + (home-page "https://github.com/emacsorphanage/showtip") + (synopsis "Show tip at cursor") + (description + "This library provide one function to show tooltip near the cursor.") + (license license:gpl2+)))) + (define-public emacs-helm-lacarte (let ((commit "40a6c449720be521435b6b1da7911af3a0b9dca0") (revision "1")) -- cgit v1.2.3 From f3044da6fcaa3ff847eabc43dba817905ca79890 Mon Sep 17 00:00:00 2001 From: qblade Date: Thu, 1 Apr 2021 16:06:24 +0200 Subject: gnu: Add emacs-sdcv. * gnu/packages/emacs-xyz.scm (emacs-sdcv): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1147ad5f00..d6ca0c6d52 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25620,6 +25620,34 @@ can specify how popup-displaying functions occupy the screen.") "This library provide one function to show tooltip near the cursor.") (license license:gpl2+)))) +(define-public emacs-sdcv + ;; No tagged version upstream. + (let ((commit "943ae3e90cc9a0a88a37cc710acd7424fd4defc4" ) + (revision "0")) + (package + (name "emacs-sdcv") + (version (git-version "1.5.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stardiviner/sdcv.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i1ylvw7p46pkf3yyyzcdmdhsspzymnnnvx8s0i7vynngr5x0vzh")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-popup" ,emacs-popup) + ("emacs-pos-tip" ,emacs-pos-tip) + ("emacs-showtip" ,emacs-showtip))) + (home-page "https://www.emacswiki.org/emacs/download/sdcv.el") + (synopsis "Emacs interface for @code{sdcv}") + (description + "This plugin translates words with @code{sdcv}, and displays +translation using a tooltip or in a dedicated buffer.") + (license license:gpl3+)))) + (define-public emacs-helm-lacarte (let ((commit "40a6c449720be521435b6b1da7911af3a0b9dca0") (revision "1")) -- cgit v1.2.3 From 0a822a74abd81118653f482b1f8a1c0078e6eb18 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 1 Apr 2021 16:34:14 +0200 Subject: gnu: rust-rocket-0.4: Update to 0.4.7 [fixes CVE-2021-29935]. * gnu/packages/crates-io.scm (rust-rocket-0.4): Update to 0.4.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ae4e91f764..c47a848b68 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33078,14 +33078,14 @@ MessagePack format.") (define-public rust-rocket-0.4 (package (name "rust-rocket") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (crate-uri "rocket" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1sb6i0y65hq4wy4awa14diyv19wcd1sii2mfjdlcwam3mbbfbisg")))) + (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From f811f13660d2bbb04ddc259998565f5b91981e3c Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 1 Apr 2021 16:34:22 +0200 Subject: gnu: rust-rocket-codegen-0.4: Update to 0.4.7 [fixes CVE-2021-29935]. * gnu/packages/crates-io.scm (rust-rocket-codegen-0.4): Update to 0.4.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c47a848b68..3622d56285 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33115,14 +33115,14 @@ and speed.") (define-public rust-rocket-codegen-0.4 (package (name "rust-rocket-codegen") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (crate-uri "rocket_codegen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0n4k00fwwabvkjvnl62gwdc5v7rsg6bnmmwwiwm5bzpmdnqm94ai")))) + (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 9c9a36de732ea8485e47e84b888e121233f68452 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 1 Apr 2021 16:34:25 +0200 Subject: gnu: rust-rocket-http-0.4: Update to 0.4.7 [fixes CVE-2021-29935]. * gnu/packages/crates-io.scm (rust-rocket-http-0.4): Update to 0.4.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3622d56285..09ae151ea1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33143,14 +33143,14 @@ and speed.") (define-public rust-rocket-http-0.4 (package (name "rust-rocket-http") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (crate-uri "rocket_http" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0msjjclqcgh8kpa54b4kv6zbybambc9kmkfm1q5adiq3fbg8gl59")))) + (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 77eaf5fcd1e9d64c52f6d42d44a5d1ea72344d4e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 1 Apr 2021 22:17:02 +0200 Subject: gnu: Fix packages that were importing Guile modules from the host. Those packages were importing (ice-9 match) & co. from the host Guile, which could potentially lead to different derivations depending on the Guile in use. Uncovered by the warning emitted by 'gexp-modules'. * gnu/packages/admin.scm (inxi-minimal)[arguments]: Remove Guile modules from #:modules. * gnu/packages/dns.scm (ddclient)[arguments]: Likewise. * gnu/packages/tex.scm (texlive-latex-koma-script)[arguments]: Likewise. * gnu/packages/java.scm (openjdk11)[arguments]: Likewise for #:imported-modules. --- gnu/packages/admin.scm | 5 +---- gnu/packages/dns.scm | 4 +--- gnu/packages/java.scm | 7 ++----- gnu/packages/tex.scm | 3 +-- 4 files changed, 5 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 292a4bc2a2..d5b4d34323 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3761,10 +3761,7 @@ Python loading in HPC environments.") (native-inputs `(("gzip" ,gzip))) (arguments - `(#:modules - ((guix build utils) - (ice-9 match) - (srfi srfi-26)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 37f8c3a6be..6d146e6264 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -1050,9 +1050,7 @@ LuaJIT, both a resolver library and a daemon.") ("perl-digest-sha1" ,perl-digest-sha1) ("perl-io-socket-ssl" ,perl-io-socket-ssl))) (arguments - `(#:modules ((guix build utils) - (ice-9 match) - (srfi srfi-26)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 37716e01d5..207f136513 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2107,11 +2107,8 @@ new Date();")) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) (arguments - `(#:imported-modules - ((guix build syscalls) - (ice-9 binary-ports) - (rnrs bytevectors) - ,@%gnu-build-system-modules) + `(#:imported-modules ((guix build syscalls) + ,@%gnu-build-system-modules) #:tests? #f; requires jtreg ;; TODO package jtreg #:configure-flags diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d45fe3045b..ec21221ea1 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6752,8 +6752,7 @@ produce either PostScript or PDF output.") "1vz9zg7s5w52xr323zgglzprfrvba2zvyzf6b8vrdf4wdghlpv4z")))) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils) - (ice-9 match)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils) -- cgit v1.2.3 From 5a63a471a7ae78240db772750a3db2d250712f71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 22:36:04 +0200 Subject: gnu: python-ipaddress: Update to 1.0.23. * gnu/packages/python-xyz.scm (python-ipaddress): Update to 1.0.23. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dac857a83d..973e3349c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9776,13 +9776,13 @@ implementations of ASN.1-based codecs and protocols.") (define-public python-ipaddress (package (name "python-ipaddress") - (version "1.0.22") + (version "1.0.23") (source (origin (method url-fetch) (uri (pypi-uri "ipaddress" version)) (sha256 (base32 - "0b570bm6xqpjwqis15pvdy6lyvvzfndjvkynilcddjj5x98wfimi")))) + "1qp743h30s04m3cg3yk3fycad930jv17q7dsslj4mfw0jlvf1y5p")))) (build-system python-build-system) (home-page "https://github.com/phihag/ipaddress") (synopsis "IP address manipulation library") -- cgit v1.2.3 From 8667a2a58d482883192d53eb25a9070208675e45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 22:36:13 +0200 Subject: gnu: python-tabulate: Update to 0.8.9. * gnu/packages/python-xyz.scm (python-tabulate): Update to 0.8.9. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 973e3349c4..cd75634d99 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13361,13 +13361,13 @@ It uses LR parsing and does extensive error checking.") (define-public python-tabulate (package (name "python-tabulate") - (version "0.8.7") + (version "0.8.9") (source (origin (method url-fetch) (uri (pypi-uri "tabulate" version)) (sha256 (base32 - "01shi7bmj09f0bcm5s0c9skys063lzp76p0n4a2xmg041ni269yv")))) + "19qkdz8xwk5jxa5xn53mnk76qnh4ysm81vzj664jw1b0azr167gb")))) (build-system python-build-system) (arguments ;; FIXME: The pypi release tarball is missing a 'test/common.py' -- cgit v1.2.3 From 079a7f2c65c51da7b53b0e5ef44c516dc8eaab6e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 22:36:22 +0200 Subject: gnu: python-pyserial: Update to 3.5. * gnu/packages/python-xyz.scm (python-pyserial): Update to 3.5. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd75634d99..55bd9360f2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14321,14 +14321,14 @@ relays publish about themselves.") (define-public python-pyserial (package (name "python-pyserial") - (version "3.4") + (version "3.5") (source (origin (method url-fetch) (uri (pypi-uri "pyserial" version)) (sha256 (base32 - "09y68bczw324a4jb9a1cfwrbjhq179vnfkkkrybbksp0vqgl0bbf")))) + "1nyd4m4mnrz8scbfqn4zpq8gnbl4x42w5zz62vcgpzqd2waf0xrw")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: 3/49 tests are failing. -- cgit v1.2.3 From b1ed32dae06fdc0bc50fc69cc7c9e836ecc6a4e3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 2 Apr 2021 10:08:45 +0200 Subject: gnu: sbcl-cl-webkit: Update to 20210401. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20210401. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 658f0fbd2a..e1a5a9a7a6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3417,10 +3417,10 @@ is a library for creating graphical user interfaces.") (sbcl-package->ecl-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "0bc05cc73257670ab241853b9cc9ccb68940fe44")) + (let ((commit "6e8315613d496089ba858c13afabb2c0f6d28740")) (package (name "sbcl-cl-webkit") - (version (git-version "2.4" "10" commit)) + (version (git-version "2.4" "11" commit)) (source (origin (method git-fetch) @@ -3430,7 +3430,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "1kg6illspvb5647pm0x819ag2n7njnqvrm18jzgd28vk6nlkrcmq")))) + "121jk3irxaz8jnmhjnpdypb9shwd844rf4b3x94y1ig4dxw7gx6h")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit v1.2.3 From d01837ca0d1f2805a119571dfab436726157eeac Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 1 Apr 2021 22:50:43 +0100 Subject: Revert "gnu: virt-manager: Update to 3.2.0." This reverts commit 5eb05ede0bf0cfe3080a24eea783f0fbc2ed4015. --- gnu/packages/virtualization.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index ab7d8deec6..8fcdb660ce 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1230,7 +1230,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "3.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -1238,10 +1238,11 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb")))) + "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command + #:test-target "test_ui" #:tests? #f ; TODO The tests currently fail ; RuntimeError: Loop condition wasn't ; met @@ -1259,6 +1260,12 @@ virtualization library.") (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) + (add-after 'unpack 'fix-qemu-img-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "virtconv/formats.py" + (("/usr(/bin/qemu-img)" _ suffix) + (string-append (assoc-ref inputs "qemu") suffix))) + #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. @@ -1289,12 +1296,11 @@ virtualization library.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") - (setenv "XDG_CACHE_HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be enabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "pytest" "--uitests")) + (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) @@ -1324,9 +1330,7 @@ virtualization library.") ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool) - ("rst2man" ,python-docutils) ;; The following are required for running the tests - ;; ("python-pytest" ,python-pytest) ;; ("python-dogtail" ,python-dogtail) ;; ("xvfb" ,xorg-server-for-tests) ;; ("dbus" ,dbus) -- cgit v1.2.3 From 614e95619b26b48b2973bf9eb63b6184d446983c Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 1 Apr 2021 22:50:49 +0100 Subject: Revert "gnu: libvirt-glib: Update to 4.0.0." This reverts commit 7573ab22d7400a16d81228c6500331a293887cae. --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8fcdb660ce..e1b780bbe1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1149,15 +1149,15 @@ to integrate other virtualization mechanisms if needed.") (define-public libvirt-glib (package (name "libvirt-glib") - (version "4.0.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (string-append "ftp://libvirt.org/libvirt/glib/" - "libvirt-glib-" version ".tar.xz")) + "libvirt-glib-" version ".tar.gz")) (sha256 (base32 - "1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4")))) - (build-system meson-build-system) + "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz")))) + (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From d42f6b091660d1717064b2d75fe0c29a0c24f96a Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 1 Apr 2021 22:50:53 +0100 Subject: Revert "gnu: python-libvirt: Update to 7.1.0." This reverts commit 52ed12afcb4618f0a9801b10799d8bbdffe87878. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e1b780bbe1..7a34f8db1f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1191,14 +1191,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "7.1.0") + (version "5.8.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "0dq0qn0xx5hflaq5apj5pm79ba0wcl3w0j9klx8bg73z80gd7bzs")))) + (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From bd9e14085668217b5657e57ca5b13a4a55360d9c Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 1 Apr 2021 22:50:56 +0100 Subject: Revert "gnu: libvirt: Update to 7.1.0." The update causes virsh to fail . This reverts commit 383b02a370252c08eb1d43ac94d659c1d3993a35. --- gnu/local.mk | 2 +- .../patches/libvirt-create-machine-cgroup.patch | 48 +++++++++++++ .../patches/libvirt-do-not-create-var-dirs.patch | 30 --------- gnu/packages/virtualization.scm | 78 +++++++++++++--------- 4 files changed, 94 insertions(+), 64 deletions(-) create mode 100644 gnu/packages/patches/libvirt-create-machine-cgroup.patch delete mode 100644 gnu/packages/patches/libvirt-do-not-create-var-dirs.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b037b397c3..f2d595f2cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1263,7 +1263,7 @@ dist_patch_DATA = \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ - %D%/packages/patches/libvirt-do-not-create-var-dirs.patch \ + %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/patches/libvirt-create-machine-cgroup.patch b/gnu/packages/patches/libvirt-create-machine-cgroup.patch new file mode 100644 index 0000000000..585ac237e1 --- /dev/null +++ b/gnu/packages/patches/libvirt-create-machine-cgroup.patch @@ -0,0 +1,48 @@ +From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= + +Date: Fri, 1 Nov 2019 17:29:00 +0100 +Subject: [PATCH] vircgroup: Ensure /machine group is associated with its + parent. + +Call first virCgroupNew on the parent group virCgroupNewPartition if +it is available on before the creation of the child group. This +ensures that the creation of a first level group on the unified +architecture, as the check at virCgroupV2ParseControllersFile as the +parent file is there. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1760233 +--- + src/util/vircgroup.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c +index b46f20abfd..33c61f2d45 100644 +--- a/src/util/vircgroup.c ++++ b/src/util/vircgroup.c +@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path, + if (virCgroupSetPartitionSuffix(path, &newPath) < 0) + goto cleanup; + +- if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) +- goto cleanup; +- + if (STRNEQ(newPath, "/")) { + char *tmp; + parentPath = g_strdup(newPath); +@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path, + + if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) + goto cleanup; ++ } + ++ if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) ++ goto cleanup; ++ ++ if (parent) { + if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) + goto cleanup; + } +-- +2.23.0 + diff --git a/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch deleted file mode 100644 index 6b89d49fd4..0000000000 --- a/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch +++ /dev/null @@ -1,30 +0,0 @@ -We define localstatedir as /var, and so we shouldn't be installing empty -directories there. - -diff --git a/src/meson.build b/src/meson.build -index f13b85b74e..58040f2c5d 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -893,22 +893,6 @@ if conf.has('WITH_DTRACE_PROBES') - ) - endif - -- --# Install empty directories -- --virt_install_dirs += [ -- localstatedir / 'cache' / 'libvirt', -- localstatedir / 'lib' / 'libvirt' / 'images', -- localstatedir / 'lib' / 'libvirt' / 'filesystems', -- localstatedir / 'lib' / 'libvirt' / 'boot', --] -- --meson.add_install_script( -- meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.path(), -- virt_install_dirs, --) -- -- - # Check driver files - - if host_machine.system() == 'linux' diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7a34f8db1f..c6929b9f1a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,7 +18,6 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari -;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1066,49 +1065,64 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "7.1.0") + (version "5.8.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "0v50ckf56h6jd9bmqwp0lh2cmb7qqjmcb6y3mz2i2r15h06ih3w7")) + (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) (patches - (search-patches "libvirt-do-not-create-var-dirs.patch")))) - (build-system meson-build-system) + (search-patches "libvirt-create-machine-cgroup.patch")))) + (build-system gnu-build-system) (arguments - `(#:meson ,meson-0.55 ;; libvirt requires meson 0.54 or higher. - #:configure-flags - (list "-Ddriver_qemu=enabled" - "-Dqemu_user=nobody" - "-Dqemu_group=kvm" - "-Dpolkit=enabled") + `(#:configure-flags + (list "--with-qemu" + "--with-qemu-user=nobody" + "--with-qemu-group=kvm" + "--with-polkit" + (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" + ,name "-" ,version) + "--sysconfdir=/etc" + "--localstatedir=/var") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-sysconfdir-and-localstatedir + (add-before 'configure 'fix-BOURNE_SHELL-definition + ;; BOURNE_SHELL is hard-#defined to ‘/bin/sh’, causing test failures. (lambda _ - (substitute* "meson.build" - ;; We set the prefix to be the package output, but we need - ;; localstatedir to be /var. Sadly the build system doesn't - ;; seem to allow that easily. - (("localstatedir = prefix / get_option\\('localstatedir'\\)") - "localstatedir = get_option('localstatedir')") - ;; On the other hand, we keep sysconfdir using the prefix so - ;; that we install configuration files in the package output. - ;; However, we need to make sure the C code refers to /etc via - ;; SYSCONFDIR, and not the read-only configuration in the - ;; package output. - (("set_quoted\\('SYSCONFDIR', sysconfdir\\)") - "set_quoted('SYSCONFDIR', '/etc')")) + (substitute* "config.h.in" + (("/bin/sh") (which "sh"))) + #t)) + (add-before 'configure 'patch-libtirpc-file-names + (lambda* (#:key inputs #:allow-other-keys) + ;; libvirt uses an m4 macro instead of pkg-config to determine where + ;; the RPC headers are located. Tell it to look in the right place. + (substitute* "configure" + (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 + (string-append (assoc-ref inputs "libtirpc") + "/include/tirpc"))) #t)) (add-before 'configure 'disable-broken-tests (lambda _ - (substitute* "tests/meson.build" - (("\\{ 'name': 'commandtest'.*") "") ; hangs idly - (("\\{ 'name': 'qemuxml2argvtest'.*") "") ; fails - (("\\{ 'name': 'virnetsockettest'.*") "")) ; tries to network - #t))))) + (let ((tests (list "commandtest" ; hangs idly + "qemuxml2argvtest" ; fails + "qemuhotplugtest" ; fails + "virnetsockettest" ; tries to network + "virshtest"))) ; fails + (substitute* "tests/Makefile.in" + (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|"))) + "")) + #t))) + (replace 'install + ;; Since the sysconfdir and localstatedir should be /etc and /var + ;; at runtime, we must prevent writing to them at installation + ;; time. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install" + "sysconfdir=/tmp/etc" + "localstatedir=/tmp/var" + make-flags)))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) @@ -1135,9 +1149,7 @@ manage system or application containers.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python-wrapper) - ("python-docutils" ,python-docutils) ;for rst2html - ("rpcsvc-proto" ,rpcsvc-proto))) ;for 'rpcgen' + ("python" ,python-wrapper))) (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization -- cgit v1.2.3 From a890880cf66cd2f625d648898a5c55cf3222a451 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 1 Apr 2021 22:48:00 +0800 Subject: gnu: Add python-smartypants. * gnu/packages/python-xyz.scm (python-smartypants): New variable. --- gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55bd9360f2..68e53c3f92 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24331,3 +24331,44 @@ number of words, syllables, and sentences.") "This package provides a Python library that can parse OPML, FOAF, and iGoogle subscription lists.") (license license:expat))) + +(define-public python-smartypants + (package + (name "python-smartypants") + (version "2.0.1") + (source + (origin + ;; There's no source tarball for 2.0.1 on PyPI. + (method git-fetch) + (uri (git-reference + (url "https://github.com/leohemsted/smartypants.py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00p1gnb9pzb3svdq3c5b9b332gsp50wrqqa39gj00m133zadanjp")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + ;; Its `setup.py test` doesn't report failure with exit status, so + ;; we use `nose` instead. + (lambda _ + (invoke "nosetests" "-v" "--exclude=^load_tests$")))))) + (native-inputs + ;; For tests. + `(("python-docutils" ,python-docutils) + ("python-nose" ,python-nose) + ("python-pygments" ,python-pygments))) + (home-page "https://github.com/leohemsted/smartypants.py") + (synopsis "Translate punctuation characters into smart quotes") + (description + "@command{smartpants} can perform the following transformations: +@enumerate +@item Straight quotes ( \" and ' ) into \"curly\" quote HTML entities +@item Backticks-style quotes (``like this'') into \"curly\" quote HTML +entities +@item Dashes (-- and ---) into en- and em-dash entities +@item Three consecutive dots (... or . . .) into an ellipsis entity +@end enumerate") + (license license:bsd-3))) -- cgit v1.2.3 From efb895146097fa14a8a38fe6de127f01aaf2a37b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 1 Apr 2021 22:49:48 +0800 Subject: gnu: Add python-typogrify. * gnu/packages/python-xyz.scm (python-typogrify): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 68e53c3f92..f2b1551df5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24372,3 +24372,34 @@ entities @item Three consecutive dots (... or . . .) into an ellipsis entity @end enumerate") (license license:bsd-3))) + +(define-public python-typogrify + (package + (name "python-typogrify") + (version "2.0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "typogrify" version)) + (sha256 + (base32 + "0f6b2gnnxjbx1fbmkcscc6qjr4hi78kwm1wx4b766ha3va66dr4b")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "nosetests" "-v")))))) + (propagated-inputs + `(("python-smartypants" ,python-smartypants))) + (native-inputs + ;; For tests. + `(("python-nose" ,python-nose))) + (home-page "https://github.com/mintchaos/typogrify") + (synopsis "Filters to transform text into typographically-improved HTML") + (description + "@code{typogrify} provides a set of custom filters that automatically +apply various transformations to plain text in order to yield +typographically-improved HTML. While often used in conjunction with Jinja and +Django template systems, the filters can be used in any environment.") + (license license:bsd-3))) -- cgit v1.2.3 From 566408da843faa4bac083c83c6047ca074283a7c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 08:13:55 -0400 Subject: gnu: asio: Update to 1.18.1. * gnu/packages/networking.scm (asio): Update to 1.18.1. (asio-1.12): New variable. * gnu/packages/emulators.scm (mame)[inputs]: Use asio-1.12, otherwise it fails to build. --- gnu/packages/emulators.scm | 2 +- gnu/packages/networking.scm | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index c4611bf34f..8bfcfc57a7 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1743,7 +1743,7 @@ This is a part of the TiLP project.") ("texinfo" ,texinfo))) (inputs `(("alsa-lib" ,alsa-lib) - ("asio" ,asio) + ("asio" ,asio-1.12) ;the bundled copy is at 1.11 ("expat" ,expat) ("flac" ,flac) ("fontconfig" ,fontconfig) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 75f0fa5d95..0fc289df54 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar @@ -3027,7 +3027,8 @@ eight bytes) tools ;; Either BSD-3 or GPL-2 can be used. (license (list license:bsd-3 license:gpl2)))) -(define-public asio +;;; This is an old version required by rested. +(define-public asio-1.12 (package (name "asio") (version "1.12.2") @@ -3054,6 +3055,18 @@ low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.") (license license:boost1.0))) +(define-public asio + (package + (inherit asio-1.12) + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asio/asio/" + version " (Stable)/asio-" version ".tar.bz2")) + (sha256 + (base32 "04wi69d72l1p5c7d63z1dz06zn8pdqsbgx1if98dszs9ymfqgyaa")))))) + (define-public shadowsocks ;; There are some security fixes after the last release. (let* ((commit "e332ec93e9c90f1cbee676b022bf2c5d5b7b1239") -- cgit v1.2.3 From 7822b15f041bc28b80e1d959cf33de01be814530 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 08:16:01 -0400 Subject: gnu: restbed: Update to 4.7. * gnu/packages/networking.scm (restbed): Update to 4.7. --- gnu/packages/networking.scm | 97 ++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0fc289df54..0f2e1659b4 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3332,57 +3332,56 @@ never see any machines other than the one Dante is running on.") (license (license:non-copyleft "file://LICENSE")))) (define-public restbed - (let ((commit "6eb385fa9051203f28bf96cc1844bbb5a9a6481f")) - (package - (name "restbed") - (version (git-version "4.6" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Corvusoft/restbed/") - (commit commit))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0k60i5drklqqrb4khb25fzkgz9y0sncxf1sp6lh2bm1m0gh0661n")))) - (build-system cmake-build-system) - (inputs - `(("asio" ,asio) - ("catch" ,catch-framework) - ("openssl" ,openssl))) - (arguments - `(#:tests? #f - #:configure-flags - '("-DBUILD_TESTS=NO" - "-DBUILD_EXAMPLES=NO" - "-DBUILD_SSL=NO" - "-DBUILD_SHARED=NO") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'apply-patches-and-fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((asio (assoc-ref inputs "asio")) - (catch (assoc-ref inputs "catch")) - (openssl (assoc-ref inputs "openssl"))) - (substitute* "cmake/Findasio.cmake" - (("(find_path\\( asio_INCLUDE asio\\.hpp HINTS ).*$" all begin) - (string-append begin " \"" asio "/include\" )"))) - (substitute* "cmake/Findcatch.cmake" - (("(find_path\\( catch_INCLUDE catch\\.hpp HINTS ).*$" all begin) - (string-append begin " \"" catch "/include\" )"))) - (substitute* "cmake/Findopenssl.cmake" - (("(find_library\\( ssl_LIBRARY ssl ssleay32 HINTS ).*$" all begin) - (string-append begin " \"" openssl "/lib\" )")) - (("(find_library\\( crypto_LIBRARY crypto libeay32 HINTS ).*$" all begin) - (string-append begin " \"" openssl "/lib\" )")) - (("(find_path\\( ssl_INCLUDE openssl/ssl\\.h HINTS ).*$" all begin) - (string-append begin " \"" openssl "/include\" )"))))))))) - (synopsis "Asynchronous RESTful functionality to C++11 applications") - (description "Restbed is a comprehensive and consistent programming + (package + (name "restbed") + (version "4.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Corvusoft/restbed/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "055qicb773a599dsqbcz5xf0xj1wpk33mdrkyi0fsmyjmn8d2p9d")))) + (build-system cmake-build-system) + (inputs + `(("asio" ,asio-1.12) + ("catch" ,catch-framework) + ("openssl" ,openssl))) + (arguments + `(#:tests? #f + #:configure-flags + '("-DBUILD_TESTS=NO" + "-DBUILD_EXAMPLES=NO" + "-DBUILD_SSL=NO" + "-DBUILD_SHARED=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'apply-patches-and-fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((asio (assoc-ref inputs "asio")) + (catch (assoc-ref inputs "catch")) + (openssl (assoc-ref inputs "openssl"))) + (substitute* "cmake/Findasio.cmake" + (("(find_path\\( asio_INCLUDE asio\\.hpp HINTS ).*$" all begin) + (string-append begin " \"" asio "/include\" )"))) + (substitute* "cmake/Findcatch.cmake" + (("(find_path\\( catch_INCLUDE catch\\.hpp HINTS ).*$" all begin) + (string-append begin " \"" catch "/include\" )"))) + (substitute* "cmake/Findopenssl.cmake" + (("(find_library\\( ssl_LIBRARY ssl ssleay32 HINTS ).*$" all begin) + (string-append begin " \"" openssl "/lib\" )")) + (("(find_library\\( crypto_LIBRARY crypto libeay32 HINTS ).*$" all begin) + (string-append begin " \"" openssl "/lib\" )")) + (("(find_path\\( ssl_INCLUDE openssl/ssl\\.h HINTS ).*$" all begin) + (string-append begin " \"" openssl "/include\" )"))))))))) + (synopsis "Asynchronous RESTful functionality to C++11 applications") + (description "Restbed is a comprehensive and consistent programming model for building applications that require seamless and secure communication over HTTP.") - (home-page "https://github.com/Corvusoft/restbed") - (license license:agpl3+)))) + (home-page "https://github.com/Corvusoft/restbed") + (license license:agpl3+))) (define-public restinio (package -- cgit v1.2.3 From 0b25557bea82d837d499c72c3de7f27c394fda33 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 08:16:21 -0400 Subject: gnu: restinio: Update to 0.6.13. * gnu/packages/networking.scm (restinio): Update to 0.6.13. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0f2e1659b4..8cdb674ff3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3386,7 +3386,7 @@ communication over HTTP.") (define-public restinio (package (name "restinio") - (version "0.6.1.1") + (version "0.6.13") (source (origin (method git-fetch) (uri (git-reference @@ -3395,7 +3395,7 @@ communication over HTTP.") (file-name (git-file-name name version)) (sha256 (base32 - "141a96hx8zhcdv121g6cs91n46kb47y040v25pnvz5f54964z7f5")))) + "0gb0yc88hdzwm08zdiviay6s08q427za33kfbygib7bdzp2wr2dm")))) (build-system cmake-build-system) (inputs ; TODO: Need to force-keep references on some inputs, e.g. boost. `(("zlib" ,zlib) -- cgit v1.2.3 From cf86b9af53678cb4276e031957e150a98a88a664 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 12:14:29 -0400 Subject: gnu: Add nettle-3.7. While nettle cannot be upgraded wholesale on the master branch, we can at least also offer the latest version available. * gnu/packages/nettle.scm (nettle-3.5, nettle-3.7): New variables. (nettle): Redefine as a binding to nettle-3.5, which is the current version. --- gnu/packages/nettle.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index f5e7188ff0..753e2d6e7e 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,7 +72,7 @@ cryptographic toolkits for object-oriented languages or in applications themselves.") (license gpl2+))) -(define-public nettle +(define-public nettle-3.5 ;; This version is not API-compatible with version 2. In particular, lsh ;; cannot use it yet. So keep it separate. (package (inherit nettle-2) @@ -89,3 +90,17 @@ themselves.") ;; Build "fat" binaries where the right implementation is chosen ;; at run time based on CPU features (starting from 3.1.) `(cons "--enable-fat" ,flags)))))) + +(define-public nettle-3.7 + (package (inherit nettle-3.5) + (version "3.7.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/nettle/nettle-" + version ".tar.gz")) + (sha256 + (base32 + "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald")))))) + +;;; Upgrading Nettle on master would cause 10000+ packages to be rebuilt. +(define-public nettle nettle-3.5) -- cgit v1.2.3 From 67a5e112b1f3527538b7dcbccbb26a5594861d0e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 08:16:32 -0400 Subject: gnu: opendht: Update to 2.2.0rc4. * gnu/packages/patches/opendht-fix-jami.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Un-register it. * gnu/packages/networking.scm (opendht): Update to 2.2.0rc4. [patches]: Remove field. [inputs]: Use nettle-3.7. [native-inputs]: Move restinio to... [propagated-inputs]: ... here. --- gnu/local.mk | 1 - gnu/packages/networking.scm | 13 ++++++------ gnu/packages/patches/opendht-fix-jami.patch | 33 ----------------------------- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 gnu/packages/patches/opendht-fix-jami.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f2d595f2cc..1a72e896a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1470,7 +1470,6 @@ dist_patch_DATA = \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ - %D%/packages/patches/opendht-fix-jami.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8cdb674ff3..f0e95c6ed0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3428,40 +3428,39 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.1.4") + (version "2.2.0rc4") ;jami requires >= 2.2.0 (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") (commit version))) (file-name (git-file-name name version)) - (patches (search-patches "opendht-fix-jami.patch")) (sha256 (base32 - "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal")))) + "1wc0f6cnvnlmhxnx64nxqgsx93k4g7ljdaqjl40ml74jg3nqrzcl")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs `(("argon2" ,argon2) - ("nettle" ,nettle) + ("nettle" ,nettle-3.7) ("readline" ,readline) ("jsoncpp" ,jsoncpp) ("openssl" ,openssl) ;required for the DHT proxy ("fmt" ,fmt))) (propagated-inputs `(("gnutls" ,gnutls) ;included in opendht/crypto.h - ("msgpack" ,msgpack))) ;included in several installed headers + ("msgpack" ,msgpack) ;included in several installed headers + ("restinio" ,restinio))) ;included in opendht/http.h (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("restinio" ,restinio) ;headers only library ("libtool" ,libtool) ("cppunit" ,cppunit))) (arguments `(#:tests? #f ; Tests require network connection. #:configure-flags - '(;; "-DOPENDHT_TESTS=on" + '(;;"-DOPENDHT_TESTS=on" "-DOPENDHT_TOOLS=off" "-DOPENDHT_PYTHON=off" "-DOPENDHT_PROXY_SERVER=on" diff --git a/gnu/packages/patches/opendht-fix-jami.patch b/gnu/packages/patches/opendht-fix-jami.patch deleted file mode 100644 index 9718a84a41..0000000000 --- a/gnu/packages/patches/opendht-fix-jami.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e2b39dd3a0742853e00f9c3e8c46c911da20bed7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adrien=20B=C3=A9raud?= -Date: Tue, 30 Jun 2020 10:42:49 -0400 -Subject: [PATCH 1/4] http/request: make terminate public - ---- - include/opendht/http.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/include/opendht/http.h b/include/opendht/http.h -index cc8d5f9..46b722c 100644 ---- a/include/opendht/http.h -+++ b/include/opendht/http.h -@@ -294,6 +294,7 @@ public: - * User action to cancel the Request and call the completion callbacks. - */ - void cancel(); -+ void terminate(const asio::error_code& ec); - - private: - using OnCompleteCb = std::function; -@@ -320,8 +321,6 @@ private: - - void connect(std::vector&& endpoints, HandlerCb cb = {}); - -- void terminate(const asio::error_code& ec); -- - void post(); - - void handle_request(const asio::error_code& ec); --- -2.27.0 - -- cgit v1.2.3 From 45136b3673bcdba21fa0d1fd6edb3d388a645fcc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 13:08:10 -0400 Subject: gnu: pjproject: Update to 2.11. * gnu/packages/telephony.scm (pjproject): Update to 2.11. Remove trailing #t. [patches]: Delete field. The patches are preserved because pjproject-jami still needs them. --- gnu/packages/telephony.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5c8d247e68..af7148bf84 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 LibreMiami ;;; @@ -723,7 +723,7 @@ your calls and messages.") (define-public pjproject (package (name "pjproject") - (version "2.10") + (version "2.11") (source (origin (method git-fetch) @@ -733,12 +733,8 @@ your calls and messages.") (file-name (git-file-name name version)) (sha256 (base32 - "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) + "1kn9g1x1vmh4130ghph8mldz5m89gsjs4vpdzlzm98m3808gk5an")) (modules '((guix build utils))) - ;; The patches upstream status can be tracked at: - ;; https://github.com/pjsip/pjproject/pull/2501. - (patches (search-patches "pjproject-correct-the-cflags-field.patch" - "pjproject-fix-pkg-config-ldflags.patch")) (snippet '(begin ;; Remove bundled libraries. @@ -746,8 +742,7 @@ your calls and messages.") (substitute* "aconfigure.ac" (("third_party/build/os-auto.mak") "")) (substitute* "Makefile" - (("third_party/build") "")) - #t)))) + (("third_party/build") "")))))) (build-system gnu-build-system) (outputs '("out" "debug" "static")) (arguments @@ -785,8 +780,7 @@ your calls and messages.") ;; Make all the files writable to prevent the following error: ;; "autom4te: cannot open aconfigure: Permission denied". (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-before 'build 'build-dep (lambda _ (invoke "make" "dep"))) ;; The check phases is moved after the install phase so to @@ -800,8 +794,7 @@ your calls and messages.") (with-directory-excursion out (for-each (lambda (f) (rename-file f (string-append s "/" (basename f)))) - (find-files "." "\\.a$"))) - #t))) + (find-files "." "\\.a$")))))) (add-after 'install 'check (assoc-ref %standard-phases 'check)) (add-before 'patch-source-shebangs 'autoconf @@ -844,8 +837,7 @@ your calls and messages.") ;; Disable the pjnath and pjsua tests, which require an actual ;; network and an actual sound card, respectively. (("pjnath-test pjmedia-test pjsip-test pjsua-test") - "pjmedia-test pjsip-test")) - #t))))) + "pjmedia-test pjsip-test"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 3d913c1ed80470fde408a6f4509e8ae1277f40fb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Aug 2020 15:05:09 -0400 Subject: gnu: pjproject-jami: Fix CVE-2020-15260 and CVE-2021-21375. The custom pjproject package used by Jami is updated with the latest patches found in the 20210326.1.cfba013 release of Jami. * gnu/packages/jami.scm (%jami-version): Update to 20210326.1.cfba013. (jami-source) [snippet]: Update comment. Add client-electron and client-ios to the list of deleted directories. Remove client-windows from the list, as it no longer exists. (jami-apply-dependency-patches): Update comment. Ignore whitespace when applying patches, otherwise the pjproject patches would not apply. (pjproject-jami): Add comment. [source]: Define the source; the parent pjproject package was updated was updated to 2.11, but the patches only apply against 2.10. [phases] : Update the list of patches used with those found in the release tarball. --- gnu/packages/jami.scm | 52 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 3773c1ab0a..35d84bb37b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2019, 2020 Jan Wielkiewicz -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +63,7 @@ #:use-module (guix utils) #:use-module (srfi srfi-1)) -(define %jami-version "20200710.1.6bd18d2") +(define %jami-version "20210326.1.cfba013") (define* (jami-source #:key keep-contrib-patches?) "Return an origin object of the tarball release sources archive of Jami. @@ -78,7 +78,7 @@ of Jami." (modules '((guix build utils))) (snippet `(begin - ;; Delete over 200 MiB of bundled tarballs. The contrib directory + ;; Delete multiple MiBs of bundled tarballs. The contrib directory ;; contains the custom patches for pjproject and other libraries used ;; by Savoir-faire Linux. (if ,keep-contrib-patches? @@ -86,21 +86,21 @@ of Jami." (delete-file-recursively "daemon/contrib")) ;; Remove code from unused Jami clients. (for-each delete-file-recursively '("client-android" + "client-electron" + "client-ios" "client-macosx" - "client-uwp" - "client-windows")) - #t)) + "client-uwp")))) (sha256 (base32 - "0lg61jv39x7kc9lq30by246xb6gcgp1rzj49ak7ff8nqpfzyfvva")))) + "1h0avma8bdzyznkz39crjyv2888bii4f49md15jg7970dyp5pdyz")))) (define %sfl-patches (jami-source #:keep-contrib-patches? #t)) (define %jami-sources (jami-source)) -;; Savoir-faire Linux modifies many libraries to add features -;; to Jami. This procedure makes applying patches to a given -;; package easy. +;; Savoir-faire Linux maintains a set of patches for some key dependencies +;; (currently pjproject and ffmpeg) of Jami that haven't yet been integrated +;; upstream. This procedure simplifies the process of applying these patches.x (define jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) (let ((patches-directory "sfl-patches")) @@ -112,15 +112,30 @@ of Jami." dep-name)) (for-each (lambda (file) - (invoke "patch" "--force" "-p1" "-i" + (invoke "patch" "--force" "--ignore-whitespace" "-p1" "-i" (string-append patches-directory "/" file ".patch"))) patches)))) +;;; Jami maintains pjproject patches that add the ability to do ICE over TCP, +;;; among other things. The patches are currently based on pjproject 2.10. (define-public pjproject-jami (package (inherit pjproject) (name "pjproject-jami") + (version "2.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pjsip/pjproject") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) + (patches (search-patches + "pjproject-correct-the-cflags-field.patch" + "pjproject-fix-pkg-config-ldflags.patch")))) (native-inputs `(("sfl-patches" ,%sfl-patches) ,@(package-native-inputs pjproject))) @@ -140,14 +155,19 @@ of Jami." "0004-multiple_listeners" "0005-fix_ebusy_turn" "0006-ignore_ipv6_on_transport_check" - "0007-pj_ice_sess" + "0007-upnp-srflx-nat-assisted-cand" "0008-fix_ioqueue_ipv6_sendto" "0009-add-config-site" - ;; Note: The base pjproject is already patched with - ;; "0010-fix-pkgconfig". + ;; Already taken care of via the origin patches. + ;;"0010-fix-pkgconfig" "0011-fix-tcp-death-detection" - "0012-fix-turn-shutdown-crash")) - #t)))))))) + "0012-fix-turn-shutdown-crash" + "0013-Assign-unique-local-preferences-for-candidates-with-" + "0014-Add-new-compile-time-setting-PJ_ICE_ST_USE_TURN_PERM" + "0015-update-local-preference-for-peer-reflexive-candidate" + "0016-use-addrinfo-instead-CFHOST" + "0017-CVE-2020-15260" + "0018-CVE-2021-21375")))))))))) ;; The following variables are configure flags used by ffmpeg-jami. They're ;; from the ring-project/daemon/contrib/src/ffmpeg/rules.mak file. We try to -- cgit v1.2.3 From 3f742c77ef26d38bce0ce99619491ade8686a77f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 16:57:54 -0400 Subject: ffmpeg-jami: Apply patches from Jami 20210326.1.cfba013. * gnu/packages/jami.scm (ffmpeg-jami): Remove trailing #t. [phases] : Add libopusdec-enable-FEC and libopusenc-enable-FEC to the list of patches to apply. --- gnu/packages/jami.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 35d84bb37b..9d5d00c60c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -403,21 +403,22 @@ of Jami." `(modify-phases ,phases (add-after 'unpack 'make-git-checkout-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'unpack 'apply-patches (lambda* (#:key inputs #:allow-other-keys) (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) ;; These patches come from: ;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak". - (jami-apply-dependency-patches #:inputs inputs - #:dep-name "ffmpeg" - #:patches - '("remove-mjpeg-log" - "change-RTCP-ratio" - "rtp_ext_abs_send_time")) - #t)))))))))) + (jami-apply-dependency-patches + #:inputs inputs + #:dep-name "ffmpeg" + #:patches + '("remove-mjpeg-log" + "change-RTCP-ratio" + "rtp_ext_abs_send_time" + "libopusdec-enable-FEC" + "libopusenc-enable-FEC")))))))))))) (define-public libring (package -- cgit v1.2.3 From 2cfd4770afca54382de3ddd04dedd15303ad38ec Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 17:02:30 -0400 Subject: gnu: libring: Update to 20210326.1.cfba013. * gnu/packages/jami.scm (libring): Update to 20210326.1.cfba013. Remove trailing #t. [inputs]: Remove boost, flac, gmp, gsm, libogg, libva, opus, pcre, libsamplerate, libsndfile, libvorbis, libx264, libvdpau, zlib, python, python-wrapper, restinio, and libx11. Add libgit2 and webrtc-audio-processing. [native-inputs]: Remove cppunit. Add gcc-8. [make-flags]: Add the V=1 flag. [synopsis]: More explicitly describe what this component is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 71 +++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 48 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 9d5d00c60c..768039a9ea 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -26,20 +26,16 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) - #:use-module (gnu packages boost) - #:use-module (gnu packages check) - #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) - #:use-module (gnu packages multiprecision) #:use-module (gnu packages networking) - #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -50,6 +46,7 @@ #:use-module (gnu packages telephony) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) + #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages webkit) #:use-module (gnu packages xiph) @@ -60,8 +57,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (srfi srfi-1)) + #:use-module (guix utils)) (define %jami-version "20210326.1.cfba013") @@ -428,71 +424,50 @@ of Jami." (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) + ("asio" ,asio) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) ("ffmpeg" ,ffmpeg-jami) - ("flac" ,flac) - ("gmp" ,gmp) - ("gsm" ,gsm) ("jack" ,jack-1) ("jsoncpp" ,jsoncpp) ("libarchive" ,libarchive) + ("libgit2" ,libgit2) ("libnatpmp" ,libnatpmp) - ("libogg" ,libogg) - ("libva" ,libva) + ("libsecp256k1" ,libsecp256k1) + ("libupnp" ,libupnp) ("opendht" ,opendht) - ("opus" ,opus) - ("pcre" ,pcre) + ("openssl" ,openssl) + ("pjproject" ,pjproject-jami) ("pulseaudio" ,pulseaudio) - ("libsamplerate" ,libsamplerate) - ("libsndfile" ,libsndfile) ("speex" ,speex) ("speexdsp" ,speexdsp) - ("libupnp" ,libupnp) - ("libvorbis" ,libvorbis) - ("libx264" ,libx264) - ("libvdpau" ,libvdpau) - ("yaml-cpp" ,yaml-cpp) - ("zlib" ,zlib) - ("openssl" ,openssl) - ("libsecp256k1" ,libsecp256k1) - ("python" ,python) - ("python-wrapper" ,python-wrapper) - ("restinio" ,restinio) - ("libx11" ,libx11) - ("asio" ,asio) - ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version. - ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24. - ("pjproject" ,pjproject-jami))) + ("webrtc-audio-processing" ,webrtc-audio-processing) + ("yaml-cpp" ,yaml-cpp))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) + ("gcc" ,gcc-8) ;charconv requires GCC 8.1+ ("libtool" ,libtool) + ("perl" ,perl) ;to generate manpages with pod2man ("pkg-config" ,pkg-config) - ("which" ,which) - ("cppunit" ,cppunit) - ("perl" ,perl))) ; Needed for documentation. + ("which" ,which))) (arguments `(#:tests? #f ; The tests fail to compile due to missing headers. + #:make-flags '("V=1") ;build verbosely #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "daemon") - #t)) + (chdir "daemon"))) (add-before 'build 'add-lib-dir (lambda _ - (mkdir-p "src/lib") - #t))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library and daemon implementing the Jami core -functionality.") + (mkdir-p "src/lib")))))) + (synopsis "Jami core library and daemon") + (description "This package provides a library and daemon implementing the +Jami core functionality. Jami is a secure and distributed voice, video and +chat communication platform that requires no centralized server and leaves the +power of privacy in the hands of the user. It supports the SIP and IAX +protocols, as well as decentralized calling using P2P-DHT.") (home-page "https://jami.net/") (license license:gpl3+))) -- cgit v1.2.3 From 40a5f7904a482500840332b18917a22163750785 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 21:03:16 -0400 Subject: gnu: libringclient: Update to 20210326.1.cfba013. * gnu/packages/jami.scm (libringclient): Update to 20210326.1.cfba013. Remove trailing #t. Do not inherit from libring. [version, source]: Specify fields. [propagated-inputs]: Remove qttools. Move libring to ... [inputs]: ... here. Add network-manager. [configure-flags] Define the RING_XML_INTERFACES_DIR and LIBWRAP variables. [phases]{fix-dbus-interfaces-path}: Delete. [synopsis]: More explicitly describe what this component is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 768039a9ea..2d52b4bb6a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -473,37 +473,39 @@ protocols, as well as decentralized calling using P2P-DHT.") (define-public libringclient (package - (inherit libring) (name "libringclient") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) + (inputs + `(("libring" ,libring) + ("network-manager" ,network-manager))) (propagated-inputs - `(("libring" ,libring) ; For 'dring'. - ("qtbase" ,qtbase) ; Qt is included in several installed headers. - ("qttools" ,qttools))) + `(("qtbase" ,qtbase))) ; Qt is included in several installed headers. (arguments `(#:tests? #f ; There is no testsuite. #:configure-flags - (list (string-append "-DRING_BUILD_DIR=" - (assoc-ref %build-inputs "libring") "/include")) + (let ((libring (assoc-ref %build-inputs "libring"))) + (list (string-append "-DRING_XML_INTERFACES_DIR=" + libring "/share/dbus-1/interfaces") + (string-append "-DRING_BUILD_DIR=" libring "/include") + ;; Use LIBWRAP, which removes the requirement on DBus. Qt + ;; links with the dbus library in Guix, which expects to find + ;; its configuration under /etc rather than /usr/share/dbus-1, + ;; which is perhaps the reason the auto-launching of dring + ;; doesn't work on foreign distributions. + "-DENABLE_LIBWRAP=true")) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "lrc") - #t)) - (add-before 'configure 'fix-dbus-interfaces-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix) - (string-append (assoc-ref inputs "libring") - dbus-interfaces-path-suffix)))))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library common to all Jami clients.") + (chdir "lrc")))))) + (synopsis "Jami client library") + (description "This package provides a library common to all Jami clients. +Jami is a secure and distributed voice, video and chat communication platform +that requires no centralized server and leaves the power of privacy in the +hands of the user. It supports the SIP and IAX protocols, as well as +decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) -- cgit v1.2.3 From 60e64e28f3a5d8eaf5659b655af9b027eb396f1f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 22:45:34 -0400 Subject: gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome. * gnu/packages/jami.scm (jami): Update to 20210326.1.cfba013. Rename to ... (jami-gnome): ... this, in prevision to the soon released Jami Qt client. (jami): Define as obsoleted by jami-gnome. [inputs]: Sort lexico-graphically. Add libappindicator and network-manager. [native-inputs]: Add a comment and fix a typo. Remove doxygen. [propagated-inputs]: Remove evolution-data-server. [synopsis]: More explicitly describe what this package is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 54 ++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 2d52b4bb6a..e65e477b79 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -509,44 +510,49 @@ decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) -(define-public jami +(define-public jami-gnome (package - (inherit libring) - (name "jami") + (name "jami-gnome") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) (inputs - `(("libringclient" ,libringclient) - ("gtk+" ,gtk+) - ("qrencode" ,qrencode) - ("libnotify" ,libnotify) - ("clutter" ,clutter) + `(("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) + ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ("sqlite" ,sqlite))) + ("libappindicator" ,libappindicator) + ("libnotify" ,libnotify) + ("libringclient" ,libringclient) + ("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("sqlite" ,sqlite) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("doxygen" ,doxygen))) + ("glib:bin" ,glib "bin"))) ;for glib-compile-resources (propagated-inputs - `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus. - ("adwaita-icon-theme" ,adwaita-icon-theme) - ("evolution-data-server" ,evolution-data-server))) + `(("libring" ,libring) ; Contains 'dring', the daemon, which is + ; automatically started by DBus. + ("adwaita-icon-theme" ,adwaita-icon-theme))) (arguments `(#:tests? #f ; There is no testsuite. #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "client-gnome") - #t))))) - (synopsis "Distributed, privacy-respecting communication program") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides the Jami client for the GNOME desktop.") + (chdir "client-gnome")))))) + (synopsis "Jami client for GNOME") + (description "This package provides a Jami client for the GNOME desktop. +Jami is a secure and distributed voice, video and chat communication platform +that requires no centralized server and leaves the power of privacy in the +hands of the user. It supports the SIP and IAX protocols, as well as +decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) + +;;; Keep this until the Qt client matures enough to become the +;;; main 'jami' client. +(define-public jami + (deprecated-package "jami" jami-gnome)) -- cgit v1.2.3 From e6b447cf756831e8339e6462647004d88132fa07 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:13:57 -0400 Subject: gnu: Add jami-qt. * gnu/packages/jami.scm (jami-qt): New variable. --- gnu/packages/jami.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index e65e477b79..e1f6d412be 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) @@ -55,6 +56,7 @@ #:use-module (gnu packages) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -556,3 +558,68 @@ decentralized calling using P2P-DHT.") ;;; main 'jami' client. (define-public jami (deprecated-package "jami" jami-gnome)) + +(define-public jami-qt + (package + (name "jami-qt") ;to be renamed 'jami' at some point + (version %jami-version) + ;; The Qt client code is not yet part of the release tarball; fetch it + ;; from git for now. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.jami.net/savoirfairelinux/jami-client-qt.git") + (commit "ae21c17da5e8f730ae3895ccbc4da8047e3be1eb"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rf3lpk8c4qc12pi6pn4rdp7i8b83xv64yqr0q47rzv9s518qyjp")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ;no test suite + #:phases + (modify-phases %standard-phases + ;; TODO: Uncomment after switching back to the tarball source. + ;; (add-after 'unpack 'change-directory + ;; (lambda _ + ;; (chdir "client-qt"))) + (add-after 'install 'wrap + ;; The program fails to find the QtWebEngineProcess program, so we + ;; set QTWEBENGINEPROCESS_PATH to help it. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (qtwebengineprocess (string-append + (assoc-ref inputs "qtwebengine") + "/lib/qt5/libexec/QtWebEngineProcess"))) + (for-each (lambda (program) + (wrap-program program + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengineprocess)))) + (find-files bin ".*")))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("doxygen" ,doxygen) + ("graphviz" ,graphviz))) + (inputs + `(("libringclient" ,libringclient) + ("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("qtsvg" ,qtsvg) + ("qtwebengine" ,qtwebengine) + ("qtwebchannel" ,qtwebchannel) + ("qtmultimedia" ,qtmultimedia) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols2" ,qtquickcontrols2))) + (propagated-inputs + `(("libring" ,libring))) ;for dring + (home-page "https://jami.net") + (synopsis "Qt Jami client") + (description "This package provides the Jami Qt client. Jami is a secure +and distributed voice, video and chat communication platform that requires no +centralized server and leaves the power of privacy in the hands of the user. +It supports the SIP and IAX protocols, as well as decentralized calling using +P2P-DHT.") + (license license:gpl3+))) -- cgit v1.2.3 From 532c0e745aa81b5ac5ed8cb2b4f9b02aa720d9a9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 2 Apr 2021 11:47:17 -0400 Subject: gnu: libringclient: Disable the libwrap feature. As it causes video calls to segfault. * gnu/packages/jami.scm (libringclient): Set -DENABLE_LIBWRAP to false for the time being. --- gnu/packages/jami.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index e1f6d412be..0ba293ca93 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -497,7 +497,11 @@ protocols, as well as decentralized calling using P2P-DHT.") ;; its configuration under /etc rather than /usr/share/dbus-1, ;; which is perhaps the reason the auto-launching of dring ;; doesn't work on foreign distributions. - "-DENABLE_LIBWRAP=true")) + + ;; FIXME: Disabled for now, as it causes a segfault when + ;; attempting video calls (see: + ;; https://git.jami.net/savoirfairelinux/ring-lrc/-/issues/466). + "-DENABLE_LIBWRAP=false")) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory -- cgit v1.2.3 From 23ea84cdf07c9b6bd4a61d14e5cb6009060f87cf Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:31 -0400 Subject: build-system: Rewrite node build system. * guix/build/node-build-system.scm: Rewrite it. * guix/build-system/node.scm: Adjust accordingly. * gnu/packages/node-xyz.scm (node-semver): Likewise. Co-authored-by: Timothy Sample --- gnu/packages/node-xyz.scm | 6 +- guix/build-system/node.scm | 27 ++--- guix/build/node-build-system.scm | 207 ++++++++++++++++++--------------------- 3 files changed, 110 insertions(+), 130 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index b1d6d4ce59..60cc005ea4 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -261,7 +261,11 @@ function with browser support.") "06biknqb05r9xsmcflm3ygh50pjvdk84x6r79w43kmck4fn3qn5p")))) (build-system node-build-system) (arguments - `(#:tests? #f)) ;; FIXME: Tests depend on node-tap + '(#:tests? #f ; FIXME: Tests depend on node-tap + #:phases + (modify-phases %standard-phases + ;; The only dependency to check for is tap, which we don't have. + (delete 'configure)))) (home-page "https://github.com/npm/node-semver") (synopsis "Parses semantic versions strings") (description diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index a8c5eed09b..4991ed53a5 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jelle Licht +;;; Copyright © 2019 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,7 +18,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system node) - #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix derivations) @@ -25,22 +25,15 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (ice-9 match) - #:export (npm-meta-uri - %node-build-system-modules + #:export (%node-build-system-modules node-build node-build-system)) -(define (npm-meta-uri name) - "Return a URI string for the metadata of node module NAME found in the npm -registry." - (string-append "https://registry.npmjs.org/" name)) - (define %node-build-system-modules ;; Build-side modules imported by default. `((guix build node-build-system) (guix build json) - (guix build union) - ,@%gnu-build-system-modules)) ;; TODO: Might be not needed + ,@%gnu-build-system-modules)) (define (default-node) "Return the default Node package." @@ -76,7 +69,7 @@ registry." (define* (node-build store name inputs #:key - (npm-flags ''()) + (test-target "test") (tests? #t) (phases '(@ (guix build node-build-system) %standard-phases)) @@ -86,8 +79,6 @@ registry." (guile #f) (imported-modules %node-build-system-modules) (modules '((guix build node-build-system) - (guix build json) - (guix build union) (guix build utils)))) "Build SOURCE using NODE and INPUTS." (define builder @@ -97,12 +88,10 @@ registry." #:source ,(match (assoc-ref inputs "source") (((? derivation? source)) (derivation->output-path source)) - ((source) - source) - (source - source)) + ((source) source) + (source source)) #:system ,system - #:npm-flags ,npm-flags + #:test-target ,test-target #:tests? ,tests? #:phases ,phases #:outputs %outputs @@ -129,5 +118,5 @@ registry." (define node-build-system (build-system (name 'node) - (description "The standard Node build system") + (description "The Node build system") (lower lower))) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 7799f03595..a55cab237c 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson -;;; Copyright © 2016 Jelle Licht +;;; Copyright © 2016, 2020 Jelle Licht +;;; Copyright © 2019, 2021 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,144 +20,130 @@ (define-module (guix build node-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) - #:use-module (guix build json) - #:use-module (guix build union) #:use-module (guix build utils) + #:use-module (guix build json) + #:use-module (ice-9 ftw) #:use-module (ice-9 match) - #:use-module (ice-9 popen) - #:use-module (ice-9 regex) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:export (%standard-phases node-build)) ;; Commentary: ;; -;; Builder-side code of the standard Node/npm package build procedure. +;; Builder-side code of the standard Node/NPM package install procedure. ;; ;; Code: -(define* (read-package-data #:key (filename "package.json")) - (call-with-input-file filename - (lambda (port) - (read-json port)))) +(define (set-home . _) + (with-directory-excursion ".." + (let loop ((i 0)) + (let ((dir (string-append "npm-home-" (number->string i)))) + (if (directory-exists? dir) + (loop (1+ i)) + (begin + (mkdir dir) + (setenv "HOME" (string-append (getcwd) "/" dir)) + (format #t "set HOME to ~s~%" (getenv "HOME"))))))) + #t) -(define* (build #:key inputs #:allow-other-keys) - (define (build-from-package-json? package-file) - (let* ((package-data (read-package-data #:filename package-file)) - (scripts (assoc-ref package-data "scripts"))) - (assoc-ref scripts "build"))) - "Build a new node module using the appropriate build system." - ;; XXX: Develop a more robust heuristic, allow override - (cond ((file-exists? "gulpfile.js") - (invoke "gulp")) - ((file-exists? "gruntfile.js") - (invoke "grunt")) - ((file-exists? "Makefile") - (invoke "make")) - ((and (file-exists? "package.json") - (build-from-package-json? "package.json")) - (invoke "npm" "run" "build"))) +(define (module-name module) + (let* ((package.json (string-append module "/package.json")) + (package-meta (call-with-input-file package.json read-json))) + (assoc-ref package-meta "name"))) + +(define (index-modules input-paths) + (define (list-modules directory) + (append-map (lambda (x) + (if (string-prefix? "@" x) + (list-modules (string-append directory "/" x)) + (list (string-append directory "/" x)))) + (filter (lambda (x) + (not (member x '("." "..")))) + (or (scandir directory) '())))) + (let ((index (make-hash-table (* 2 (length input-paths))))) + (for-each (lambda (dir) + (let ((nm (string-append dir "/lib/node_modules"))) + (for-each (lambda (module) + (hash-set! index (module-name module) module)) + (list-modules nm)))) + input-paths) + index)) + +(define* (patch-dependencies #:key inputs #:allow-other-keys) + + (define index (index-modules (map cdr inputs))) + + (define (resolve-dependencies package-meta meta-key) + (fold (lambda (key+value acc) + (match key+value + ('@ acc) + ((key . value) (acons key (hash-ref index key value) acc)))) + '() + (or (assoc-ref package-meta meta-key) '()))) + + (with-atomic-file-replacement "package.json" + (lambda (in out) + (let ((package-meta (read-json in))) + (assoc-set! package-meta "dependencies" + (append + '(@) + (resolve-dependencies package-meta "dependencies") + (resolve-dependencies package-meta "peerDependencies"))) + (assoc-set! package-meta "devDependencies" + (append + '(@) + (resolve-dependencies package-meta "devDependencies"))) + (write-json package-meta out)))) #t) -(define* (link-npm-dependencies #:key inputs #:allow-other-keys) - (define (inputs->node-inputs inputs) - "Filter the directory part from INPUTS." - (filter (lambda (input) - (match input - ((name . _) (node-package? name)))) - inputs)) - (define (inputs->directories inputs) - "Extract the directory part from INPUTS." - (match inputs - (((names . directories) ...) - directories))) - (define (make-node-path root) - (string-append root "/lib/node_modules/")) - - (let ((input-node-directories (inputs->directories - (inputs->node-inputs inputs)))) - (union-build "node_modules" - (map make-node-path input-node-directories)) +(define* (configure #:key outputs inputs #:allow-other-keys) + (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) + (invoke npm "--offline" "--ignore-scripts" "install") #t)) -(define configure link-npm-dependencies) +(define* (build #:key inputs #:allow-other-keys) + (let ((package-meta (call-with-input-file "package.json" read-json))) + (if (and=> (assoc-ref package-meta "scripts") + (lambda (scripts) + (assoc-ref scripts "build"))) + (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) + (invoke npm "run" "build")) + (format #t "there is no build script to run~%")) + #t)) -(define* (check #:key tests? #:allow-other-keys) +(define* (check #:key tests? inputs #:allow-other-keys) "Run 'npm test' if TESTS?" (if tests? - ;; Should only be enabled once we know that there are tests - (invoke "npm" "test")) + (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) + (invoke npm "test")) + (format #t "test suite not run~%")) #t) -(define (node-package? name) - "Check if NAME correspond to the name of an Node package." - (string-prefix? "node-" name)) +(define* (repack #:key inputs #:allow-other-keys) + (invoke "tar" "-czf" "../package.tgz" ".") + #t) (define* (install #:key outputs inputs #:allow-other-keys) - "Install the node module to the output store item. The module itself is -installed in a subdirectory of @file{node_modules} and its runtime dependencies -as defined by @file{package.json} are symlinked into a @file{node_modules} -subdirectory of the module's directory. Additionally, binaries are installed in -the @file{bin} directory." - (let* ((out (assoc-ref outputs "out")) - (target (string-append out "/lib")) - (binaries (string-append out "/bin")) - (data (read-package-data)) - (modulename (assoc-ref data "name")) - (binary-configuration (match (assoc-ref data "bin") - (('@ configuration ...) configuration) - ((? string? configuration) configuration) - (#f #f))) - (dependencies (match (assoc-ref data "dependencies") - (('@ deps ...) deps) - (#f #f)))) - (mkdir-p target) - (copy-recursively "." (string-append target "/node_modules/" modulename)) - ;; Remove references to dependencies - (delete-file-recursively - (string-append target "/node_modules/" modulename "/node_modules")) - (cond - ((string? binary-configuration) - (begin - (mkdir-p binaries) - (symlink (string-append target "/node_modules/" modulename "/" - binary-configuration) - (string-append binaries "/" modulename)))) - ((list? binary-configuration) - (for-each - (lambda (conf) - (match conf - ((key . value) - (begin - (mkdir-p (dirname (string-append binaries "/" key))) - (symlink (string-append target "/node_modules/" modulename "/" - value) - (string-append binaries "/" key)))))) - binary-configuration))) - (when dependencies - (mkdir-p - (string-append target "/node_modules/" modulename "/node_modules")) - (for-each - (lambda (dependency) - (let ((dependency (car dependency))) - (symlink - (string-append (assoc-ref inputs (string-append "node-" dependency)) - "/lib/node_modules/" dependency) - (string-append target "/node_modules/" modulename - "/node_modules/" dependency)))) - dependencies)) + "Install the node module to the output store item." + (let ((out (assoc-ref outputs "out")) + (npm (string-append (assoc-ref inputs "node") "/bin/npm"))) + (invoke npm "--prefix" out + "--global" + "--offline" + "--loglevel" "info" + "--production" + "install" "../package.tgz") #t)) - (define %standard-phases (modify-phases gnu:%standard-phases + (add-after 'unpack 'set-home set-home) + (add-before 'configure 'patch-dependencies patch-dependencies) (replace 'configure configure) (replace 'build build) - (replace 'install install) - (delete 'check) - (add-after 'install 'check check) - (delete 'strip))) + (replace 'check check) + (add-before 'install 'repack repack) + (replace 'install install))) (define* (node-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) -- cgit v1.2.3 From c39092c7b8cb6ba39efedae78a8356e2e4ad76ee Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:32 -0400 Subject: gnu: Add libuv-for-node * gnu/packages/libevent.scm (libuv-for-node): New variable. --- gnu/packages/libevent.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 7109d9a88d..0e683570d3 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -134,6 +134,22 @@ resolution, asynchronous file system operations, and threading primitives.") ;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'. (license (list expat cc-by4.0)))) +(define-public libuv-for-node + ;; When upgrading Node, also upgrade this. Get the version from + ;; https://github.com/nodejs/node/blob/master/deps/uv/include/uv/version.h + (package + (inherit libuv) + (name "libuv") + (version "1.40.0") + (source (origin + (method url-fetch) + (uri (string-append "https://dist.libuv.org/dist/v" version + "/libuv-v" version ".tar.gz")) + (sha256 + (base32 + "1551k3ab27vbg9517l9b4iqbramwxdkwgpf53knas05cbfwhvab1")))) + (properties '((hidden? . #t))))) + (define-public perl-anyevent (package (name "perl-anyevent") -- cgit v1.2.3 From 7728aa24c53e6eeafb03527457ad796976cb443a Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:33 -0400 Subject: gnu: node: Use license prefix. * gnu/packages/node.scm (node)[license]: Use prefix for license. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a0df3d2cad..82a2ca7ce0 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -26,7 +26,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages node) - #:use-module ((guix licenses) #:select (expat)) + #:use-module ((guix licenses) #:prefix license:) #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix packages) #:use-module (guix derivations) @@ -207,7 +207,7 @@ event-driven, non-blocking I/O model that makes it lightweight and efficient, perfect for data-intensive real-time applications that run across distributed devices.") (home-page "https://nodejs.org/") - (license expat) + (license license:expat) (properties '((max-silent-time . 7200) ;2h, needed on ARM (timeout . 21600))))) ;6h -- cgit v1.2.3 From 0c0c484613ed1b0dabf7a3292aedad9ec5eeb81d Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:34 -0400 Subject: gnu: Add node-bootstrap. * gnu/packages/node (node-bootstrap): Add hidden alias for node. --- gnu/packages/node.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 82a2ca7ce0..73d022d87f 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -211,6 +211,11 @@ devices.") (properties '((max-silent-time . 7200) ;2h, needed on ARM (timeout . 21600))))) ;6h +;; This should be the latest version of node that still builds without +;; depending on llhttp. +(define-public node-bootstrap + (hidden-package node)) + (define-public libnode (package/inherit node (name "libnode") -- cgit v1.2.3 From f540ee5ef845946228c0e2e4cffadccd36069922 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:35 -0400 Subject: gnu: Add node-semver-bootstrap. * gnu/packages/node.scm (node-semver-bootstrap): New variable. --- gnu/packages/node.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 73d022d87f..773cef3716 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) + #:use-module (gnu packages node-xyz) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -216,6 +217,35 @@ devices.") (define-public node-bootstrap (hidden-package node)) +;; Duplicate of node-semver +(define-public node-semver-bootstrap + (package + (name "node-semver") + (version "7.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/npm/node-semver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06biknqb05r9xsmcflm3ygh50pjvdk84x6r79w43kmck4fn3qn5p")))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/npm/node-semver") + (properties '((hidden? . #t))) + (synopsis "Parses semantic versions strings") + (description + "@code{node-semver} is a JavaScript implementation of the +@uref{https://semver.org/, SemVer.org} specification.") + (license license:isc))) + (define-public libnode (package/inherit node (name "libnode") -- cgit v1.2.3 From 972f2a2affe4837c75e7760cdaa5f913dfb061dc Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:36 -0400 Subject: gnu: Add node-ms-bootstrap. * gnu/packages/node.scm (node-ms-bootstrap): New variable. --- gnu/packages/node.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 773cef3716..1d17502df7 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -31,8 +31,10 @@ #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system node) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages base) @@ -246,6 +248,34 @@ devices.") @uref{https://semver.org/, SemVer.org} specification.") (license license:isc))) +(define-public node-ms-bootstrap + (package + (name "node-ms") + (version "2.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vercel/ms.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pjxzbi4j8pinlsc7yxvfrh0b47kb2dc4lfc2rjq4wx5bdwl33fj")))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/zeit/ms#readme") + (properties '((hidden? . #t))) + (synopsis "Tiny millisecond conversion utility") + (description "Use this package to easily convert various time +formats to milliseconds.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit v1.2.3 From 2cc5883b2149d09cad5d2fe04cf8f7c6e73a0ade Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:37 -0400 Subject: gnu: Add node-binary-search-bootstrap. * gnu/packages/node.scm (node-binary-search-bootstrap): New variable. --- gnu/packages/node.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 1d17502df7..21d6052c06 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -276,6 +276,33 @@ devices.") formats to milliseconds.") (license license:expat))) +(define-public node-binary-search-bootstrap + (package + (name "node-binary-search") + (version "1.3.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/darkskyapp/binary-search.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xr2msdc143cd3xwgq7n3rhzy7j8wrnaidxl0r6l6b6g3mpbpjig")))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/darkskyapp/binary-search#readme") + (properties '((hidden? . #t))) + (synopsis "Tiny binary search function with comparators") + (description "This package is a binary search function for Node.js.") + (license license:cc0))) + (define-public libnode (package/inherit node (name "libnode") -- cgit v1.2.3 From 2780cea3f8b90d7feb3e21b92b9637abdaa58a76 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:38 -0400 Subject: gnu: Add node-debug-bootstrap. * gnu/packages/node.scm (node-debug-bootstrap): New variable. --- gnu/packages/node.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 21d6052c06..6c4c02265d 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -303,6 +303,36 @@ formats to milliseconds.") (description "This package is a binary search function for Node.js.") (license license:cc0))) +(define-public node-debug-bootstrap + (package + (name "node-debug") + (version "4.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/visionmedia/debug.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08g52r1d4yqcsfdfb7n5if33d4cghaq75gx5n9hj6m6fd8jfp2pi")))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs `(("node-ms" ,node-ms-bootstrap))) + (home-page "https://github.com/visionmedia/debug#readme") + (properties '((hidden? . #t))) + (synopsis "Small debugging utility") + (description "This package contains a tiny JavaScript debugging +utility modelled after Node.js core's debugging technique. It works in +Node.js and web browsers.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit v1.2.3 From 6b930e524292026f81ca04688f83d0bcf195e0cf Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:39 -0400 Subject: gnu: Add node-llparse-builder-bootstrap. * gnu/packages/node.scm (node-llparse-builder-bootstrap): New variable. --- gnu/packages/node.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 6c4c02265d..570d4521ac 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -333,6 +333,71 @@ utility modelled after Node.js core's debugging technique. It works in Node.js and web browsers.") (license license:expat))) +(define-public node-llparse-builder-bootstrap + (package + (name "node-llparse-builder") + (version "1.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/indutny/llparse-builder.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r82iiwqsb73k2fxw7842rjjiixllxpyc6yl9cq4ma6ybkf6xmzm")) + (modules '((guix build utils))) + (snippet + '(begin + ;; FIXME: Unneeded runtime dependency. + ;; https://github.com/indutny/llparse-builder/pull/2 + (substitute* "package.json" + (("\"@types/debug.*,") "")) + ;; Fix imports for esbuild. + ;; https://github.com/evanw/esbuild/issues/477 + (substitute* '("src/node/invoke.ts" + "src/node/base.ts" + "src/node/consume.ts" + "src/node/match.ts" + "src/node/error.ts" + "src/node/pause.ts" + "src/edge.ts" + "src/utils.ts" + "src/loop-checker/index.ts" + "src/loop-checker/lattice.ts" + "src/code/field.ts" + "src/span-allocator.ts") + (("\\* as assert") "assert") + (("\\* as debugAPI") "debugAPI")) + #t)))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((esbuild (string-append (assoc-ref inputs "esbuild") + "/bin/esbuild"))) + (invoke esbuild + "--platform=node" + "--outfile=lib/builder.js" + "--bundle" + "src/builder.ts"))))))) + (inputs + `(("node-binary-search" ,node-binary-search-bootstrap) + ("node-debug" ,node-debug-bootstrap))) + (native-inputs + `(("esbuild" ,esbuild))) + (home-page "https://github.com/indutny/llparse-builder#readme") + (properties '((hidden? . #t))) + (synopsis "Graph builder for consumption by llparse") + (description "This package builds graphs for consumption by llparse.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit v1.2.3 From 82e7f7c029c36e9e1109ca7f1c191cceca27b278 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:40 -0400 Subject: gnu: Add node-llparse-frontend-bootstrap. * gnu/packages/node.scm (node-llparse-frontend-bootstrap): New variable. --- gnu/packages/node.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 570d4521ac..16c3decdd4 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -398,6 +398,62 @@ Node.js and web browsers.") (description "This package builds graphs for consumption by llparse.") (license license:expat))) +(define-public node-llparse-frontend-bootstrap + (package + (name "node-llparse-frontend") + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/indutny/llparse-frontend.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rm9g4ifyip30svm5cgnf0gx7d45jgh4mpf2hkd092xhngmfvicc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix imports for esbuild. + ;; https://github.com/evanw/esbuild/issues/477 + (substitute* '("src/frontend.ts" + "src/code/field-value.ts" + "src/container/index.ts" + "src/container/wrap.ts" + "src/node/sequence.ts" + "src/node/single.ts" + "src/node/table-lookup.ts" + "src/trie/index.ts") + (("\\* as assert") "assert") + (("\\* as debugAPI") "debugAPI")) + #t)))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((esbuild (string-append (assoc-ref inputs "esbuild") + "/bin/esbuild"))) + (invoke esbuild + "--platform=node" + "--outfile=lib/frontend.js" + "--bundle" + "src/frontend.ts"))))))) + (inputs + `(("node-debug" ,node-debug-bootstrap) + ("node-llparse-builder" ,node-llparse-builder-bootstrap))) + (native-inputs + `(("esbuild" ,esbuild))) + (home-page "https://github.com/indutny/llparse-frontend#readme") + (properties '((hidden? . #t))) + (synopsis "Frontend for the llparse compiler") + (description "This package is a frontend for the llparse compiler.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit v1.2.3 From 91b78f371e13fb0116055d5987f65641467044ad Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:41 -0400 Subject: gnu: Add node-llparse-bootstrap. * gnu/packages/node.scm (node-llparse-bootstrap): New variable. --- gnu/packages/node.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 16c3decdd4..5336012e43 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -454,6 +454,62 @@ Node.js and web browsers.") (description "This package is a frontend for the llparse compiler.") (license license:expat))) +(define-public node-llparse-bootstrap + (package + (name "node-llparse") + (version "7.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/indutny/llparse.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10da273iy2if88hp79cwms6c8qpsl1fkgzll6gmqyx5yxv5mkyp6")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix imports for esbuild. + ;; https://github.com/evanw/esbuild/issues/477 + (substitute* '("src/compiler/index.ts" + "src/implementation/c/node/base.ts" + "src/implementation/c/node/table-lookup.ts" + "src/implementation/c/compilation.ts" + "src/implementation/c/helpers/match-sequence.ts" + "src/implementation/c/code/mul-add.ts") + (("\\* as assert") "assert") + (("\\* as debugAPI") "debugAPI")) + #t)))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((esbuild (string-append (assoc-ref inputs "esbuild") + "/bin/esbuild"))) + (invoke esbuild + "--platform=node" + "--outfile=lib/api.js" + "--bundle" + "src/api.ts"))))))) + (inputs + `(("node-debug" ,node-debug-bootstrap) + ("node-llparse-frontend" ,node-llparse-frontend-bootstrap))) + (native-inputs + `(("esbuild" ,esbuild))) + (home-page "https://github.com/nodejs/llparse#readme") + (properties '((hidden? . #t))) + (synopsis "Compile incremental parsers to C code") + (description "This package offers an API for compiling an incremental +parser definition into a C output.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit v1.2.3 From 31c4d89073bdbe2b807ccf7b172df6db200f8d32 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:42 -0400 Subject: gnu: Add llhttp-bootstrap. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/node.scm (llhttp-bootstrap): New variable. --- gnu/local.mk | 1 + gnu/packages/node.scm | 70 +++++++++++++++ .../patches/llhttp-bootstrap-CVE-2020-8287.patch | 100 +++++++++++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1a72e896a8..1269bf0e47 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1368,6 +1368,7 @@ dist_patch_DATA = \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ + %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 5336012e43..26025c5d7c 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -510,6 +510,76 @@ Node.js and web browsers.") parser definition into a C output.") (license license:expat))) +(define-public llhttp-bootstrap + (package + (name "llhttp") + (version "2.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nodejs/llhttp.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pqj7kyyzr1zs4h9yzn5rdxnxspm3wqgsv00765dd42fszlmrmk8")) + (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix imports for esbuild. + ;; https://github.com/evanw/esbuild/issues/477 + (substitute* "src/llhttp/http.ts" + (("\\* as assert") "assert")) + (substitute* "Makefile" + (("npx ts-node bin/generate.ts") + "node bin/generate.js")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list (string-append "CLANG=" ,(cc-for-target)) + (string-append "DESTDIR=" (assoc-ref %outputs "out")) + "PREFIX=") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((esbuild (string-append (assoc-ref inputs "esbuild") + "/bin/esbuild"))) + (invoke esbuild + "--platform=node" + "--outfile=bin/generate.js" + "--bundle" "bin/generate.ts")))) + (add-before 'install 'create-install-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (dir) + (mkdir-p (string-append out dir))) + (list "/lib" "/include" "/src")) + #t))) + (add-after 'install 'install-src + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (src-dir (string-append out "/src"))) + (install-file "build/c/llhttp.c" src-dir) + (install-file "src/native/api.c" src-dir) + (install-file "src/native/http.c" src-dir) + #t)))))) + (native-inputs + `(("esbuild" ,esbuild) + ("node" ,node-bootstrap) + ("node-semver" ,node-semver-bootstrap) + ("node-llparse-bootstrap" ,node-llparse-bootstrap))) + (home-page "https://github.com/nodejs/llhttp") + (properties '((hidden? . #t))) + (synopsis "Parser for HTTP messages") + (description "This is a rewrite of +@url{https://github.com/nodejs/http-parser, http-parser} using +@url{https://github.com/nodejs/llparse, llparse} to generate the C +source files.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch new file mode 100644 index 0000000000..215c920e53 --- /dev/null +++ b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch @@ -0,0 +1,100 @@ +This patch comes from upstream. It corresponds to a patch applied to +the generated C source code for llhttp included in Node.js 14.16.0 +(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit +fixes CVE-2020-8287. With this patch, the output of our +llhttp-bootstrap package matches the files included in Node.js 14.16.0 +exactly. + +commit e9b36ea64709c35ca66094d5cf3787f444029601 +Author: Fedor Indutny +Date: Sat Oct 10 19:56:01 2020 -0700 + + http: unset `F_CHUNKED` on new `Transfer-Encoding` + + Duplicate `Transfer-Encoding` header should be a treated as a single, + but with original header values concatenated with a comma separator. In + the light of this, even if the past `Transfer-Encoding` ended with + `chunked`, we should be not let the `F_CHUNKED` to leak into the next + header, because mere presence of another header indicates that `chunked` + is not the last transfer-encoding token. + +diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts +index f4f1a6e..0a0c365 100644 +--- a/src/llhttp/http.ts ++++ b/src/llhttp/http.ts +@@ -460,11 +460,19 @@ export class HTTP { + .match([ ' ', '\t' ], n('header_value_discard_ws')) + .otherwise(checkContentLengthEmptiness); + ++ // Multiple `Transfer-Encoding` headers should be treated as one, but with ++ // values separate by a comma. ++ // ++ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 ++ const toTransferEncoding = this.unsetFlag( ++ FLAGS.CHUNKED, ++ 'header_value_te_chunked'); ++ + n('header_value_start') + .otherwise(this.load('header_state', { + [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), + [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( +- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), ++ FLAGS.TRANSFER_ENCODING, toTransferEncoding), + [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), + [HEADER_STATE.CONNECTION]: n('header_value_connection'), + }, 'header_value')); +@@ -847,6 +855,11 @@ export class HTTP { + return span.start(span.end(this.node(next))); + } + ++ private unsetFlag(flag: FLAGS, next: string | Node): Node { ++ const p = this.llparse; ++ return p.invoke(p.code.and('flags', ~flag), this.node(next)); ++ } ++ + private setFlag(flag: FLAGS, next: string | Node): Node { + const p = this.llparse; + return p.invoke(p.code.or('flags', flag), this.node(next)); +diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md +index a7d1681..b0891d6 100644 +--- a/test/request/transfer-encoding.md ++++ b/test/request/transfer-encoding.md +@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 + off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" + ``` + ++## POST with `chunked` and duplicate transfer-encoding ++ ++ ++```http ++POST /post_identity_body_world?q=search#hey HTTP/1.1 ++Accept: */* ++Transfer-Encoding: chunked ++Transfer-Encoding: deflate ++ ++World ++``` ++ ++```log ++off=0 message begin ++off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" ++off=44 url complete ++off=54 len=6 span[header_field]="Accept" ++off=61 header_field complete ++off=62 len=3 span[header_value]="*/*" ++off=67 header_value complete ++off=67 len=17 span[header_field]="Transfer-Encoding" ++off=85 header_field complete ++off=86 len=7 span[header_value]="chunked" ++off=95 header_value complete ++off=95 len=17 span[header_field]="Transfer-Encoding" ++off=113 header_field complete ++off=114 len=7 span[header_value]="deflate" ++off=123 header_value complete ++off=125 headers complete method=3 v=1/1 flags=200 content_length=0 ++off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" ++``` ++ + ## POST with `chunked` before other transfer-coding (lenient) + + TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- cgit v1.2.3 From f6c43c932a39bfa73a9750daadcd20f505ddc939 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:43 -0400 Subject: gnu: Add node-lts. * gnu/packages/node.scm (node-lts): New variable. * guix/build-system/node.scm (default-node): Use it. --- gnu/packages/node.scm | 135 +++++++++++++++++++++++++++++++++++++++++++++ guix/build-system/node.scm | 2 +- 2 files changed, 136 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 26025c5d7c..4e80dd4d4e 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -580,6 +580,141 @@ parser definition into a C output.") source files.") (license license:expat))) +(define-public node-lts + (package + (inherit node) + (version "14.16.0") + (source (origin + (method url-fetch) + (uri (string-append "https://nodejs.org/dist/v" version + "/node-v" version ".tar.xz")) + (sha256 + (base32 + "19nz2mhmn6ikahxqyna1dn25pb5v3z9vsz9zb2flb6zp2yk4hxjf")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove bundled software, where possible + (for-each delete-file-recursively + '("deps/cares" + "deps/icu-small" + "deps/nghttp2" + "deps/openssl" + "deps/zlib")) + (substitute* "Makefile" + ;; Remove references to bundled software. + (("deps/uv/uv.gyp") "") + (("deps/zlib/zlib.gyp") "")) + #t)))) + (arguments + (substitute-keyword-arguments (package-arguments node) + ((#:configure-flags configure-flags) + ''("--shared-cares" + "--shared-libuv" + "--shared-nghttp2" + "--shared-openssl" + "--shared-zlib" + "--shared-brotli" + "--with-intl=system-icu")) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + ;; Node's configure script is actually a python script, so we can't + ;; run it with bash. + (lambda* (#:key outputs (configure-flags '()) inputs + #:allow-other-keys) + (let* ((prefix (assoc-ref outputs "out")) + (flags (cons (string-append "--prefix=" prefix) + configure-flags))) + (format #t "build directory: ~s~%" (getcwd)) + (format #t "configure flags: ~s~%" flags) + ;; Node's configure script expects the CC environment variable to + ;; be set. + (setenv "CC" ,(cc-for-target)) + (apply invoke + (string-append (assoc-ref inputs "python") + "/bin/python3") + "configure" flags)))) + (replace 'patch-files + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix hardcoded /bin/sh references. + (substitute* '("lib/child_process.js" + "lib/internal/v8_prof_polyfill.js" + "test/parallel/test-child-process-spawnsync-shell.js" + "test/parallel/test-fs-write-sigxfsz.js" + "test/parallel/test-stdio-closed.js" + "test/sequential/test-child-process-emfile.js") + (("'/bin/sh'") + (string-append "'" (which "sh") "'"))) + + ;; Fix hardcoded /usr/bin/env references. + (substitute* '("test/parallel/test-child-process-default-options.js" + "test/parallel/test-child-process-env.js" + "test/parallel/test-child-process-exec-env.js") + (("'/usr/bin/env'") + (string-append "'" (which "env") "'"))) + + ;; FIXME: These tests fail in the build container, but they don't + ;; seem to be indicative of real problems in practice. + (for-each delete-file + '("test/parallel/test-cluster-master-error.js" + "test/parallel/test-cluster-master-kill.js")) + + ;; These require a DNS resolver. + (for-each delete-file + '("test/parallel/test-dns.js" + "test/parallel/test-dns-lookupService-promises.js")) + + ;; FIXME: This test fails randomly: + ;; https://github.com/nodejs/node/issues/31213 + (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js") + + ;; FIXME: These tests fail on armhf-linux: + ;; https://github.com/nodejs/node/issues/31970 + ,@(if (target-arm32?) + '((for-each delete-file + '("test/parallel/test-zlib.js" + "test/parallel/test-zlib-brotli.js" + "test/parallel/test-zlib-brotli-flush.js" + "test/parallel/test-zlib-brotli-from-brotli.js" + "test/parallel/test-zlib-brotli-from-string.js" + "test/parallel/test-zlib-convenience-methods.js" + "test/parallel/test-zlib-random-byte-pipes.js" + "test/parallel/test-zlib-write-after-flush.js"))) + '()) + + ;; These tests have an expiry date: they depend on the validity of + ;; TLS certificates that are bundled with the source. We want this + ;; package to be reproducible forever, so remove those. + ;; TODO: Regenerate certs instead. + (for-each delete-file + '("test/parallel/test-tls-passphrase.js" + "test/parallel/test-tls-server-verify.js")) + + ;; Replace pre-generated llhttp sources + (let ((llhttp (assoc-ref inputs "llhttp"))) + (copy-file (string-append llhttp "/src/llhttp.c") + "deps/llhttp/src/llhttp.c") + (copy-file (string-append llhttp "/src/api.c") + "deps/llhttp/src/api.c") + (copy-file (string-append llhttp "/src/http.c") + "deps/llhttp/src/http.c") + (copy-file (string-append llhttp "/include/llhttp.h") + "deps/llhttp/include/llhttp.h")) + #t)))))) + (inputs + `(("c-ares" ,c-ares) + ("icu4c" ,icu4c-67) + ("libuv" ,libuv-for-node) + ("llhttp" ,llhttp-bootstrap) + ("google-brotli" ,google-brotli) + ("nghttp2" ,nghttp2 "lib") + ("openssl" ,openssl) + ("zlib" ,zlib))) + (native-inputs + (alist-replace "python" (list python-3) + (package-native-inputs node))))) + (define-public libnode (package/inherit node (name "libnode") diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 4991ed53a5..98f63f87ef 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -39,7 +39,7 @@ "Return the default Node package." ;; Lazily resolve the binding to avoid a circular dependency. (let ((node (resolve-interface '(gnu packages node)))) - (module-ref node 'node))) + (module-ref node 'node-lts))) (define* (lower name #:key source inputs native-inputs outputs system target -- cgit v1.2.3 From 68ed5de405a3570aff099ff1fd5fd238b5576fcd Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 2 Apr 2021 18:42:05 +0200 Subject: gnu: python-pikepdf: Update to 2.10.0 [fixes CVE-2021-29421]. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.10.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f2b1551df5..2a876670ff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5856,13 +5856,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.9.1") + (version "2.10.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1n53fhdgnq9yxvm2m039vl8l2kg3fkln3pm0wv4rzj0gvpq9rhcr")))) + (base32 "09wfj1hjvj3r9gv7ywrqd7h3d0bz64bvils8sm3ghj90jhalb03s")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit v1.2.3 From c18c8d3e9c2d3377f6109096dbf04b8668f324de Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 2 Apr 2021 19:22:33 +0200 Subject: gnu: wpa-supplicant-minimal: Fix CVE-2021-30004. * gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/admin.scm (wpa-supplicant-minimal): Apply patch. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 3 +- .../patches/wpa-supplicant-CVE-2021-30004.patch | 115 +++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1269bf0e47..1a767a6c89 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1803,6 +1803,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-CVE-2021-27803.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2021-30004.patch \ %D%/packages/patches/x265-arm-flags.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d5b4d34323..2b12b5d5e4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1658,7 +1658,8 @@ features of sudo with a fraction of the codebase.") (string-append "#" line))) #t)) (patches - (search-patches "wpa-supplicant-CVE-2021-27803.patch")))) + (search-patches "wpa-supplicant-CVE-2021-27803.patch" + "wpa-supplicant-CVE-2021-30004.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch b/gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch new file mode 100644 index 0000000000..8c8ba93355 --- /dev/null +++ b/gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch @@ -0,0 +1,115 @@ +From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sat, 13 Mar 2021 18:19:31 +0200 +Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters + +The supported hash algorithms do not use AlgorithmIdentifier parameters. +However, there are implementations that include NULL parameters in +addition to ones that omit the parameters. Previous implementation did +not check the parameters value at all which supported both these cases, +but did not reject any other unexpected information. + +Use strict validation of digest algorithm parameters and reject any +unexpected value when validating a signature. This is needed to prevent +potential forging attacks. + +Signed-off-by: Jouni Malinen +--- + src/tls/pkcs1.c | 21 +++++++++++++++++++++ + src/tls/x509v3.c | 20 ++++++++++++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c +index bbdb0d7..5761dfe 100644 +--- a/src/tls/pkcs1.c ++++ b/src/tls/pkcs1.c +@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", ++ hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "PKCS #1: Unexpected digest algorithm parameters"); ++ os_free(decrypted); ++ return -1; ++ } + + if (!asn1_oid_equal(&oid, hash_alg)) { + char txt[100], txt2[100]; +diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c +index a8944dd..df337ec 100644 +--- a/src/tls/x509v3.c ++++ b/src/tls/x509v3.c +@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "X509: Unexpected digest algorithm parameters"); ++ os_free(data); ++ return -1; ++ } + + if (x509_sha1_oid(&oid)) { + if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { +-- +cgit v0.12 + -- cgit v1.2.3 From 55fca8eee28756758ac0fd3358cd3768658f1bd7 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 2 Apr 2021 19:24:11 +0200 Subject: gnu: hostapd: Fix CVE-2021-30004. * gnu/packages/admin.scm (hostapd)[patches]: Apply 'wpa-supplicant-CVE-2021-30004.patch'. --- gnu/packages/admin.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b12b5d5e4..2963f3e049 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1825,7 +1825,8 @@ command.") (base32 "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8")) (patches - (search-patches "wpa-supplicant-CVE-2021-27803.patch")))) + (search-patches "wpa-supplicant-CVE-2021-27803.patch" + "wpa-supplicant-CVE-2021-30004.patch")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 591c930337556f1a242fc8f7a891a4409d18da84 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 2 Apr 2021 12:38:29 -0400 Subject: gnu: jami: Add debug outputs. * gnu/packages/jami.scm (libring, libringclient, jami-gnome, jami-qt): Add a "debug" output. --- gnu/packages/jami.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 0ba293ca93..42b15cee9b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -425,6 +425,7 @@ of Jami." (version %jami-version) (source %jami-sources) (build-system gnu-build-system) + (outputs '("out" "debug")) (inputs `(("alsa-lib" ,alsa-lib) ("asio" ,asio) @@ -480,6 +481,7 @@ protocols, as well as decentralized calling using P2P-DHT.") (version %jami-version) (source %jami-sources) (build-system cmake-build-system) + (outputs '("out" "debug")) (inputs `(("libring" ,libring) ("network-manager" ,network-manager))) @@ -522,6 +524,7 @@ decentralized calling using P2P-DHT.") (version %jami-version) (source %jami-sources) (build-system cmake-build-system) + (outputs '("out" "debug")) (inputs `(("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) @@ -579,6 +582,7 @@ decentralized calling using P2P-DHT.") (base32 "1rf3lpk8c4qc12pi6pn4rdp7i8b83xv64yqr0q47rzv9s518qyjp")))) (build-system qt-build-system) + (outputs '("out" "debug")) (arguments `(#:tests? #f ;no test suite #:phases -- cgit v1.2.3 From f4dc8ac6dfa036d98aa0990ae22268a9650899d0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 2 Apr 2021 21:33:02 +0200 Subject: gnu: curl: Update to 7.76.0 [security fixes]. Fixes CVE-2021-22876 and CVE-2021-22890. * gnu/packages/curl.scm (curl/fixed): New variable. (curl)[replacement]: New field. * gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/curl.scm | 15 +++++ .../patches/curl-7.76-use-ssl-cert-env.patch | 64 ++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1a767a6c89..0d472072ae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -920,6 +920,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/curl-use-ssl-cert-env.patch \ + %D%/packages/patches/curl-7.76-use-ssl-cert-env.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 730676875c..94dc51cfc5 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -62,6 +62,7 @@ (base32 "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) + (replacement curl/fixed) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -151,6 +152,20 @@ tunneling, and so on.") (name "curl-minimal") (inputs (alist-delete "openldap" (package-inputs curl)))))) +(define-public curl/fixed + (package + (inherit curl) + (version "7.76.0") + (source + (origin + (inherit (package-source curl)) + (uri (string-append "https://curl.haxx.se/download/curl-" + version ".tar.xz")) + (patches (search-patches "curl-7.76-use-ssl-cert-env.patch")) + (sha256 + (base32 + "1j2g04m6als6hmqzvddv84c31m0x90bfgyz3bjrwdkarbkby40k3")))))) + (define-public kurly (package (name "kurly") diff --git a/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch b/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch new file mode 100644 index 0000000000..24be6e31d9 --- /dev/null +++ b/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch @@ -0,0 +1,64 @@ +Make libcurl respect the SSL_CERT_{DIR,FILE} variables by default. The variables +are fetched during initialization to preserve thread-safety (curl_global_init(3) +must be called when no other threads exist). + +This fixes network functionality in rust:cargo, and probably removes the need +for other future workarounds. +=================================================================== +--- curl-7.66.0.orig/lib/easy.c 2020-01-02 15:43:11.883921171 +0100 ++++ curl-7.66.0/lib/easy.c 2020-01-02 16:18:54.691882797 +0100 +@@ -134,6 +134,9 @@ + # pragma warning(default:4232) /* MSVC extension, dllimport identity */ + #endif + ++char * Curl_ssl_cert_dir = NULL; ++char * Curl_ssl_cert_file = NULL; ++ + /** + * curl_global_init() globally initializes curl given a bitwise set of the + * different features of what to initialize. +@@ -155,6 +158,9 @@ + #endif + } + ++ Curl_ssl_cert_dir = curl_getenv("SSL_CERT_DIR"); ++ Curl_ssl_cert_file = curl_getenv("SSL_CERT_FILE"); ++ + if(!Curl_ssl_init()) { + DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n")); + return CURLE_FAILED_INIT; +@@ -260,6 +266,9 @@ + Curl_ssl_cleanup(); + Curl_resolver_global_cleanup(); + ++ free(Curl_ssl_cert_dir); ++ free(Curl_ssl_cert_file); ++ + #ifdef WIN32 + Curl_win32_cleanup(init_flags); + #endif +diff -ur curl-7.66.0.orig/lib/url.c curl-7.66.0/lib/url.c +--- curl-7.66.0.orig/lib/url.c 2020-01-02 15:43:11.883921171 +0100 ++++ curl-7.66.0/lib/url.c 2020-01-02 16:21:11.563880346 +0100 +@@ -524,6 +524,21 @@ + if(result) + return result; + #endif ++ extern char * Curl_ssl_cert_dir; ++ extern char * Curl_ssl_cert_file; ++ if(Curl_ssl_cert_dir) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], Curl_ssl_cert_dir)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir)) ++ return result; ++ } ++ ++ if(Curl_ssl_cert_file) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], Curl_ssl_cert_file)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file)) ++ return result; ++ } + } + + set->wildcard_enabled = FALSE; -- cgit v1.2.3 From 48f7aa1cd104096daccc8a4859021f1e1177f525 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 18 Mar 2021 00:46:45 -0700 Subject: gnu: vtk: Update to 9.0.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image-processing.scm (vtk): Update to 9.0.1. [source](snippet): Remove bundled "ogg" directory as well. [arguments]: Adjust #:configure-flags. Add #:phases. [inputs]: Add LIBOGG. * gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch: Update. Co-authored-by: Ludovic Courtès --- gnu/packages/image-processing.scm | 65 +++++++++++++--------- .../vtk-fix-freetypetools-build-failure.patch | 14 ++--- 2 files changed, 45 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 7205336d53..f944a61186 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2021 Oleh Malyi ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -246,7 +247,7 @@ many popular formats.") (define-public vtk (package (name "vtk") - (version "8.2.0") + (version "9.0.1") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -254,7 +255,7 @@ many popular formats.") "/VTK-" version ".tar.gz")) (sha256 (base32 - "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl")) + "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v")) (patches (search-patches "vtk-fix-freetypetools-build-failure.patch")) (modules '((guix build utils))) @@ -264,35 +265,46 @@ many popular formats.") (lambda (dir) (delete-file-recursively (string-append "ThirdParty/" dir "/vtk" dir))) - ;; ogg, pugixml depended upon unconditionally + ;; pugixml depended upon unconditionally '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4" - "netcdf" "png" "sqlite" "theora" "tiff" "zlib")) + "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib")) #t)))) (build-system cmake-build-system) (arguments '(#:build-type "Release" ;Build without '-g' to save space. #:configure-flags '(;"-DBUILD_TESTING:BOOL=TRUE" - ;"-DVTK_MODULE_USE_EXTERNAL_vtkogg:BOOL=TRUE" ; not honored - "-DVTK_USE_SYSTEM_DOUBLECONVERSION:BOOL=TRUE" - "-DVTK_USE_SYSTEM_EIGEN:BOOL=TRUE" - "-DVTK_USE_SYSTEM_EXPAT:BOOL=TRUE" - "-DVTK_USE_SYSTEM_FREETYPE:BOOL=TRUE" - "-DVTK_USE_SYSTEM_GL2PS:BOOL=TRUE" - "-DVTK_USE_SYSTEM_GLEW:BOOL=TRUE" - "-DVTK_USE_SYSTEM_HDF5:BOOL=TRUE" - "-DVTK_USE_SYSTEM_JPEG:BOOL=TRUE" - "-DVTK_USE_SYSTEM_JSONCPP:BOOL=TRUE" - "-DVTK_USE_SYSTEM_LIBPROJ:BOOL=TRUE" - "-DVTK_USE_SYSTEM_LIBXML2:BOOL=TRUE" - "-DVTK_USE_SYSTEM_LZ4:BOOL=TRUE" - "-DVTK_USE_SYSTEM_NETCDF:BOOL=TRUE" - "-DVTK_USE_SYSTEM_PNG:BOOL=TRUE" - ;"-DVTK_USE_SYSTEM_PUGIXML:BOOL=TRUE" ; breaks IO/CityGML - "-DVTK_USE_SYSTEM_SQLITE:BOOL=TRUE" - "-DVTK_USE_SYSTEM_THEORA:BOOL=TRUE" - "-DVTK_USE_SYSTEM_TIFF:BOOL=TRUE" - "-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE") + ; ; not honored + "-DVTK_USE_EXTERNAL=OFF" ;; default + "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON" + ;"-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON" ; breaks IO/CityGML + "-DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON" + ) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "Common/Core/vtkFloatingPointExceptions.cxx" + (("") "")) + (substitute* "Common/Core/CMakeLists.txt" + (("fenv.h") "cfenv"))))) #:tests? #f)) ;XXX: test data not included (inputs `(("double-conversion" ,double-conversion) @@ -305,7 +317,6 @@ many popular formats.") ("hdf5" ,hdf5) ("jpeg" ,libjpeg-turbo) ("jsoncpp" ,jsoncpp) - ;("libogg" ,libogg) ("libtheora" ,libtheora) ("libX11" ,libx11) ("libxml2" ,libxml2) @@ -320,6 +331,10 @@ many popular formats.") ("tiff" ,libtiff) ("xorgproto" ,xorgproto) ("zlib" ,zlib))) + (propagated-inputs + ;; VTK's 'VTK-vtk-module-find-packages.cmake' calls + ;; 'find_package(THEORA)', which in turns looks for libogg. + `(("libogg" ,libogg))) (home-page "https://vtk.org/") (synopsis "Libraries for 3D computer graphics") (description diff --git a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch index 6988e65872..23f651b5eb 100644 --- a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch +++ b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch @@ -17,20 +17,16 @@ diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFre index c54289dc60..03b899c4da 100644 --- a/Rendering/FreeType/vtkFreeTypeTools.cxx +++ b/Rendering/FreeType/vtkFreeTypeTools.cxx -@@ -387,11 +387,8 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() +@@ -378,8 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() } - + //---------------------------------------------------------------------------- -FT_CALLBACK_DEF(FT_Error) --vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, -- FT_Library lib, -- FT_Pointer request_data, -- FT_Face* face) +-vtkFreeTypeToolsFaceRequester( +static FT_Error vtkFreeTypeToolsFaceRequester( -+ FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) { #if VTK_FTFC_DEBUG_CD - printf("vtkFreeTypeToolsFaceRequester()\n"); --- +-- 2.30.1 -- cgit v1.2.3 From e025de68c353e8cfac7172bb60db03eb8586415a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 2 Apr 2021 09:00:36 +0200 Subject: gnu: vtk: Add 'release-monitoring-url' property. * gnu/packages/image-processing.scm (vtk)[properties]: New field. --- gnu/packages/image-processing.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index f944a61186..2795eaf130 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017, 2019 Ricardo Wurmus -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2021 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice @@ -270,6 +270,7 @@ many popular formats.") "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib")) #t)))) + (properties `((release-monitoring-url . "https://vtk.org/download/"))) (build-system cmake-build-system) (arguments '(#:build-type "Release" ;Build without '-g' to save space. -- cgit v1.2.3 From 6f97e43687893b4a50ce1da1d03a7ec6ffc6f449 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 2 Apr 2021 22:17:16 +0200 Subject: gnu: ktouch: Remove unnecessary build phase. * gnu/packages/education.scm (ktouch)[arguments]: Remove. --- gnu/packages/education.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index a1f1b0dfba..589c32838c 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -689,17 +689,6 @@ language and very flexible regarding to new or unknown keyboard layouts.") (sha256 (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib")))) (build-system qt-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-makefiles - (lambda* (#:key inputs #:allow-other-keys) - (let ((qtdec (assoc-ref inputs "qtdeclarative"))) - (substitute* '("src/CMakeFiles/ktouch_autogen.dir/build.make" - "src/CMakeFiles/ktouch.dir/build.make") - (("/gnu/store/.*qmlcachegen") - (string-append qtdec "/bin/qmlcachegen")))) - #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("kdoctools" ,kdoctools) -- cgit v1.2.3 From 6f6b0ea0d4761dd6c468d209a10f4420fcadd886 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Apr 2021 23:13:46 +0200 Subject: gnu: lldpd: Update to 1.0.9. * gnu/packages/networking.scm (lldpd): Update to 1.0.9. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f0e95c6ed0..7cbf1de9bf 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3837,14 +3837,14 @@ thousands of connections is clearly realistic with today's hardware.") (define-public lldpd (package (name "lldpd") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" version ".tar.gz")) (sha256 - (base32 "1vrxr8lgkw7q6ixaaili6ac7i0j0326194s498n2dxihdvkh1llq")) + (base32 "1xa9953hl2c94zi4ngaxyi2yw3dax1ab16118wriwawm4lqynr3b")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 8d89d3c9bf7cacd9c79b4aacf348044d4fe7800b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Apr 2021 23:14:13 +0200 Subject: gnu: pidgin: Update to 2.14.2. * gnu/packages/messaging.scm (pidgin): Update to 2.14.2. [source]: Remove pidgin-vv-gst.patch. * gnu/packages/patches/pidgin-vv-gst.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/messaging.scm | 8 ++---- gnu/packages/patches/pidgin-vv-gst.patch | 48 -------------------------------- 3 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 gnu/packages/patches/pidgin-vv-gst.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0d472072ae..26976f73cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1525,7 +1525,6 @@ dist_patch_DATA = \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ - %D%/packages/patches/pidgin-vv-gst.patch \ %D%/packages/patches/pinball-const-fix.patch \ %D%/packages/patches/pinball-cstddef.patch \ %D%/packages/patches/pinball-missing-separators.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 388e7f2ead..e8b67c03bc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -788,7 +788,7 @@ authentication.") (define-public pidgin (package (name "pidgin") - (version "2.14.1") + (version "2.14.2") (source (origin (method url-fetch) @@ -796,11 +796,9 @@ authentication.") (string-append "mirror://sourceforge/pidgin/Pidgin/" version "/pidgin-" version ".tar.gz")) (sha256 - (base32 "1c4dzxg9c3d9zfqqa7jwijj9rv9fm6w95igmpljwy88lxq7v5w11")) + (base32 "19r297ynxizdj357ihmy0sgpgfikdzblkszlwlqnsr3lvbjhhsg1")) (patches - (search-patches - "pidgin-add-search-path.patch" - "pidgin-vv-gst.patch")) + (search-patches "pidgin-add-search-path.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/pidgin-vv-gst.patch b/gnu/packages/patches/pidgin-vv-gst.patch deleted file mode 100644 index e0553dd119..0000000000 --- a/gnu/packages/patches/pidgin-vv-gst.patch +++ /dev/null @@ -1,48 +0,0 @@ -Name: Gary Kramlich -Date: 2020-07-12 -Source: https://keep.imfreedom.org/pidgin/pidgin/rev/39ac50435cfb - -diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c ---- a/libpurple/mediamanager.c -+++ b/libpurple/mediamanager.c -@@ -2231,6 +2231,7 @@ - purple_media_manager_unregister_gst_device(PurpleMediaManager *manager, - GstDevice *device) - { -+#ifdef USE_VV - GList *i; - gchar *name; - gchar *device_class; -@@ -2277,6 +2278,7 @@ - - g_free(name); - g_free(device_class); -+#endif /* USE_VV */ - } - - static gboolean -@@ -2304,7 +2306,7 @@ - static void - purple_media_manager_init_device_monitor(PurpleMediaManager *manager) - { --#if GST_CHECK_VERSION(1, 4, 0) -+#if GST_CHECK_VERSION(1, 4, 0) && defined(USE_VV) - GstBus *bus; - GList *i; - -@@ -2334,6 +2336,7 @@ - PurpleMediaElementType type) - { - GList *result = NULL; -+#ifdef USE_VV - GList *i; - - for (i = manager->priv->elements; i; i = i->next) { -@@ -2347,6 +2350,7 @@ - result = g_list_prepend(result, info); - } - } -+#endif /* USE_VV */ - - return result; - } -- cgit v1.2.3 From 7bf82f5ede57c9c5344ddb1d4dcfe694eb306bef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 22 Feb 2021 22:58:31 -0500 Subject: gnu: containerd: Update to 1.4.4. * gnu/packages/docker.scm (containerd): Update to 1.4.4. Delete trailing #t. [arguments]: Set a MAKE-FLAGS binding. [phases]{patch-paths}: Patch the reference to 'unpigz'. {build, install}: Use the MAKE-FLAGS variable. [inputs]: Add pigz. * gnu/packages/patches/containerd-test-with-go1.13.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Un-register it. --- gnu/local.mk | 1 - gnu/packages/docker.scm | 86 ++++++++++++---------- .../patches/containerd-test-with-go1.13.patch | 21 ------ 3 files changed, 46 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/containerd-test-with-go1.13.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 26976f73cd..d5fd714669 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -912,7 +912,6 @@ dist_patch_DATA = \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ - %D%/packages/patches/containerd-test-with-go1.13.patch \ %D%/packages/patches/coreutils-ls.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 5c6292c122..6083ed780b 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Jesse Dowell @@ -177,7 +177,7 @@ Python without keeping their credentials in a Docker configuration file.") (define-public containerd (package (name "containerd") - (version "1.3.10") + (version "1.4.4") (source (origin (method git-fetch) @@ -186,49 +186,55 @@ Python without keeping their credentials in a Docker configuration file.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10fz7359aydbz0yb01qkrsq2diypayfal618lvvb1x0gvgkp526i")))) + (base32 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/containerd/containerd" - #:phases - (modify-phases %standard-phases - (add-after 'chdir 'patch-paths - (lambda* (#:key inputs import-path outputs #:allow-other-keys) - ;; TODO: Patch "socat", "unpigz". - (with-directory-excursion (string-append "src/" import-path) - (substitute* "./runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=.*") - (string-append "defaultRuntime = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=.*") - (string-append "defaultShim = \"" - (assoc-ref outputs "out") - "/bin/containerd-shim\"\n"))) - (substitute* "./vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand[ \t]*=.*") - (string-append "DefaultCommand = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/continuity/testutil/loopback/loopback_linux.go" - (("exec\\.Command\\(\"losetup\"") ; ) - (string-append "exec.Command(\"" - (assoc-ref inputs "util-linux") - "/sbin/losetup\""))) ;) - #t))) - (replace 'build - (lambda* (#:key import-path (make-flags '()) #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (apply invoke "make" make-flags)))) - (replace 'install - (lambda* (#:key import-path outputs (make-flags '()) #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=" out) "install" - make-flags)))))))) + (let ((make-flags (list (string-append "VERSION=" version) + "REVISION=0"))) + `(#:import-path "github.com/containerd/containerd" + #:phases + (modify-phases %standard-phases + (add-after 'chdir 'patch-paths + (lambda* (#:key inputs import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* "runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=.*") + (string-append "defaultRuntime = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("defaultShim[ \t]*=.*") + (string-append "defaultShim = \"" + (assoc-ref outputs "out") + "/bin/containerd-shim\"\n"))) + (substitute* "vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand[ \t]*=.*") + (string-append "DefaultCommand = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) + (substitute* "vendor/github.com/containerd/continuity/testutil\ +/loopback/loopback_linux.go" + (("exec\\.Command\\(\"losetup\"") + (string-append "exec.Command(\"" + (assoc-ref inputs "util-linux") + "/sbin/losetup\""))) + (substitute* "archive/compression/compression.go" + (("exec\\.LookPath\\(\"unpigz\"\\)") + (string-append "\"" (assoc-ref inputs "pigz") + "/bin/unpigz\", error(nil)")))))) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (apply invoke "make" ',make-flags)))) + (replace 'install + (lambda* (#:key import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (let* ((out (assoc-ref outputs "out"))) + (apply invoke "make" (string-append "DESTDIR=" out) "install" + ',make-flags))))))))) (inputs `(("btrfs-progs" ,btrfs-progs) ("libseccomp" ,libseccomp) + ("pigz" ,pigz) ("runc" ,runc) ("util-linux" ,util-linux))) (native-inputs diff --git a/gnu/packages/patches/containerd-test-with-go1.13.patch b/gnu/packages/patches/containerd-test-with-go1.13.patch deleted file mode 100644 index 964adee9e6..0000000000 --- a/gnu/packages/patches/containerd-test-with-go1.13.patch +++ /dev/null @@ -1,21 +0,0 @@ -Compatibility fix for go 1.13, flag.Parse() shouldn't be called during -package initialization. -https://golang.org/doc/go1.13#testing ---- a/client_test.go 2020-02-12 14:50:28.991245371 -0500 -+++ b/client_test.go 2020-02-12 15:12:37.383523980 -0500 -@@ -49,7 +49,6 @@ - flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests") - flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests") - flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests") -- flag.Parse() - } - - func testContext() (context.Context, context.CancelFunc) { -@@ -59,6 +58,7 @@ - } - - func TestMain(m *testing.M) { -+ flag.Parse() - if testing.Short() { - os.Exit(m.Run()) - } -- cgit v1.2.3 From 86c39376cc00ed19758a2861c11f85fa5b94cda4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 23 Feb 2021 00:03:01 -0500 Subject: gnu: runc: Update to 1.0.0-rc93. * gnu/packages/virtualization.scm (runc): Update to 1.0.0-rc93. [source]: Remove the patches field. [phases]{unpack}: Remove override. {build}: Add the man target. {check}: Make conditional based on TESTS?. {install}: Add the install-man target. [native-inputs]: Add go-github-com-go-md2man. [home-page]: Update. * gnu/packages/patches/runc-CVE-2019-5736.patch: Delete file. * gnu/local.mk: Un-register it. --- gnu/local.mk | 1 - gnu/packages/patches/runc-CVE-2019-5736.patch | 343 -------------------------- gnu/packages/virtualization.scm | 31 +-- 3 files changed, 11 insertions(+), 364 deletions(-) delete mode 100644 gnu/packages/patches/runc-CVE-2019-5736.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d5fd714669..a1a08fa911 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1645,7 +1645,6 @@ dist_patch_DATA = \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ %D%/packages/patches/rnp-unbundle-googletest.patch \ %D%/packages/patches/ruby-sanitize-system-libxml.patch \ - %D%/packages/patches/runc-CVE-2019-5736.patch \ %D%/packages/patches/rust-1.19-mrustc.patch \ %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \ %D%/packages/patches/rust-1.45-linker-locale.patch \ diff --git a/gnu/packages/patches/runc-CVE-2019-5736.patch b/gnu/packages/patches/runc-CVE-2019-5736.patch deleted file mode 100644 index f629fcbfb4..0000000000 --- a/gnu/packages/patches/runc-CVE-2019-5736.patch +++ /dev/null @@ -1,343 +0,0 @@ -Fix CVE-2019-5736: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736 -https://seclists.org/oss-sec/2019/q1/119 - -Patch copied from upstream source repository: - -https://github.com/opencontainers/runc/commit/0a8e4117e7f715d5fbeef398405813ce8e88558b - -From 0a8e4117e7f715d5fbeef398405813ce8e88558b Mon Sep 17 00:00:00 2001 -From: Aleksa Sarai -Date: Wed, 9 Jan 2019 13:40:01 +1100 -Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary - to container - -There are quite a few circumstances where /proc/self/exe pointing to a -pretty important container binary is a _bad_ thing, so to avoid this we -have to make a copy (preferably doing self-clean-up and not being -writeable). - -We require memfd_create(2) -- though there is an O_TMPFILE fallback -- -but we can always extend this to use a scratch MNT_DETACH overlayfs or -tmpfs. The main downside to this approach is no page-cache sharing for -the runc binary (which overlayfs would give us) but this is far less -complicated. - -This is only done during nsenter so that it happens transparently to the -Go code, and any libcontainer users benefit from it. This also makes -ExtraFiles and --preserve-fds handling trivial (because we don't need to -worry about it). - -Fixes: CVE-2019-5736 -Co-developed-by: Christian Brauner -Signed-off-by: Aleksa Sarai ---- - libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++ - libcontainer/nsenter/nsexec.c | 11 ++ - 2 files changed, 279 insertions(+) - create mode 100644 libcontainer/nsenter/cloned_binary.c - -diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c -new file mode 100644 -index 000000000..c8a42c23f ---- /dev/null -+++ b/libcontainer/nsenter/cloned_binary.c -@@ -0,0 +1,268 @@ -+/* -+ * Copyright (C) 2019 Aleksa Sarai -+ * Copyright (C) 2019 SUSE LLC -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#define _GNU_SOURCE -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* Use our own wrapper for memfd_create. */ -+#if !defined(SYS_memfd_create) && defined(__NR_memfd_create) -+# define SYS_memfd_create __NR_memfd_create -+#endif -+#ifdef SYS_memfd_create -+# define HAVE_MEMFD_CREATE -+/* memfd_create(2) flags -- copied from . */ -+# ifndef MFD_CLOEXEC -+# define MFD_CLOEXEC 0x0001U -+# define MFD_ALLOW_SEALING 0x0002U -+# endif -+int memfd_create(const char *name, unsigned int flags) -+{ -+ return syscall(SYS_memfd_create, name, flags); -+} -+#endif -+ -+/* This comes directly from . */ -+#ifndef F_LINUX_SPECIFIC_BASE -+# define F_LINUX_SPECIFIC_BASE 1024 -+#endif -+#ifndef F_ADD_SEALS -+# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) -+# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) -+#endif -+#ifndef F_SEAL_SEAL -+# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ -+# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ -+# define F_SEAL_GROW 0x0004 /* prevent file from growing */ -+# define F_SEAL_WRITE 0x0008 /* prevent writes */ -+#endif -+ -+#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */ -+#ifdef HAVE_MEMFD_CREATE -+# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe" -+# define RUNC_MEMFD_SEALS \ -+ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) -+#endif -+ -+static void *must_realloc(void *ptr, size_t size) -+{ -+ void *old = ptr; -+ do { -+ ptr = realloc(old, size); -+ } while(!ptr); -+ return ptr; -+} -+ -+/* -+ * Verify whether we are currently in a self-cloned program (namely, is -+ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather -+ * for shmem files), and we want to be sure it's actually sealed. -+ */ -+static int is_self_cloned(void) -+{ -+ int fd, ret, is_cloned = 0; -+ -+ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC); -+ if (fd < 0) -+ return -ENOTRECOVERABLE; -+ -+#ifdef HAVE_MEMFD_CREATE -+ ret = fcntl(fd, F_GET_SEALS); -+ is_cloned = (ret == RUNC_MEMFD_SEALS); -+#else -+ struct stat statbuf = {0}; -+ ret = fstat(fd, &statbuf); -+ if (ret >= 0) -+ is_cloned = (statbuf.st_nlink == 0); -+#endif -+ close(fd); -+ return is_cloned; -+} -+ -+/* -+ * Basic wrapper around mmap(2) that gives you the file length so you can -+ * safely treat it as an ordinary buffer. Only gives you read access. -+ */ -+static char *read_file(char *path, size_t *length) -+{ -+ int fd; -+ char buf[4096], *copy = NULL; -+ -+ if (!length) -+ return NULL; -+ -+ fd = open(path, O_RDONLY | O_CLOEXEC); -+ if (fd < 0) -+ return NULL; -+ -+ *length = 0; -+ for (;;) { -+ int n; -+ -+ n = read(fd, buf, sizeof(buf)); -+ if (n < 0) -+ goto error; -+ if (!n) -+ break; -+ -+ copy = must_realloc(copy, (*length + n) * sizeof(*copy)); -+ memcpy(copy + *length, buf, n); -+ *length += n; -+ } -+ close(fd); -+ return copy; -+ -+error: -+ close(fd); -+ free(copy); -+ return NULL; -+} -+ -+/* -+ * A poor-man's version of "xargs -0". Basically parses a given block of -+ * NUL-delimited data, within the given length and adds a pointer to each entry -+ * to the array of pointers. -+ */ -+static int parse_xargs(char *data, int data_length, char ***output) -+{ -+ int num = 0; -+ char *cur = data; -+ -+ if (!data || *output != NULL) -+ return -1; -+ -+ while (cur < data + data_length) { -+ num++; -+ *output = must_realloc(*output, (num + 1) * sizeof(**output)); -+ (*output)[num - 1] = cur; -+ cur += strlen(cur) + 1; -+ } -+ (*output)[num] = NULL; -+ return num; -+} -+ -+/* -+ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. -+ * This is necessary because we are running in a context where we don't have a -+ * main() that we can just get the arguments from. -+ */ -+static int fetchve(char ***argv, char ***envp) -+{ -+ char *cmdline = NULL, *environ = NULL; -+ size_t cmdline_size, environ_size; -+ -+ cmdline = read_file("/proc/self/cmdline", &cmdline_size); -+ if (!cmdline) -+ goto error; -+ environ = read_file("/proc/self/environ", &environ_size); -+ if (!environ) -+ goto error; -+ -+ if (parse_xargs(cmdline, cmdline_size, argv) <= 0) -+ goto error; -+ if (parse_xargs(environ, environ_size, envp) <= 0) -+ goto error; -+ -+ return 0; -+ -+error: -+ free(environ); -+ free(cmdline); -+ return -EINVAL; -+} -+ -+static int clone_binary(void) -+{ -+ int binfd, memfd; -+ ssize_t sent = 0; -+ -+#ifdef HAVE_MEMFD_CREATE -+ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING); -+#else -+ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711); -+#endif -+ if (memfd < 0) -+ return -ENOTRECOVERABLE; -+ -+ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC); -+ if (binfd < 0) -+ goto error; -+ -+ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX); -+ close(binfd); -+ if (sent < 0) -+ goto error; -+ -+#ifdef HAVE_MEMFD_CREATE -+ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS); -+ if (err < 0) -+ goto error; -+#else -+ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */ -+ int newfd; -+ char *fdpath = NULL; -+ -+ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0) -+ goto error; -+ newfd = open(fdpath, O_RDONLY | O_CLOEXEC); -+ free(fdpath); -+ if (newfd < 0) -+ goto error; -+ -+ close(memfd); -+ memfd = newfd; -+#endif -+ return memfd; -+ -+error: -+ close(memfd); -+ return -EIO; -+} -+ -+int ensure_cloned_binary(void) -+{ -+ int execfd; -+ char **argv = NULL, **envp = NULL; -+ -+ /* Check that we're not self-cloned, and if we are then bail. */ -+ int cloned = is_self_cloned(); -+ if (cloned > 0 || cloned == -ENOTRECOVERABLE) -+ return cloned; -+ -+ if (fetchve(&argv, &envp) < 0) -+ return -EINVAL; -+ -+ execfd = clone_binary(); -+ if (execfd < 0) -+ return -EIO; -+ -+ fexecve(execfd, argv, envp); -+ return -ENOEXEC; -+} -diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c -index 28269dfc0..7750af35e 100644 ---- a/libcontainer/nsenter/nsexec.c -+++ b/libcontainer/nsenter/nsexec.c -@@ -534,6 +534,9 @@ void join_namespaces(char *nslist) - free(namespaces); - } - -+/* Defined in cloned_binary.c. */ -+extern int ensure_cloned_binary(void); -+ - void nsexec(void) - { - int pipenum; -@@ -549,6 +552,14 @@ void nsexec(void) - if (pipenum == -1) - return; - -+ /* -+ * We need to re-exec if we are not in a cloned binary. This is necessary -+ * to ensure that containers won't be able to access the host binary -+ * through /proc/self/exe. See CVE-2019-5736. -+ */ -+ if (ensure_cloned_binary() < 0) -+ bail("could not ensure we are a cloned binary"); -+ - /* Parse all of the netlink configuration. */ - nl_parse(pipenum, &config); - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c6929b9f1a..b365d722f9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1564,17 +1564,16 @@ monitor/GPU.") (define-public runc (package (name "runc") - (version "1.0.0-rc6") + (version "1.0.0-rc93") (source (origin (method url-fetch) (uri (string-append "https://github.com/opencontainers/runc/releases/" "download/v" version "/runc.tar.xz")) (file-name (string-append name "-" version ".tar.xz")) - (patches (search-patches "runc-CVE-2019-5736.patch")) (sha256 (base32 - "1c7832dq70slkjh8qp2civ1wxhhdd2hrx84pq7db1mmqc9fdr3cc")))) + "0b90r1bkvlqli53ca1yc1l488dba0isd3i6l7nlhszxi8p7hzvkh")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" @@ -1584,35 +1583,27 @@ monitor/GPU.") #:tests? #f #:phases (modify-phases %standard-phases - (replace 'unpack - (lambda* (#:key source import-path #:allow-other-keys) - ;; Unpack the tarball into 'runc' instead of 'runc-1.0.0-rc5'. - (let ((dest (string-append "src/" import-path))) - (mkdir-p dest) - (invoke "tar" "-C" (string-append "src/" import-path) - "--strip-components=1" - "-xvf" source)))) (replace 'build (lambda* (#:key import-path #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) - ;; XXX: requires 'go-md2man'. - ;; (invoke "make" "man") - (invoke "make")))) - ;; (replace 'check - ;; (lambda _ - ;; (invoke "make" "localunittest"))) + (invoke "make" "all" "man")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "localunittest")))) (replace 'install (lambda* (#:key import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) (let ((out (assoc-ref outputs "out"))) - (invoke "make" "install" "install-bash" + (invoke "make" "install" "install-bash" "install-man" (string-append "PREFIX=" out))))))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("go-md2man" ,go-github-com-go-md2man) + ("pkg-config" ,pkg-config))) (inputs `(("libseccomp" ,libseccomp))) (synopsis "Open container initiative runtime") - (home-page "https://www.opencontainers.org/") + (home-page "https://opencontainers.org/") (description "@command{runc} is a command line client for running applications packaged according to the -- cgit v1.2.3 From 086069aad94aa70c3bb1f3c36b2486947805b344 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:38:55 +0200 Subject: gnu: emacs-auctex: Update to 13.0.6. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.0.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d6ca0c6d52..5aaeae3c82 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2251,14 +2251,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.0.5") + (version "13.0.6") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319")))) + (base32 "00wp388rh2nnk8fam53kilykg90jylps31qxv9ijy1lsp1hqdjys")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit v1.2.3 From 7087d4ba457d2fff54903eee3d573cccd832e9e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:42:22 +0200 Subject: gnu: emacs-ggtags: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-ggtags): Update to 0.9.0. [source]: Update archive extension. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5aaeae3c82..e1f572aa97 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2563,15 +2563,15 @@ into mode hooks and is intended to be used that way.") (define-public emacs-ggtags (package (name "emacs-ggtags") - (version "0.8.13") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/ggtags-" - version ".el")) + version ".tar")) (sha256 (base32 - "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg")))) + "0p79x9g94jynl83ndvqp9349vhgkzxzhnc517r8hn44iqxqf6ghg")))) (build-system emacs-build-system) (inputs `(("global" ,global))) -- cgit v1.2.3 From 8066441df7e1acf8c203fd0fb19ae2f5360870b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:43:25 +0200 Subject: gnu: emacs-posframe: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 0.9.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e1f572aa97..7e3aefd3b2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12577,14 +12577,14 @@ shuangpin, wubi and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.8.8") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "1ij6brzcxv9viz37qafcinlfx5l20w8x8s6786r1rsda5n1xsmvd")))) + (base32 "14x63713lbvmp24733j7pqkwvcnhpcgv7pprr8sykan3jnjnnzh3")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit v1.2.3 From 3ee3fd7b76d15ba6f6d6c94cbb22c7ef8874116e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:43:57 +0200 Subject: gnu: emacs-tramp: Update to 2.5.0.3. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.0.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7e3aefd3b2..34cb5faa9e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23627,14 +23627,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.0.2") + (version "2.5.0.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "16f782rjkmxxs5sz3wv4d46i7hbl483ashmrkvljf7lpnrl91s93")))) + (base32 "0c77d1ihn17lzk9jb7ss346ryprnbii1zmijl6zj0kk4lm8fpfl3")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit v1.2.3 From 18ffc38730deb5bee43d076115ec7cbb3787252e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:51:02 +0200 Subject: gnu: mgba: Update to 0.9.0. * gnu/packages/emulators.scm (mgba): Update to 0.9.0. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 8bfcfc57a7..8482f679e2 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -540,7 +540,7 @@ The following systems are supported: (define-public mgba (package (name "mgba") - (version "0.8.4") + (version "0.9.0") (source (origin (method git-fetch) @@ -549,7 +549,7 @@ The following systems are supported: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq")) + (base32 "16v08m9irping65d94vb5skp4m6nc63zj6bfajbzhmf944dswmi5")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. -- cgit v1.2.3 From 1d89098b1869ca4039b09ef16c7ce8e4f3263470 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:01:51 +0200 Subject: gnu: emacs-org: Update to 9.4.5. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.4.5. (emacs-org-contrib): Update to 20210329. --- gnu/packages/emacs-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 34cb5faa9e..239915fffe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11009,13 +11009,13 @@ passive voice.") (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update it as ;; well. - (version "9.4.4") + (version "9.4.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) (sha256 - (base32 "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b")))) + (base32 "0h5qhrd984vf17qc227wz68191xfgbpq32dyhw0lcz2d9i0pl3xk")))) (build-system emacs-build-system) (arguments `(#:phases @@ -11036,7 +11036,7 @@ passive voice.") (doc-dir (string-append share "/doc/" ,name "-" ,version))) (install-file "org.info" info-dir) (install-file "orgguide.info" info-dir) - ;; XXX: "orgcard.pdf" is not built in Org 9.4.4. + ;; XXX: "orgcard.pdf" is not built in Org 9.4.5. ;; (install-file "orgcard.pdf" doc-dir) ) #t))))) @@ -11052,14 +11052,14 @@ programming and reproducible research.") (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20201222") + (version "20210329") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/" "org-plus-contrib-" version ".tar")) (sha256 - (base32 "1pa8h5dpi5yj3j7v0aaby8sjwxvmgnbip2ilyl5pac1rlbz0jn40")) + (base32 "1l0ycz77hwmjb4sffhabb0d0hg1c9ypxbpbyv8xj5ib4nbi87f2h")) ;; ob-sclang.el is packaged separately to avoid the dependency on ;; SuperCollider and qtwebengine. (modules '((guix build utils))) -- cgit v1.2.3 From 385b63d35ec4263399c567162023be3816f5d65c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:11:53 +0200 Subject: gnu: rust-smallvec-1: Update to 1.6.1. * gnu/packages/crates-io.scm (rust-smallvec-1): Update to 1.6.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 09ae151ea1..e22d90d1ce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38878,7 +38878,7 @@ I/O programming.") (define-public rust-smallvec-1 (package (name "rust-smallvec") - (version "1.4.1") + (version "1.6.1") (source (origin (method url-fetch) @@ -38887,7 +38887,7 @@ I/O programming.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gqgmbfj8228lc55xxg331flizzwq6hfyy6gw4j2y6hni6fwnmrp")))) + "0kk08axr0ybfbjzk65a41k84mb6sfhyajmfndaka9igkx34kf3zy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 88de8287b30d9f61bf316a8580865fdf0e5411c5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:14:20 +0200 Subject: gnu: Add rust-nibble-vec-0.1. * gnu/packages/crates-io.scm (rust-nibble-vec-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e22d90d1ce..a033448b7c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24841,6 +24841,27 @@ cryptographic library.") release (fork of debug_unreachable)") (license license:expat))) +(define-public rust-nibble-vec-0.1 + (package + (name "rust-nibble-vec") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nibble_vec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hsdp3s724s30hkqz74ky6sqnadhp2xwcj1n1hzy4vzkz4yxi9bp")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-smallvec" ,rust-smallvec-1)))) + (home-page "https://github.com/michaelsproul/rust_nibble_vec") + (synopsis "Vector data-structure for half-byte values") + (description "NibbleVec is a data structure for storing a sequence of half-bytes.") + (license license:expat))) + (define-public rust-nickel-0.11 (package (name "rust-nickel") -- cgit v1.2.3 From 95446f64f85875573e3af0b806d01961d1536f58 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:15:27 +0200 Subject: gnu: Add rust-endian-type-0.1. * gnu/packages/crates-io.scm (rust-endian-type-0.1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a033448b7c..eeefcedb5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12977,6 +12977,26 @@ Standard.") "Streaming transcoding for encoding_rs.") (license (list license:asl2.0 license:expat)))) +(define-public rust-endian-type-0.1 + (package + (name "rust-endian-type") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "endian-type" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bbh88zaig1jfqrm7w3gx0pz81kw2jakk3055vbgapw3dmk08ky3")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/Lolirofle/endian-type") + (synopsis "Type safe wrappers for types with a defined byte order") + (description + "This crates provides type safe wrappers for types with a defined byte +order.") + (license license:expat))) + (define-public rust-enum-as-inner-0.3 (package (name "rust-enum-as-inner") -- cgit v1.2.3 From 68bb965f32ca750e9365a378715f6963bff4499c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:16:34 +0200 Subject: gnu: Add rust-radix-trie-0.2. * gnu/packages/crates-io.scm (rust-radix-trie-0.2): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eeefcedb5b..d9f88d52b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31080,6 +31080,31 @@ that must be shared-mutable, but merely may use atomic instructions to do so.") radix.") (license license:asl2.0))) +(define-public rust-radix-trie-0.2 + (package + (name "rust-radix-trie") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "radix_trie" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zaq3im5ss03w91ij11cj97vvzc5y1f3064d9pi2ysnwziww2sf0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-endian-type" ,rust-endian-type-0.1) + ("rust-nibble-vec" ,rust-nibble-vec-0.1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/michaelsproul/rust_radix_trie") + (synopsis "Generic radix trie data-structure") + (description + "This is a Radix Trie implementation in Rust, building on the lessons +learnt from TrieMap and Sequence Trie.") + (license license:expat))) + (define-public rust-rand-0.8 (package (name "rust-rand") -- cgit v1.2.3 From 493f45aa94c50908dc9793d4edad4daec516e504 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:18:07 +0200 Subject: gnu: Add rust-nix-0.20. * gnu/packages/crates-io.scm (rust-nix-0.20): New variable. (rust-nix-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d9f88d52b2..bcb0365553 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24947,8 +24947,36 @@ selectors. You can use the jQuery-like syntax to query and manipulate an HTML document quickly.") (license (list license:expat license:asl2.0)))) +(define-public rust-nix-0.20 + (package + (name "rust-nix") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12n1syfd967hblrcrrqk63a4s1h4hsybfqwblh71rihvv8cli6zs")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cc" ,rust-cc-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/nix-rust/nix") + (synopsis "Rust friendly bindings to *nix APIs") + (description + "Nix seeks to provide friendly bindings to various *nix platform APIs. +The goal is to not provide a 100% unified interface, but to unify what can be +while still providing platform specific APIs.") + (license license:expat))) + (define-public rust-nix-0.19 (package + (inherit rust-nix-0.20) (name "rust-nix") (version "0.19.1") (source @@ -24958,7 +24986,6 @@ document quickly.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1wk1pmaf9pv84sc4jf19gm1as2yq3ydwcx0n5nc1bpsgzq6bmk5j")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; test suite hangs #:cargo-inputs @@ -24973,14 +25000,7 @@ document quickly.") ("rust-rand" ,rust-rand-0.6) ("rust-semver" ,rust-semver-0.9) ("rust-sysctl" ,rust-sysctl-0.1) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/nix-rust/nix") - (synopsis "Rust friendly bindings to *nix APIs") - (description - "Nix seeks to provide friendly bindings to various *nix platform APIs. -The goal is to not provide a 100% unified interface, but to unify what can be -while still providing platform specific APIs.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.18 (package -- cgit v1.2.3 From 55413f9bcb51d0a6d74fe6dcf16821c50fbfc200 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:19:43 +0200 Subject: gnu: Add rust-rustyline-8. * gnu/packages/crates-io.scm (rust-rustyline-8): New variable. --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bcb0365553..32e941ea4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35226,17 +35226,17 @@ sub-processes using a fork-like interface.") ("rust-tempfile" ,rust-tempfile-3) ("rust-wait-timeout" ,rust-wait-timeout-0.2)))))) -(define-public rust-rustyline-7 +(define-public rust-rustyline-8 (package (name "rust-rustyline") - (version "7.1.0") + (version "8.0.0") (source (origin (method url-fetch) (uri (crate-uri "rustyline" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v1czmy3ir7d06xldp8bg94l97hrm15hcgdxxkq3cwbizhdk09w2")))) + (base32 "14z8hyx33ygyhm5ihcl9n2g646dawlw3ajavnbbb3vnizjbvbqdr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -35248,19 +35248,51 @@ sub-processes using a fork-like interface.") ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2) - ("rust-nix" ,rust-nix-0.19) + ("rust-nix" ,rust-nix-0.20) + ("rust-radix-trie" ,rust-radix-trie-0.2) ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-smallvec" ,rust-smallvec-1) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-utf8parse" ,rust-utf8parse-0.2) ("rust-winapi" ,rust-winapi-0.3) - ("skim" ,skim-0.7)))) + ("skim" ,skim)))) (home-page "https://github.com/kkawakam/rustyline") (synopsis "Readline implementation in Rust") (description - "Rustyline, a readline implementation based on the linenoise package.") + "Rustyline is a readline implementation based on the linenoise package.") (license license:expat))) +(define-public rust-rustyline-7 + (package + (inherit rust-rustyline-8) + (name "rust-rustyline") + (version "7.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustyline" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v1czmy3ir7d06xldp8bg94l97hrm15hcgdxxkq3cwbizhdk09w2")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-dirs-next" ,rust-dirs-next-2) + ("rust-fs2" ,rust-fs2-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-nix" ,rust-nix-0.19) + ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-utf8parse" ,rust-utf8parse-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("skim" ,skim-0.7)))))) + (define-public rust-rustyline-6 (package (inherit rust-rustyline-7) -- cgit v1.2.3 From 3f1cc80ac6afef31a8f85cdac172b8669b7722c3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:21:12 +0200 Subject: gnu: Add rust-hamcrest2-0.3. * gnu/packages/crates-io.scm (rust-hamcrest2-0.3): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 32e941ea4d..32440e2fe5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17271,6 +17271,29 @@ highlighting for a large number of languages, git integration, and automatic paging.") (license (list license:expat license:asl2.0)))) +(define-public rust-hamcrest2-0.3 + (package + (name "rust-hamcrest2") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hamcrest2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0x8hx7jyzz2bl0wf6nir62imd26yhp6qcr7zf76cjpg05p33gy29")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-num" ,rust-num-0.2) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/Valloric/hamcrest2-rust") + (synopsis "Rust port of the Hamcrest testing library") + (description + "This package provides a port of the Hamcrest testing library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-handlebars-2 (package (name "rust-handlebars") -- cgit v1.2.3 From 39f69aff21720c8d3c884200fb301a23346f8c6b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 14:10:28 +0200 Subject: gnu: nushell: Update to 0.29.0. * gnu/packages/shells.scm (nushell): Update to 0.29.0. (rust-nu-ansi-term-0.29): (rust-nu-cli-0.29): (rust-nu-command-0.29): (rust-nu-data-0.29): (rust-nu-engine-0.29): (rust-nu-json-0.29): (rust-nu-parser-0.29): (rust-nu-plugin-0.29): (rust-nu-plugin-binaryview-0.29): (rust-nu-plugin-chart-0.29): (rust-nu-plugin-fetch-0.29): (rust-nu-plugin-from-bson-0.29): (rust-nu-plugin-from-sqlite-0.29): (rust-nu-plugin-inc-0.29): (rust-nu-plugin-match-0.29): (rust-nu-plugin-post-0.29): (rust-nu-plugin-ps-0.29): (rust-nu-plugin-s3-0.29): (rust-nu-plugin-sys-0.29): (rust-nu-plugin-textview-0.29): (rust-nu-plugin-to-bson-0.29): (rust-nu-plugin-to-sqlite-0.29): (rust-nu-plugin-tree-0.29): (rust-nu-plugin-xpath-0.29): (rust-nu-protocol-0.29): (rust-nu-source-0.29): (rust-nu-stream-0.29): (rust-nu-test-support-0.29): (rust-nu-value-ext-0.29): Update to 0.29. --- gnu/packages/shells.scm | 647 +++++++++++++++++++++++++----------------------- 1 file changed, 339 insertions(+), 308 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 62b7dc75fd..5ab3642dea 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -940,7 +940,7 @@ files and text.") (define-public nushell (package (name "nushell") - (version "0.28.0") + (version "0.29.0") (source (origin (method git-fetch) @@ -949,7 +949,7 @@ files and text.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0kbynyk4c0r2qi78mdchx6d0d0c7phz2sxj5cqwsz4gjziibhr7j")))) + (base32 "0x7r8ipvypf6py2h03pdqr8pal6vyp6mskvss1rr8f0bcy3gr725")))) (build-system cargo-build-system) (arguments `(#:rust ,rust-1.47 @@ -961,38 +961,39 @@ files and text.") ("rust-futures" ,rust-futures-0.3) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-cli" ,rust-nu-cli-0.28) - ("rust-nu-command" ,rust-nu-command-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-engine" ,rust-nu-engine-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-parser" ,rust-nu-parser-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) - ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.28) - ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.28) - ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.28) - ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.28) - ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.28) - ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.28) - ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.28) - ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.28) - ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.28) - ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.28) - ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.28) - ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.28) - ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.28) - ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.28) - ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.28) - ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.28) - ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.28) - ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.28) + ("rust-nu-cli" ,rust-nu-cli-0.29) + ("rust-nu-command" ,rust-nu-command-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-engine" ,rust-nu-engine-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-parser" ,rust-nu-parser-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) + ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.29) + ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.29) + ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.29) + ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.29) + ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.29) + ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.29) + ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.29) + ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.29) + ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.29) + ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.29) + ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.29) + ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.29) + ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.29) + ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.29) + ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.29) + ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.29) + ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.29) + ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.29) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)) #:cargo-development-inputs (("rust-dunce" ,rust-dunce-1) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) + ("rust-hamcrest2" ,rust-hamcrest2-0.3) + ("rust-nu-test-support" ,rust-nu-test-support-0.29) ("rust-serial-test" ,rust-serial-test-0.5)))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1016,17 +1017,17 @@ directory. These values can be piped through a series of steps, in a series of commands called a ``pipeline''.") (license license:expat))) -(define-public rust-nu-ansi-term-0.28 +(define-public rust-nu-ansi-term-0.29 (package (name "rust-nu-ansi-term") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-ansi-term" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0j4ybp1bmlj9lakrp21i180c26x0i9ird08xshsr6607g8nvc73f")))) + (base32 "0zlcma4kg6rsfp5sgfp3yy717bdrn9nq32rdi2nabpwg3qa9mmkb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1040,23 +1041,24 @@ of commands called a ``pipeline''.") underline).") (license license:expat))) -(define-public rust-nu-cli-0.28 +(define-public rust-nu-cli-0.29 (package (name "rust-nu-cli") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-cli" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wz3n4b7sz5zynwhs2gn11w1b9cji231f613r23j64a8y26hdzhn")))) + (base32 "0ya95r54k59h0gyz2wgj8y2lhddnk3aw7ww1npzcbfsy1xi1zvi5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-arboard" ,rust-arboard-1) - ("rust-async-recursion" ,rust-async-recursion-0.3) + ("rust-async-recursion" + ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-base64" ,rust-base64-0.13) ("rust-bigdecimal" ,rust-bigdecimal-0.2) @@ -1066,11 +1068,13 @@ underline).") ("rust-chrono" ,rust-chrono-0.4) ("rust-chrono-tz" ,rust-chrono-tz-0.5) ("rust-clap" ,rust-clap-2) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-csv" ,rust-csv-1) ("rust-ctrlc" ,rust-ctrlc-3) ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-directories-next" ,rust-directories-next-2) + ("rust-directories-next" + ,rust-directories-next-2) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-dtparse" ,rust-dtparse-1) ("rust-dunce" ,rust-dunce-1) @@ -1092,20 +1096,21 @@ underline).") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-meval" ,rust-meval-0.2) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-command" ,rust-nu-command-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-engine" ,rust-nu-engine-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-json" ,rust-nu-json-0.28) - ("rust-nu-parser" ,rust-nu-parser-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-stream" ,rust-nu-stream-0.28) - ("rust-nu-table" ,rust-nu-table-0.28) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-command" ,rust-nu-command-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-engine" ,rust-nu-engine-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-json" ,rust-nu-json-0.29) + ("rust-nu-parser" ,rust-nu-parser-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-stream" ,rust-nu-stream-0.29) + ("rust-nu-table" ,rust-nu-table-0.29) + ("rust-nu-test-support" + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1113,28 +1118,31 @@ underline).") ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-ptree" ,rust-ptree-0.3) - ("rust-query-interface" ,rust-query-interface-0.3) - ("rust-quick-xml" ,rust-quick-xml-0.21) + ("rust-query-interface" + ,rust-query-interface-0.3) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-quick-xml" ,rust-quick-xml-0.21) ("rust-rand" ,rust-rand-0.8) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-roxmltree" ,rust-roxmltree-0.14) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-rust-embed" ,rust-rust-embed-5) - ("rust-rustyline" ,rust-rustyline-6) + ("rust-rustyline" ,rust-rustyline-8) ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-ini" ,rust-serde-ini-0.2) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-serde-urlencoded" + ,rust-serde-urlencoded-0.7) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-sha2" ,rust-sha2-0.9) ("rust-shadow-rs" ,rust-shadow-rs-0.5) ("rust-shadow-rs" ,rust-shadow-rs-0.5) ("rust-shellexpand" ,rust-shellexpand-2) - ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) + ("rust-strip-ansi-escapes" + ,rust-strip-ansi-escapes-0.1) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4) ("rust-tempfile" ,rust-tempfile-3) @@ -1145,7 +1153,8 @@ underline).") ("rust-toml" ,rust-toml-0.5) ("rust-trash" ,rust-trash-1) ("rust-umask" ,rust-umask-1) - ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-segmentation" + ,rust-unicode-segmentation-1) ("rust-url" ,rust-url-2) ("rust-users" ,rust-users-0.11) ("rust-uuid" ,rust-uuid-0.8) @@ -1156,23 +1165,24 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-command-0.28 +(define-public rust-nu-command-0.29 (package (name "rust-nu-command") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-command" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0n6967w99m4zi52lfb57ycckammcc4im92yl5v2a2r6avnxrby1d")))) + (base32 "0nydc7vyrhfw99bimjs6061zgcqqi8hjjx20sq3qn2njgk1p730l")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-arboard" ,rust-arboard-1) - ("rust-async-recursion" ,rust-async-recursion-0.3) + ("rust-async-recursion" + ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-base64" ,rust-base64-0.13) ("rust-bigdecimal" ,rust-bigdecimal-0.2) @@ -1182,12 +1192,14 @@ underline).") ("rust-chrono" ,rust-chrono-0.4) ("rust-chrono-tz" ,rust-chrono-tz-0.5) ("rust-clap" ,rust-clap-2) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-crossterm" ,rust-crossterm-0.19) ("rust-csv" ,rust-csv-1) ("rust-ctrlc" ,rust-ctrlc-3) ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-directories-next" ,rust-directories-next-2) + ("rust-directories-next" + ,rust-directories-next-2) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-dtparse" ,rust-dtparse-1) ("rust-dunce" ,rust-dunce-1) @@ -1208,21 +1220,23 @@ underline).") ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) + ("rust-md5" ,rust-md5-0.7) ("rust-meval" ,rust-meval-0.2) ("rust-minus" ,rust-minus-3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-engine" ,rust-nu-engine-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-json" ,rust-nu-json-0.28) - ("rust-nu-parser" ,rust-nu-parser-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-stream" ,rust-nu-stream-0.28) - ("rust-nu-table" ,rust-nu-table-0.28) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-engine" ,rust-nu-engine-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-json" ,rust-nu-json-0.29) + ("rust-nu-parser" ,rust-nu-parser-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-stream" ,rust-nu-stream-0.29) + ("rust-nu-table" ,rust-nu-table-0.29) + ("rust-nu-test-support" + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1230,7 +1244,8 @@ underline).") ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-ptree" ,rust-ptree-0.3) - ("rust-query-interface" ,rust-query-interface-0.3) + ("rust-query-interface" + ,rust-query-interface-0.3) ("rust-quick-xml" ,rust-quick-xml-0.21) ("rust-rand" ,rust-rand-0.7) ("rust-rayon" ,rust-rayon-1) @@ -1238,17 +1253,19 @@ underline).") ("rust-roxmltree" ,rust-roxmltree-0.14) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-rust-embed" ,rust-rust-embed-5) - ("rust-rustyline" ,rust-rustyline-7) + ("rust-rustyline" ,rust-rustyline-8) ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-ini" ,rust-serde-ini-0.2) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-serde-urlencoded" + ,rust-serde-urlencoded-0.7) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-sha2" ,rust-sha2-0.9) ("rust-shadow-rs" ,rust-shadow-rs-0.5) ("rust-shellexpand" ,rust-shellexpand-2) - ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) + ("rust-strip-ansi-escapes" + ,rust-strip-ansi-escapes-0.1) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4) ("rust-tempfile" ,rust-tempfile-3) @@ -1259,7 +1276,8 @@ underline).") ("rust-toml" ,rust-toml-0.5) ("rust-trash" ,rust-trash-1) ("rust-umask" ,rust-umask-1) - ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-segmentation" + ,rust-unicode-segmentation-1) ("rust-url" ,rust-url-2) ("rust-users" ,rust-users-0.11) ("rust-uuid" ,rust-uuid-0.8) @@ -1270,17 +1288,17 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-data-0.28 +(define-public rust-nu-data-0.29 (package (name "rust-nu-data") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-data" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gq0izbpaw4lp92ia3d3i14x649r1s6jscabm6xdi2qcxfb420kz")))) + (base32 "1niljv9vm42py1hmf8na03xbxb4vvypmrxk765ih9m2jg2zq9386")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1289,22 +1307,25 @@ underline).") ("rust-byte-unit" ,rust-byte-unit-4) ("rust-chrono" ,rust-chrono-0.4) ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-directories-next" ,rust-directories-next-2) + ("rust-directories-next" + ,rust-directories-next-2) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-table" ,rust-nu-table-0.28) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-table" ,rust-nu-table-0.29) + ("rust-nu-test-support" + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-query-interface" ,rust-query-interface-0.3) + ("rust-query-interface" + ,rust-query-interface-0.3) ("rust-serde" ,rust-serde-1) ("rust-toml" ,rust-toml-0.5) ("rust-users" ,rust-users-0.11)))) @@ -1313,24 +1334,27 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-engine-0.28 +(define-public rust-nu-engine-0.29 (package (name "rust-nu-engine") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-engine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "135bwcqvb8vhg417yzz90bj396f9hwpbqrdi9kw8fvmfz573z32s")))) + (base32 "1wz033zamlakpca5k2bgal2ykd5ia76g5fw3r5xzb6jb63q7xqhf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-async-recursion" ,rust-async-recursion-0.3) + (("rust-async-recursion" + ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-bytes" ,rust-bytes-0.5) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-dunce" ,rust-dunce-1) @@ -1345,15 +1369,15 @@ underline).") ("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-parser" ,rust-nu-parser-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-stream" ,rust-nu-stream-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-parser" ,rust-nu-parser-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-stream" ,rust-nu-stream-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-rayon" ,rust-rayon-1) ("rust-serde" ,rust-serde-1) @@ -1363,34 +1387,36 @@ underline).") ("rust-termcolor" ,rust-termcolor-1) ("rust-trash" ,rust-trash-1) ("rust-umask" ,rust-umask-1) - ("rust-users" ,rust-users-0.11)))) + ("rust-users" ,rust-users-0.11) + ("rust-which" ,rust-which-4)))) (home-page "https://www.nushell.sh") (synopsis "Core commands for nushell") (description "Core commands for nushell") (license license:expat))) -(define-public rust-nu-errors-0.28 +(define-public rust-nu-errors-0.29 (package (name "rust-nu-errors") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-errors" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1zb5mmhzjh5cd27ry4z0vgw99ic9k3badxy3ywjk72nzpr5ra303")))) + (base32 "1xxdirdd57x20irn1z1p2987cyyi8l6k6shlblikjjf97d8kjk0n")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1402,23 +1428,24 @@ underline).") (description "Core error subsystem for Nushell") (license license:expat))) -(define-public rust-nu-json-0.28 +(define-public rust-nu-json-0.29 (package (name "rust-nu-json") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02w1lp7mp1fg7rf5zpdzllvsmd0jlgmig50xxag6a901ic85ddr7")))) + (base32 "1c1xj96gmyznqys3mxgnir4jf88npg4jkcwh9xa420agb03n9gzh")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-linked-hash-map" + ,rust-linked-hash-map-0.5) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1)))) @@ -1427,33 +1454,36 @@ underline).") (description "This package is a fork of @code{serde-hjson}.") (license license:expat))) -(define-public rust-nu-parser-0.28 +(define-public rust-nu-parser-0.29 (package (name "rust-nu-parser") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-parser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0sixgfj7nsg66gmsqchydkqbhf3dzg5igvcri7dz6qdadi578wb5")))) + (base32 "1cmqx4gw7xg6ag58y7pq94prwkagc40wcrxbk2vzqj206h97xvmi")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-derive-is-enum-variant" ,rust-derive-is-enum-variant-0.1) + ("rust-derive-is-enum-variant" + ,rust-derive-is-enum-variant-0.1) ("rust-dunce" ,rust-dunce-1) ("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-test-support" + ,rust-nu-test-support-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1464,10 +1494,10 @@ underline).") (description "Nushell parser") (license license:expat))) -(define-public rust-nu-plugin-0.28 +(define-public rust-nu-plugin-0.29 (package (name "rust-nu-plugin") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) @@ -1475,19 +1505,19 @@ underline).") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1bkxkffcywaam8r55v8ciq42mgimgxzl4x8vb5qzx49a5gjb1831")))) + (base32 "03qqvh4jhpzwb1mh4f8pz2m88sa825giz5g7lr2l96nb0qfya19j")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-nu-test-support" - ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1)))) @@ -1496,17 +1526,17 @@ underline).") (description "Nushell Plugin") (license license:expat))) -(define-public rust-nu-plugin-binaryview-0.28 +(define-public rust-nu-plugin-binaryview-0.29 (package (name "rust-nu-plugin-binaryview") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_binaryview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "055pc3idf1jsrks0hpx55vazaivxdjfncvbqjjsp89dk1011a3yp")))) + (base32 "0x7g9lncglbpdjxk1r47k49ha9yir03znis6zs7i25qwsb2sgynz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1514,11 +1544,11 @@ underline).") (("rust-crossterm" ,rust-crossterm-0.19) ("rust-image" ,rust-image-0.22) ("rust-neso" ,rust-neso-0.5) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-rawkey" ,rust-rawkey-0.1)))) (home-page "https://www.nushell.sh") @@ -1527,29 +1557,29 @@ underline).") "This package provides a binary viewer plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-chart-0.28 +(define-public rust-nu-plugin-chart-0.29 (package (name "rust-nu-plugin-chart") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_chart" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "114kg6vspympi2fr14sgvwnlinwa7s2vwv8f9a9p1kwqg4qa281s")))) + (base32 "1b4zqnm788728jzqxcipik4x3lgj8yf0cjpxznbb10bgyfdp0jxk")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-crossterm" ,rust-crossterm-0.19) - ("rust-nu-cli" ,rust-nu-cli-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-cli" ,rust-nu-cli-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-tui" ,rust-tui-0.14)))) (home-page "https://www.nushell.sh") (synopsis "Plugin to display charts") @@ -1557,17 +1587,17 @@ underline).") "This package provides a plugin to display charts in Nushell.") (license license:expat))) -(define-public rust-nu-plugin-fetch-0.28 +(define-public rust-nu-plugin-fetch-0.29 (package (name "rust-nu-plugin-fetch") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_fetch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v7pc58m8gi5zscvyviy8j5zbn30hxqlb37c0grgda7635vqhq31")))) + (base32 "086z2a2fmi4v95kg6bgzp1ylilbbflxnf242vnkmw6ys5gs8g4dy")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1575,10 +1605,10 @@ underline).") (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) ("rust-mime" ,rust-mime-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-surf" ,rust-surf-2) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1586,28 +1616,28 @@ underline).") (description "This package provides a URL fetch plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-bson-0.28 +(define-public rust-nu-plugin-from-bson-0.29 (package (name "rust-nu-plugin-from-bson") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13k11dh2pc48181qcbqwwgwwqh5d2g99p0rq4ly75l5jwyyazi73")))) + (base32 "02932wzrqrg4777cm1lpncig9cxn7s80fmlrkavrkw9dh2lnbbms")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1616,27 +1646,27 @@ underline).") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-sqlite-0.28 +(define-public rust-nu-plugin-from-sqlite-0.29 (package (name "rust-nu-plugin-from-sqlite") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mpaz3vn7zf1ijccfd9rgrzl0fr3fci6j16w7a81x6dh7pqavxgn")))) + (base32 "1mnavx7pa5isic2rnrxd8462axh826rimscjpjxq4nk77wkzp5s8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1647,28 +1677,28 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-inc-0.28 +(define-public rust-nu-plugin-inc-0.29 (package (name "rust-nu-plugin-inc") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_inc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1dbayv8gcjpz46xgvh9b1pka2ygyhyalk1xzh43cvaccqn4qafrb")))) + (base32 "0w0dmqa6rv12whpmsvli5nb7pnazrhdp08x2fzrabz60rq1qsfx9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + (("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-nu-test-support" - ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-semver" ,rust-semver-0.11)))) (home-page "https://www.nushell.sh") (synopsis "Version incrementer plugin for Nushell") @@ -1677,25 +1707,25 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-match-0.28 +(define-public rust-nu-plugin-match-0.29 (package (name "rust-nu-plugin-match") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_match" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1d19hwrrmbwxx3nn7gjs2wvzf6wfhdai9jsq35n7bgjx2qyip0ma")))) + (base32 "0hmxhd3z7p88xg5g75kljl0g6rp5k22ff0k9f2a6j9j7y3rrdlmb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + (("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-regex" ,rust-regex-1)))) (home-page "https://www.nushell.sh") (synopsis "Regex match plugin for Nushell") @@ -1703,27 +1733,27 @@ Nushell.") "This package provides a regex match plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-post-0.28 +(define-public rust-nu-plugin-post-0.29 (package (name "rust-nu-plugin-post") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_post" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1jha85gl422p9knr0m4xdx353nmm00zrj5yh9w2gdyzs6hbzf80q")))) + (base32 "1d2198ks2cw6phg1hdsz75rqh5l49whcsl5hl21g86y2j5sl0hpd")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde-json" ,rust-serde-json-1) ("rust-surf" ,rust-surf-1) @@ -1733,27 +1763,27 @@ Nushell.") (description "This package is an HTTP POST plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-ps-0.28 +(define-public rust-nu-plugin-ps-0.29 (package (name "rust-nu-plugin-ps") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_ps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0akgz7wi85ny2cfkcs9bn4hc97d4wdh9ayrzd6zasmird5kl1lv8")))) + (base32 "00dy60fnii1iifv0rh1xm77jn37l068np46fp3izbsbq642vzf7m")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-timer" ,rust-futures-timer-3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1762,80 +1792,80 @@ Nushell.") "This package provides a process list plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-s3-0.28 +(define-public rust-nu-plugin-s3-0.29 (package (name "rust-nu-plugin-s3") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_s3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02b71ljsi7z2nbpm9djaxvdg7ql6xn0mqibpnzql0d39wfb0bxc2")))) + (base32 "00856l98gmmnv5bfg1vd6mqyk0zpkdrd1xgxqfi2c9nmsy2b1qfa")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-s3handler" ,rust-s3handler-0.6)))) (home-page "https://www.nushell.sh") (synopsis "S3 plugin for Nushell") (description "This package is an S3 plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-selector-0.28 +(define-public rust-nu-plugin-selector-0.29 (package (name "rust-nu-plugin-selector") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_selector" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0g1sjlvylclhhp41h6xx6vaa10478albjgh3n7kg3p0s6i8db5a7")))) + (base32 "14hn8plcax4kljq5kw96881pngs7w2gy11k3hs1pmaxhr0bi6c8h")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-nipper" ,rust-nipper-0.1) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28)))) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29)))) (home-page "https://www.nushell.sh") (synopsis "Web scraping using CSS selector") (description "This package provides web scraping using CSS selector.") (license license:expat))) -(define-public rust-nu-plugin-start-0.28 +(define-public rust-nu-plugin-start-0.29 (package (name "rust-nu-plugin-start") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_start" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gqn6b1jpxcfx81c5c4yfs52gzxp9viyqj7hjs7fqvf5czi0bmz7")))) + (base32 "002cjbdh4zn81zhc5a0gklfxdjslqbcbp1wcx5ijzpch40c5dyzj")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-glob" ,rust-glob-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-open" ,rust-open-1) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1845,10 +1875,10 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-sys-0.28 +(define-public rust-nu-plugin-sys-0.29 (package (name "rust-nu-plugin-sys") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) @@ -1856,17 +1886,17 @@ Nushell.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16igj4z9f7kfy3x71ki3vaqdx6064l3k718vqfpabffjkz9qpfp5")))) + (base32 "0s2jyaff4lngm1c5446618r5761d8dcbpsrs7p7vzp6g2dic1w69")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1874,28 +1904,28 @@ Nushell.") (description "This package provides a system info plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-textview-0.28 +(define-public rust-nu-plugin-textview-0.29 (package (name "rust-nu-plugin-textview") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_textview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07m3x9bkq1qliicnshgs6yi6q5fbl6d6gxcd60kqcavkvdknnf8m")))) + (base32 "19kwh6rn0xk340yk0w1r3dfm328s9jqln8hgfqw5m3lld1hh1a4v")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bat" ,rust-bat-0.17) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-term-size" ,rust-term-size-0.3) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1904,27 +1934,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-bson-0.28 +(define-public rust-nu-plugin-to-bson-0.29 (package (name "rust-nu-plugin-to-bson") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rq2kwzrby8rh57gq4s4ljj4fgfgblrhjncjycpmkw2jzn7sa6xi")))) + (base32 "1j019frp663s511b7z9sz5vh77pvz0nn3w2asrk50xlyj5hfig55")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1933,27 +1963,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-sqlite-0.28 +(define-public rust-nu-plugin-to-sqlite-0.29 (package (name "rust-nu-plugin-to-sqlite") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0q07fv4i4rkzjna54mkcri5bfngqkkmpfj3vmiyzib0x84pvzfjf")))) + (base32 "0p86iyag0ci15i1nqyb74kp1lax9mgm73w5g3qkp2v97lihv12pf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-hex" ,rust-hex-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1964,26 +1994,26 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-tree-0.28 +(define-public rust-nu-plugin-tree-0.29 (package (name "rust-nu-plugin-tree") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_tree" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0xifcyg0z025n6w0cqjnmrjcbynv437dkxpsxgbvm4iybj558590")))) + (base32 "096l86ci540v0aj9xrvwd4ccgg388kabz4rbg88nrpw0rlacrbc3")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-ptree" ,rust-ptree-0.3)))) (home-page "https://www.nushell.sh") (synopsis "Tree viewer plugin for Nushell") @@ -1991,27 +2021,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-xpath-0.28 +(define-public rust-nu-plugin-xpath-0.29 (package (name "rust-nu-plugin-xpath") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_xpath" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mwajr07489kgv2yhxsk0laydf8m8p736npvkcbsjxaxydnv5a5a")))) + (base32 "0459awkffb2sydd2l5gbcx1kz466qkigb1bxn5ka208y9k5qz54v")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4)))) (home-page "https://www.nushell.sh") @@ -2019,17 +2049,17 @@ Nushell.") (description "Traverses XML") (license license:expat))) -(define-public rust-nu-protocol-0.28 +(define-public rust-nu-protocol-0.29 (package (name "rust-nu-protocol") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-protocol" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0khpg2dnapyyimyq4ys1nfs1xzysxq2nb1ka2lmjfgdxrbwzrqnj")))) + (base32 "1iii3r37dcl7sf870qrzfkdc1iylbbkcycp1k5ifjvd5yxlkfpxx")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2041,8 +2071,8 @@ Nushell.") ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-integer" ,rust-num-integer-0.1) ("rust-num-traits" ,rust-num-traits-0.2) @@ -2056,17 +2086,17 @@ Nushell.") (description "Core values and protocols for Nushell") (license license:expat))) -(define-public rust-nu-source-0.28 +(define-public rust-nu-source-0.29 (package (name "rust-nu-source") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-source" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13a590iff8bg6p38xs1hh5krmii6qz2w5k7ak57dyh3r3vbhvmmd")))) + (base32 "1m8phdw9iwawsq0ip4zn2w8ggjjr45z1ny2sgdb3h1y1awpnvdbq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2083,46 +2113,46 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-stream-0.28 +(define-public rust-nu-stream-0.29 (package (name "rust-nu-stream") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-stream" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02dl4d9gzl2jhg71hfc04x9j4p29iwwcyvm6m9pihwfpwb3q2bhj")))) + (base32 "15zx16s4wb23316ih4wqnnpajh1qz5vckpzk3k41qqkmar1w4sah")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28)))) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29)))) (home-page "https://www.nushell.sh") (synopsis "Nushell stream") (description "This package provides Nushell stream.") (license license:expat))) -(define-public rust-nu-table-0.28 +(define-public rust-nu-table-0.29 (package (name "rust-nu-table") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-table" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "15yd0wrl0y0rmjdvq2gmk97nxppdy5r424vy8v85gk876g82gi1s")))) + (base32 "1ihrr2406v5yjdfm699q6alx5bh49q8d04x1dzvn6qydgmf6r8z6")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) ("rust-regex" ,rust-regex-1) ("rust-unicode-width" ,rust-unicode-width-0.1)))) (home-page "https://www.nushell.sh") @@ -2130,17 +2160,17 @@ Nushell.") (description "Nushell table printing") (license license:expat))) -(define-public rust-nu-test-support-0.28 +(define-public rust-nu-test-support-0.29 (package (name "rust-nu-test-support") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-test-support" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1qphsvr1wpn26ak5g4bj106csm8bia12srpv1dwy4zif42if57gm")))) + (base32 "0dlmhrskpdp82a6064srx1c4bqvfz66madx2i6cgxg56d7x38km6")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2150,11 +2180,12 @@ Nushell.") ("rust-dunce" ,rust-dunce-1) ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) + ("rust-hamcrest2" ,rust-hamcrest2-0.3) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://www.nushell.sh") @@ -2163,10 +2194,10 @@ Nushell.") tests.") (license license:expat))) -(define-public rust-nu-value-ext-0.28 +(define-public rust-nu-value-ext-0.29 (package (name "rust-nu-value-ext") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) @@ -2174,16 +2205,16 @@ tests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0kwx2s4gyss8gmj72kl0y2yzq5injwv9g9n53bal339b81dd7v90")))) + (base32 "1riq3xg6cqwrfb55bwva13m5dn4d7d71g2825dn7z2i96f6vylwi")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "@code{Extension} traits for values in Nushell") -- cgit v1.2.3 From 83ecb38148b0edd7f678b078373255f746a4090b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 2 Apr 2021 21:46:37 +0100 Subject: gnu: Add cl-opengl. * gnu/packages/lisp-xyz.scm: (sbcl-cl-opengl, cl-opengl, ecl-cl-opengl): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e1a5a9a7a6..9eb937314e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages file) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages imagemagick) @@ -15564,3 +15565,55 @@ immediately loaded.") (define-public cl-conspack (sbcl-package->cl-source-package sbcl-cl-conspack)) + +(define-public sbcl-cl-opengl + (let ((commit "e2d83e0977b7e7ac3f3d348d8ccc7ccd04e74d59") + (revision "1")) + (package + (name "sbcl-cl-opengl") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/3b/cl-opengl") + (commit commit))) + (file-name (git-file-name "cl-opengl" version)) + (sha256 + (base32 "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-systems '("cl-opengl" "cl-glu" "cl-glut") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-lib-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gl/library.lisp" + (("libGL.so" all) + (string-append (assoc-ref inputs "mesa") "/lib/" all))) + (substitute* "glu/library.lisp" + (("libGLU.so" all) + (string-append (assoc-ref inputs "glu") "/lib/" all))) + (substitute* "glut/library.lisp" + (("libglut.so" all) + (string-append (assoc-ref inputs "freeglut") "/lib/" all))) + #t))))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("float-features" ,sbcl-float-features) + ("freeglut" ,freeglut) + ("glu" ,glu) + ("mesa" ,mesa))) + (home-page "https://github.com/3b/cl-opengl") + (synopsis "Common Lisp bindings to OpenGL, GLU and GLUT APIs") + (description + "This package provides a set of bindings and utilities for accessing the +OpenGL (Mesa), GLU and GLUT (FreeGLUT) APIs using CFFI.") + (license license:bsd-3)))) + +(define-public ecl-cl-opengl + (sbcl-package->ecl-package sbcl-cl-opengl)) + +(define-public cl-opengl + (sbcl-package->cl-source-package sbcl-cl-opengl)) -- cgit v1.2.3 From 35351dfd97056974922e59c273fda583a2250ddb Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 3 Apr 2021 11:12:27 +0200 Subject: gnu: saga: Update to 7.9.0. * gnu/packages/geo.scm (saga): Update to 7.9.0. [inputs]: Replace proj.4 with proj. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index be05fbe711..37783b7ccd 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2013,7 +2013,7 @@ visualization.") (define-public saga (package (name "saga") - (version "7.6.2") + (version "7.9.0") (source (origin (method url-fetch) @@ -2021,7 +2021,7 @@ visualization.") (version-major version) "/SAGA%20-%20" version "/saga-" version ".tar.gz")) (sha256 - (base32 "09j5magmayq2y620kqa490mfd1kpdp3lng2ifcgbrmssc079ybm0")))) + (base32 "1n051yxxkylly0k9rlkx2ih3j2lf9d4csg00sm7161r7nhjvggd1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -2036,7 +2036,7 @@ visualization.") ("libtiff" ,libtiff) ("opencv" ,opencv) ("postgresql" ,postgresql) - ("proj.4" ,proj.4) + ("proj" ,proj) ("python" ,python) ("qhull" ,qhull) ("unixodbc" ,unixodbc) -- cgit v1.2.3 From f4b78c22a1975ef8637c560c6def190abbcc4254 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 3 Apr 2021 11:56:20 +0200 Subject: gnu: tippecanoe: Update to 1.36.0. * gnu/packages/geo.scm (tippecanoe): Update to 1.36.0. [arguments]: Use cc-for-target instead of hard-coding gcc. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37783b7ccd..bc5e6820f3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1102,7 +1102,7 @@ map, geocoding with Nominatim, or general analysis.") (define-public tippecanoe (package (name "tippecanoe") - (version "1.31.5") + (version "1.36.0") (source (origin (method git-fetch) @@ -1111,14 +1111,14 @@ map, geocoding with Nominatim, or general analysis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m0x931a945sr7axyhcvpwh798m58hx1zxh6ikgf9gsgqhdhmszz")))) + (base32 "0lbmhly4ivnqc6qk1k3sdqvsg6x3nfd8gnjx846bhqj4wag3f88m")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (delete 'configure)) #:test-target "test" #:make-flags - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (inputs `(("perl" ,perl) -- cgit v1.2.3 From a6c6079babdc894f82626f2f64bd3515082eabe5 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 3 Apr 2021 17:52:31 +0200 Subject: gnu: rust-rand-core: Update to 0.6.2. Version 0.6.1 was yanked. * gnu/packages/crates-io.scm(rust-rand-core): Update to 0.6.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 32440e2fe5..a20073ae9d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31368,14 +31368,14 @@ useful types and distributions, and some randomness-related algorithms.") (define-public rust-rand-core-0.6 (package (name "rust-rand-core") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (crate-uri "rand_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rfjrcyaj7blz2nawv2pypm5kqc59p80n6f5pg691399iggxf9n0")))) + (base32 "1rvas1afjvd2827b8mf2ilg78h3ksl9npkrdds3wbw9x33mndkrl")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit v1.2.3 From 29d2c9064c8670d652de1af63dd6d10111f810a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 01:10:59 +0200 Subject: gnu: diffoscope: Update to 172. * gnu/packages/diffoscope.scm (diffoscope): Update to 172. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 0b2779d288..d5f782e68d 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "171") + (version "172") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1niz481s8i86ql56kfmnyzh0nwinhpzhprfkljwdprqi6hc63v0c")))) + "1lglxn9h8s7kvmfd2rsyhrcv3y8a4bppbxr9nf2sgnlbdln1vwqq")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From e7c0011d2a1b3d95d99c3dce09bcddb72cac498e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 01:11:08 +0200 Subject: gnu: vim: Update to 8.2.2689. * gnu/packages/vim.scm (vim): Update to 8.2.2689. --- gnu/packages/vim.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 92ce1213c4..231fae9298 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -71,7 +71,7 @@ (define-public vim (package (name "vim") - (version "8.2.2677") + (version "8.2.2689") (source (origin (method git-fetch) (uri (git-reference @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "13y58h0nnd5jpqk8nhpcdhg6m2drfnrfbiv4cjh9qmkjw47i0qir")))) + "0l0hkr8cw7fdsfc5zzcxx3q1wmv9k3hrgalvffq0l69lviqdgh0p")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 4f3813f324cfb14bf77416836bb17dd557d721df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:07:00 +0200 Subject: gnu: perl-crypt-rijndael: Update to 1.16. * gnu/packages/perl.scm (perl-crypt-rijndael): Update to 1.16. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index bf6dabf611..f0df5e6d04 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2213,7 +2213,7 @@ Password Generator\".") (define-public perl-crypt-rijndael (package (name "perl-crypt-rijndael") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) @@ -2221,7 +2221,7 @@ Password Generator\".") "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-" version ".tar.gz")) (sha256 - (base32 "0qs1b6ma4sj0ip5d8544fzgc1bbankc4qlmznp8hay8dk5arp650")))) + (base32 "0h2dr1bd15y0sipxsdh1k4hx5bccywn15haj0xpjmf0471g0hh35")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Crypt-Rijndael") (synopsis "Crypt::CBC compliant Rijndael encryption module") -- cgit v1.2.3 From aa4373c177d2e5e0bde3276eb283a07bf8f0a4e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:07:08 +0200 Subject: gnu: perl-digest-hmac: Update to 1.04. * gnu/packages/perl.scm (perl-digest-hmac): Update to 1.04. --- gnu/packages/perl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f0df5e6d04..a061c715f9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3771,15 +3771,14 @@ for CRC-CCITT, CRC-16 and CRC-32.") (define-public perl-digest-hmac (package (name "perl-digest-hmac") - (version "1.03") + (version "1.04") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/G/GA/GAAS/" + (uri (string-append "mirror://cpan/authors/id/A/AR/ARODLAND/" "Digest-HMAC-" version ".tar.gz")) (sha256 - (base32 - "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv")))) + (base32 "1m4fn0w3hb4vn7k5kja508a5hjmcrm28zhdpjkbl8p17m9b83g6n")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Digest-HMAC") (synopsis "Keyed-Hashing for Message Authentication") -- cgit v1.2.3 From 2a28f0d634e1e894393c73d8023207b384f26781 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:07:21 +0200 Subject: gnu: perl-scalar-list-utils: Update to 1.56. * gnu/packages/perl.scm (perl-scalar-list-utils): Update to 1.56. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a061c715f9..fba8d28011 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -11152,14 +11152,14 @@ files, using JSON::PP and/or CPAN::Meta::YAML.") (define-public perl-scalar-list-utils (package (name "perl-scalar-list-utils") - (version "1.53") + (version "1.56") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PE/PEVANS/" "Scalar-List-Utils-" version ".tar.gz")) (sha256 - (base32 "16dfpnrcf5846j998rdd6gra16m9030rnz9fpsh1hfzvcsq8ch5x")))) + (base32 "0nxb29x7i2w6kjxq188n131b56bsqj1ykrxjcjp6sgpv81ym7f0m")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Scalar-List-Utils") (synopsis "Common Scalar and List utility subroutines") -- cgit v1.2.3 From b805d4c4199f3605c0f4a8730861e63bab9ba686 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:07:29 +0200 Subject: gnu: mousepad: Update to 0.5.4. * gnu/packages/xfce.scm (mousepad): Update to 0.5.4. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e0ace027fb..38240d7b9f 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1206,7 +1206,7 @@ of data to either CD/DVD/BD.") (define-public mousepad (package (name "mousepad") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/mousepad/" @@ -1214,7 +1214,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "1a6a3x4h6aisjm59i0afx1w50035s76zjr4a6p9ja5bax6wqn877")))) + "189aljqgkrspqk9498izgvssw08pgkyvf7hc7ddmzfhcblp4j3yr")))) (build-system gnu-build-system) (arguments '(#:configure-flags '(;; Use the GSettings keyfile backend rather than -- cgit v1.2.3 From 77038ad4f105c9ecee74fdd5c597f727a1956afd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:40:28 +0200 Subject: gnu: terminator: Update to 2.1.1. * gnu/packages/gnome.scm (terminator): Update to 2.1.1. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ed6d433cf9..34f5078581 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10895,7 +10895,7 @@ advanced image management tool") (define-public terminator (package (name "terminator") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) @@ -10903,8 +10903,7 @@ advanced image management tool") "releases/download/v" version "/" name "-" version ".tar.gz")) (sha256 - (base32 - "1vap4li2i24l1iz2q4b8wvhj8flamarf18xcmzq5ik2vzcrisbjy")))) + (base32 "0xdgmam7ghnxw6g38a4gjw3kk3rhga8c66lns18k928jlr9fmddw")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From b495254efbe79d8240bec844c83baede897b5707 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 22:06:17 +0200 Subject: gnu: knot-resolver: Update to 5.3.1. * gnu/packages/dns.scm (knot-resolver): Update to 5.3.1. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 6d146e6264..afdf2867a7 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -943,14 +943,14 @@ synthesis, and on-the-fly re-configuration.") (define-public knot-resolver (package (name "knot-resolver") - (version "5.3.0") + (version "5.3.1") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-resolver/" "knot-resolver-" version ".tar.xz")) (sha256 (base32 - "0gp3ivv3zccz4b6s1wxbsvvlrc837lw2g089l3cbvzsg7z0b4v7v")))) + "1j99sz6r1hdvvd8rffx1917r9cyb7z46ivp5934sq57irmxnnkcx")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 58beda01217c48da52e67ac5461f33b6532b5ede Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 3 Apr 2021 20:37:11 +0200 Subject: services: guix-publish: Add zstd compression by default. That way, the default config with (advertises? #t) and without a cache will offer zstd-compressed substitutes, which should lead to much higher throughput than gzip. * gnu/services/base.scm (default-compression): When 'guix-publish-configuration-cache' returns true, use higher level compression ratios. Add "zstd". * doc/guix.texi (Base Services): Mention zstd. --- doc/guix.texi | 2 +- gnu/services/base.scm | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index da18b45cf9..bada446357 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15646,7 +15646,7 @@ This allows neighboring Guix devices with discovery on (see @code{guix-configuration} above) to discover this @command{guix publish} instance and to automatically download substitutes from it. -@item @code{compression} (default: @code{'(("gzip" 3))}) +@item @code{compression} (default: @code{'(("gzip" 3) ("zstd" 3))}) This is a list of compression method/level tuple used when compressing substitutes. For example, to compress all substitutes with @emph{both} lzip at level 7 and gzip at level 9, write: diff --git a/gnu/services/base.scm b/gnu/services/base.scm index a8214ae96f..24b3ea785b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1816,7 +1816,11 @@ proxy of 'guix-daemon'...~%") raise a deprecation warning if the 'compression-level' field was used." (match (%guix-publish-configuration-compression-level config) (#f - '(("gzip" 3))) + ;; Default to low compression levels when there's no cache so that users + ;; get good bandwidth by default. + (if (guix-publish-configuration-cache config) + '(("gzip" 5) ("zstd" 19)) + '(("gzip" 3) ("zstd" 3)))) ;zstd compresses faster (level (warn-about-deprecation 'compression-level properties #:replacement 'compression) -- cgit v1.2.3 From 2161820ebbbab62a5ce76c9101ebaec54dc61586 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 30 Mar 2021 22:36:14 +0200 Subject: activation: Do not dereference symlinks during home directory creation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/build/activation.scm (copy-account-skeletons): Do not chown the home directory; leave this to 'activate-user-home'. (activate-user-home): Only chown the home directory after the account skeletons have been copied. Co-authored-by: Ludovic Courtès . --- gnu/build/activation.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index 6cb6f8819b..2af1d44b5f 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -107,7 +107,8 @@ Warning: this is currently suspect to a TOCTTOU race!" (directory %skeleton-directory) uid gid) "Copy the account skeletons from DIRECTORY to HOME. When UID is an integer, -make it the owner of all the files created; likewise for GID." +make it the owner of all the files created except the home directory; likewise +for GID." (define (set-owner file) (when (or uid gid) (chown file (or uid -1) (or gid -1)))) @@ -115,7 +116,6 @@ make it the owner of all the files created; likewise for GID." (let ((files (scandir directory (negate dot-or-dot-dot?) string Date: Fri, 2 Apr 2021 23:50:31 +0200 Subject: gnu: zabbix-agentd: Update to 5.2.6 [fixes CVE-2021-27927]. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 5.2.6. --- gnu/packages/monitoring.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 46e1903704..22b02a561b 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -160,7 +160,7 @@ etc. via a Web interface. Features include: (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "5.2.5") + (version "5.2.6") (source (origin (method url-fetch) @@ -168,7 +168,7 @@ etc. via a Web interface. Features include: "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "1iaby7rablakx91hajnkmjcc4zkvrq7xsvlhss3lw5drm12rf3ff")))) + (base32 "100n1rv7r4pqagxxifzpcza5bhrr2fklzx7gndxwiyq4597p1jvn")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 9dc92bc679cf33e1aa0b9b0ae9de1d009df8e47a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 23:53:47 +0200 Subject: gnu: perl-moose: Update to 2.2015. * gnu/packages/perl.scm (perl-moose): Update to 2.2015. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index fba8d28011..af025593cd 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6699,14 +6699,14 @@ Moose and is optimised for rapid startup.") (define-public perl-moose (package (name "perl-moose") - (version "2.2012") + (version "2.2015") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Moose-" version ".tar.gz")) (sha256 (base32 - "0s9m2pskc8h1k94pbvx0lvf0xgv9xca349isbcsrqdqnkmxf9fs6")))) + "05gma3q3l15igqrqi8ax8v5cmmvy7s939q3xzs45l1rc7sfx6yd6")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit v1.2.3 From 719dd9b45f26a0b987f10665f45cdc8af3b2e7f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 00:24:44 +0200 Subject: gnu: perl-pdf-api2: Update to 2.039. * gnu/packages/perl.scm (perl-pdf-api2): Update to 2.039. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index af025593cd..f1bc21986e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8309,7 +8309,7 @@ with file paths.") (define-public perl-pdf-api2 (package (name "perl-pdf-api2") - (version "2.038") + (version "2.039") (source (origin (method url-fetch) (uri (string-append @@ -8317,7 +8317,7 @@ with file paths.") version ".tar.gz")) (sha256 (base32 - "02dxz798sx0ncdphjrfvfl2a3c1lkplyriyk4psq99q2kdsc8ivl")))) + "08x1anlvmxwym081flkrz7wr9q89y9wbq8ajqk72xsbzhhc479rn")))) (build-system perl-build-system) (native-inputs `(("perl-test-exception" ,perl-test-exception) -- cgit v1.2.3 From b692a1bb45fc32bb88e4d897ce342015251943e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 13:11:40 +0200 Subject: gnu: corkscrew: Update to 2.0-0.268b71e. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (corkscrew)[source]: Fetch from elsewhere. [arguments]: Add #:configure-flags of ‘--enable-ssl’. Add a new 'update-metadata phase. Remove the custom 'configure phase. [native-inputs]: Add autoconf, automake, and pkg-config. [inputs]: Add openssl. [description]: Update accordingly. --- gnu/packages/ssh.scm | 93 ++++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 42 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 68590e2fe5..fae10d0e16 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -403,48 +403,57 @@ libssh library.") (deprecated-package "guile3.0-ssh" guile-ssh)) (define-public corkscrew - (package - (name "corkscrew") - (version "2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/patpadgett/corkscrew") - (commit (string-append "v" version)))) - (sha256 - (base32 "0g4pkczrc1zqpnxyyjwcjmyzdj5qqcpzwf1bm3965zdwp94bpppf")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - ;; Replace configure phase as the ./configure script does not like - ;; CONFIG_SHELL and SHELL passed as parameters. - (lambda* (#:key outputs build target #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (which "bash")) - ;; Set --build and --host flags as the provided config.guess - ;; is not able to detect them. - (flags `(,(string-append "--prefix=" out) - ,(string-append "--build=" build) - ,(string-append "--host=" (or target build))))) - (setenv "CONFIG_SHELL" bash) - (apply invoke bash "./configure" flags)))) - (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) - (install-file "README.markdown" doc) - #t)))))) - (home-page "https://github.com/patpadgett/corkscrew") - (synopsis "SSH tunneling through HTTP(S) proxies") - (description - "Corkscrew tunnels SSH connections through most HTTP and HTTPS proxies. -Proxy authentication is only supported through the plain-text HTTP basic -authentication scheme.") - (license license:gpl2+))) + ;; The last 2.0 release hails from 2009. Use a fork (submitted upstream as + ;; ) that adds now-essential + ;; IPv6 and TLS support. + (let ((revision "0") + (commit "268b71e88ee51fddceab96d665b327394f1feb12")) + (package + (name "corkscrew") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rtgill82/corkscrew") + (commit commit))) + (sha256 + (base32 "1rylbimlfig3ii4bqr4r058lkc43pqkxnxqpqdpm31blh3xs0dcw")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-ssl") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'update-metadata + (lambda _ + (substitute* "configure.ac" + ;; Our version differs significantly. + (("2.0") (string-append ,version " (Guix)"))) + (substitute* "corkscrew.c" + ;; This domain's since been squat. + (("\\(agroman@agroman\\.net\\)") + (format #f "<~a>" ,(package-home-page this-package)))))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (install-file "README.md" doc) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("openssl" ,openssl))) + (home-page "https://github.com/patpadgett/corkscrew") + (synopsis "SSH tunneling through HTTP(S) proxies") + (description + "Corkscrew tunnels SSH connections through most HTTP and HTTPS proxies. +It supports proxy authentication through the HTTP basic authentication scheme +with optional @acronym{TLS, Transport-Level Security} to protect credentials.") + (license license:gpl2+)))) (define-public mosh (package -- cgit v1.2.3 From aaec5de3a7bcef35421bc801e0f747daa8dbfb5c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 13:24:04 +0200 Subject: gnu: ugrep: Update to 3.1.11. * gnu/packages/search.scm (ugrep): Update to 3.1.11. --- gnu/packages/search.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index d458747872..0d603ad360 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -420,14 +420,14 @@ bibliographic data and simple document and bibtex retrieval.") (define-public ugrep (package (name "ugrep") - (version "3.1.4") + (version "3.1.11") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Genivia/ugrep") (commit (string-append "v" version)))) (sha256 - (base32 "1ydnpdhn1mp2pnbqzvwabrp573626k89kbv97fax6y1bz2pamrg4")) + (base32 "1g3sxnrcaz1jxwa8nwrxpr63g4y0ha5zcf10053ciy9wjh6wqs1w")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -446,13 +446,13 @@ bibliographic data and simple document and bibtex retrieval.") ("pcre2" ,pcre2) ("zlib" ,zlib))) (arguments - `(#:tests? #f ;; No script for re-building the binary test input-files + `(#:tests? #f ; no way to rebuild the binary input files #:test-target "test" #:phases (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ - ;; unpatch shepengs in tests + ;; Unpatch shebangs in tests. (substitute* '("tests/Hello.bat" "tests/Hello.sh") (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) -- cgit v1.2.3 From c23136bfadf14c608e00614031bfaf41756d7849 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 14:18:11 +0200 Subject: gnu: drumstick: Remove unused ‘-DLIB_SUFFIX=’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (drumstick)[arguments]: Remove #:configure-flags. --- gnu/packages/music.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 41e9372c6f..206241a13b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2650,7 +2650,6 @@ browser.") (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target - #:configure-flags '("-DLIB_SUFFIX=") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-docbook -- cgit v1.2.3 From 494d5f79e7cb6db41267b39398b808f408355899 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 14:58:06 +0200 Subject: gnu: drumstick: Update to 2.1.1. * gnu/packages/music.scm (drumstick): Update to 2.1.1. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 206241a13b..4bad86e1a2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2639,14 +2639,14 @@ browser.") (define-public drumstick (package (name "drumstick") - (version "2.0.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/drumstick/" version "/drumstick-" version ".tar.bz2")) (sha256 (base32 - "088j0w3kr9i4lh78y0js0q8adlfzkr89xq2dxc8y3bafsgihax1x")))) + "06lz4kzpgg5lalcjb14pi35jxca5f4j6ckqf6mdxs1k42dfhjpjp")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From f047efce430aa997cc2e6c918bdb5aeb1de6fe3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 15:11:46 +0200 Subject: gnu: vmpk: Update to 0.8.2. * gnu/packages/music.scm (vmpk): Update to 0.8.2. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4bad86e1a2..41e2043c6b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2686,14 +2686,14 @@ backends, including ALSA, OSS, Network and FluidSynth.") (define-public vmpk (package (name "vmpk") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/vmpk/vmpk/" version "/vmpk-" version ".tar.bz2")) (sha256 (base32 - "0wn45c4sbvan7schq93zmsgg5fcf144mbbawxn5kq699vrbc3473")))) + "1kv256j13adk4ib7r464gsl4vjhih820bq37ddhqfyfd07wh53a2")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target -- cgit v1.2.3 From 51c03ff26552775b8b6f2ce1ba1edf37df0ed8a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 15:16:35 +0200 Subject: gnu: perl-path-tiny: Update to 0.118. * gnu/packages/perl.scm (perl-path-tiny): Update to 0.118. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f1bc21986e..4d54912a56 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8284,14 +8284,14 @@ file names.") (define-public perl-path-tiny (package (name "perl-path-tiny") - (version "0.108") + (version "0.118") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAGOLDEN/" "Path-Tiny-" version ".tar.gz")) (sha256 (base32 - "1x9zf8r3cynf4vqlycyyspsr70v4zw6bk9bkgvfpvsxkw8mlhj9w")))) + "1zdhc3azw6wn21db3yyygs57vlqkx72ipyd8sa21m72c1y6qs4rj")))) (build-system perl-build-system) (arguments `(#:tests? #f)) ; Tests require additional test modules to be packaged -- cgit v1.2.3 From b5d7ea6f37186905931374a7cbbca23af6e8eec8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 15:19:17 +0200 Subject: gnu: drumstick: Use new HTTPS home page. * gnu/packages/music.scm (drumstick)[home-page]: Update & use HTTPS. --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 41e2043c6b..89a8a56965 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2672,7 +2672,7 @@ browser.") ("docbook-xsl" ,docbook-xsl) ("doxygen" ,doxygen) ("graphviz" ,graphviz))) ; for dot - (home-page "http://drumstick.sourceforge.net/") + (home-page "https://drumstick.sourceforge.io/") (synopsis "C++ MIDI library") (description "Drumstick is a set of MIDI libraries using C++/Qt5 idioms and style. It -- cgit v1.2.3 From b7aca04856ffcbacb4179b3c485c20403bd19787 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Apr 2021 16:05:33 +0300 Subject: gnu: go-github-com-sirupsen-logrus: Update to 1.8.1. * gnu/packages/golang.scm (go-github-com-sirupsen-logrus): Update to 1.8.1. [propagated-inputs]: Add go-github-com-davecgh-go-spew, go-github-com-pmezard-go-difflib. Sort alphabetically. [arguments]: Enable test suite. --- gnu/packages/golang.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d9988cd7ad..904f16539e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016, 2019 Ludovic Courtès @@ -2099,7 +2099,7 @@ application's http.Handlers.") (define-public go-github-com-sirupsen-logrus (package (name "go-github-com-sirupsen-logrus") - (version "1.0.5") + (version "1.8.1") (source (origin (method git-fetch) @@ -2109,17 +2109,16 @@ application's http.Handlers.") (file-name (git-file-name name version)) (sha256 (base32 - "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz")))) + "0rvqzic2zz7fpxyizmqxwmhv1m52ii9bgxnqa6km8wsa0l08wh42")))) (build-system go-build-system) (propagated-inputs - `(("go-golang-org-x-crypto" - ,go-golang-org-x-crypto) - ("go-github-com-stretchr-testify" - ,go-github-com-stretchr-testify) + `(("go-github-com-davecgh-go-spew" ,go-github-com-davecgh-go-spew) + ("go-github-com-pmezard-go-difflib" ,go-github-com-pmezard-go-difflib) + ("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-sys" ,go-golang-org-x-sys))) (arguments - '(#:tests? #f ;FIXME missing dependencies - #:import-path "github.com/sirupsen/logrus")) + '(#:import-path "github.com/sirupsen/logrus")) (home-page "https://github.com/sirupsen/logrus") (synopsis "Structured, pluggable logging for Go") (description "Logrus is a structured logger for Go, completely API -- cgit v1.2.3 From a4bf1b1a4d83a273c729184b2bcb2cd0525fe8c5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 4 Apr 2021 15:42:41 +0200 Subject: gnu: ncftp: Add 'release-monitoring-url' property. * gnu/packages/ftp.scm (ncftp)[properties]: New field. --- gnu/packages/ftp.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 9715c3e770..961ce3a464 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2018, 2021, 2021 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice @@ -118,6 +118,8 @@ reliability in mind.") (("a freeware program") "free software")) #t)))) + (properties + `((release-monitoring-url . "https://www.ncftp.com/download/"))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 51fa1b6ea5255b3b9112d0c9c86814019955a2a7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 4 Apr 2021 15:46:47 +0200 Subject: gnu: file: Add 'release-monitoring-url' property. * gnu/packages/file.scm (file)[properties]: New field. --- gnu/packages/file.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index bac951f9c5..3f1145b520 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -46,6 +46,8 @@ `(("self" ,this-package)) '())) + (properties + `((release-monitoring-url . "http://ftp.astron.com/pub/file/"))) (synopsis "File type guesser") (description "The file command is a file type guesser, a command-line tool that tells -- cgit v1.2.3 From 4a6271d95b62fe99327dcfa2dc30d6cc87db6a3e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Apr 2021 11:32:23 +0200 Subject: gnu: mpg321: Update source URL. * gnu/packages/mp3.scm (mpg321)[source]: Update URL to match what's on SourceForge. Add 'file-name'. --- gnu/packages/mp3.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index dadaccdd88..ff67d9e9e5 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2014, 2015, 2017, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2017, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Thomas Danckaert @@ -405,7 +405,8 @@ command-line tool as well as a C library, libmpg123.") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/mpg321/mpg321/" - version "/mpg321-" version ".tar.gz")) + version "/mpg321_" version ".orig.tar.gz")) + (file-name (string-append "mpg321-" version ".tar.gz")) (sha256 (base32 "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5")) -- cgit v1.2.3 From b6e5eb4d23d80d749462d3affde46f29e83c2a52 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Apr 2021 11:34:37 +0200 Subject: gnu: libffi: Add 'release-monitoring-url'. * gnu/packages/libffi.scm (libffi)[home-page]: Change to sourceware.org. [properties]: New field. --- gnu/packages/libffi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 6c434bbe90..d62a1588c1 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2020 Efraim Flashner @@ -103,7 +103,8 @@ to call code written in another language. The libffi library really only provides the lowest, machine dependent layer of a fully featured foreign function interface. A layer must exist above libffi that handles type conversions for values passed between the two languages.") - (home-page "http://sources.redhat.com/libffi/") + (home-page "http://www.sourceware.org/libffi/") + (properties `((release-monitoring-url . ,home-page))) ;; See . (license expat))) -- cgit v1.2.3 From dda0ada3849719f183ee158871d382b2f57f7a59 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Apr 2021 11:37:32 +0200 Subject: gnu: sloccount: Update source URL. * gnu/packages/code.scm (sloccount)[source, home-page]: Update. --- gnu/packages/code.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 4e30dacdf4..a79d8b4a2b 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2015, 2018, 2020 Ludovic Courtès +;;; Copyright © 2013, 2015, 2018, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner @@ -180,7 +180,7 @@ around in a large, deeply nested project.") (version "2.26") (source (origin (method url-fetch) - (uri (string-append "http://www.dwheeler.com/sloccount/sloccount-" + (uri (string-append "https://dwheeler.com/sloccount/sloccount-" version ".tar.gz")) (sha256 (base32 @@ -221,7 +221,7 @@ around in a large, deeply nested project.") #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (inputs `(("perl" ,perl))) - (home-page "http://www.dwheeler.com/sloccount/") + (home-page "https://dwheeler.com/sloccount/") (synopsis "Count physical source lines of code (SLOC)") (description "SLOCCount is a set of the programs for counting source lines of -- cgit v1.2.3 From f10634f15d109a54c39b56827bbf4618387c1e18 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Sun, 4 Apr 2021 06:09:26 -0700 Subject: gnu: Fix copyright symbol. * gnu/packages/crates-io.scm: Fix copyright line for Zheng Junjie. Signed-off-by: Mathieu Othacehe --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a20073ae9d..5d2ccc0731 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2021 aecepoglu -;;; Copyright @ 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. -- cgit v1.2.3 From b54fc8f54ed77341dd64d983cbcb66cc642acbc2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 3 Apr 2021 21:39:56 +0100 Subject: gnu: sbcl-golden-utils: Update to 0.0.0-2.62a5cb9. * gnu/packages/lisp-xyz.scm (sbcl-golden-utils): Update to 0.0.0-2.62a5cb9. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9eb937314e..f206eec456 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -161,8 +161,8 @@ collection.") (sbcl-package->cl-source-package sbcl-bodge-utilities)) (define-public sbcl-golden-utils - (let ((commit "9424419d867d5c2f819196ee41667a818a5058e7") - (revision "1")) + (let ((commit "62a5cb948a011eb26e7a89f56d5839a3334b4100") + (revision "2")) (package (name "sbcl-golden-utils") (version (git-version "0.0.0" revision commit)) @@ -172,9 +172,9 @@ collection.") (uri (git-reference (url "https://git.mfiano.net/mfiano/golden-utils") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "golden-utils" version)) (sha256 - (base32 "15x0phm6820yj3h37ibi06gjyh6z45sd2nz2n8lcbfflwm086q0h")))) + (base32 "13mvxqwd1nmpq8h5hb1s60wyqdj7ji4haxrqr0sy3csyqa8aq2j8")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria))) -- cgit v1.2.3 From 17c11ae958e5d444549aa4c7589565c092d2ea82 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 3 Apr 2021 22:22:29 +0100 Subject: gnu: Add cl-cpus. * gnu/packages/lisp-xyz.scm (sbcl-cl-cpus, cl-cpus, ecl-cl-cpus): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f206eec456..718d7c429f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15335,6 +15335,35 @@ line tool @code{df} and get disk space information using @code{statvfs}.") (define-public cl-diskspace (sbcl-package->cl-source-package sbcl-cl-diskspace)) +(define-public sbcl-cl-cpus + (package + (name "sbcl-cl-cpus") + (version "0.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/muyinliu/cl-cpus") + (commit (string-append "v" version)))) + (file-name (git-file-name "cl-cpus" version)) + (sha256 + (base32 "0sdaff9hpsx7bpkkkqavmxmrrlc2d61gmqjjgn8xchncng4a0rf8")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cffi" ,sbcl-cffi))) + (home-page "https://github.com/muyinliu/cl-cpus") + (synopsis "Common Lisp feature to get number of CPUs") + (description + "This package provides a Common Lisp system which has only one function to +return the CPU count of the current system.") + (license license:isc))) + +(define-public ecl-cl-cpus + (sbcl-package->ecl-package sbcl-cl-cpus)) + +(define-public cl-cpus + (sbcl-package->cl-source-package sbcl-cl-cpus)) + (define-public sbcl-fof (package (name "sbcl-fof") -- cgit v1.2.3 From acaf97abae63f664d20c38e88d46ae529b249e8f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 3 Apr 2021 21:57:54 +0100 Subject: gnu: Add cl-shadow. * gnu/packages/lisp-xyz.scm (sbcl-shadow, cl-shadow, ecl-shadow): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 718d7c429f..ae6f1b204d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15646,3 +15646,42 @@ OpenGL (Mesa), GLU and GLUT (FreeGLUT) APIs using CFFI.") (define-public cl-opengl (sbcl-package->cl-source-package sbcl-cl-opengl)) + +(define-public sbcl-shadow + (let ((commit "b2031adbfba3579b48c9d39ad997e19b79b6852f") + (revision "1")) + (package + (name "sbcl-shadow") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.mfiano.net/mfiano/shadow") + (commit commit))) + (file-name (git-file-name "shadow" version)) + (sha256 + (base32 "0w1i734gkdkziin74ql2nhx7jdjxx02ylssaa6qdrvnj4br1124a")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cffi" ,sbcl-cffi) + ("cl-opengl" ,sbcl-cl-opengl) + ("glsl-packing" ,sbcl-glsl-packing) + ("golden-utils" ,sbcl-golden-utils) + ("static-vectors" ,sbcl-static-vectors) + ("varjo" ,sbcl-varjo))) + (home-page "https://git.mfiano.net/mfiano/shadow") + (synopsis "Management system for OpenGL shader programs") + (description + "This package provides a Common Lisp library for defining OpenGL shader +programs. There are also functions for referencing shader programs by name, +querying for basic information about them, modifying uniform variables +throughout the lifecycle of an OpenGL application, and managing certain OpenGL +buffer object types (UBO, SSBO currently).") + (license license:expat)))) + +(define-public ecl-shadow + (sbcl-package->ecl-package sbcl-shadow)) + +(define-public cl-shadow + (sbcl-package->cl-source-package sbcl-shadow)) -- cgit v1.2.3 From 49d40b9e3d219052a05b8e6c4a5dca6317c61b4d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 3 Apr 2021 22:09:41 +0100 Subject: gnu: Add cl-umbra. * gnu/packages/lisp-xyz.scm (sbcl-umbra, cl-umbra, ecl-umbra): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ae6f1b204d..fe86cc8b18 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15685,3 +15685,36 @@ buffer object types (UBO, SSBO currently).") (define-public cl-shadow (sbcl-package->cl-source-package sbcl-shadow)) + +(define-public sbcl-umbra + (let ((commit "d6ef2f6cbfa26180929061129eaf325bf17f73d8") + (revision "1")) + (package + (name "sbcl-umbra") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.mfiano.net/mfiano/umbra") + (commit commit))) + (file-name (git-file-name "umbra" version)) + (sha256 + (base32 "04vyh2j00zdpb8ryxr8g81wjcmqlz9wrn55r3cypcj4qg970r5wi")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("golden-utils" ,sbcl-golden-utils) + ("shadow" ,sbcl-shadow) + ("varjo" ,sbcl-varjo))) + (home-page "https://git.mfiano.net/mfiano/umbra") + (synopsis "Common Lisp library of reusable GPU shader functions") + (description + "This is a Common Lisp library consisting of a collection of useful GPU +shader functions, written with @code{Shadow}.") + (license license:expat)))) + +(define-public ecl-umbra + (sbcl-package->ecl-package sbcl-umbra)) + +(define-public cl-umbra + (sbcl-package->cl-source-package sbcl-umbra)) -- cgit v1.2.3 From bab809cef0600a1c5d0c7d3fc5d434435b4c5688 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Thu, 1 Apr 2021 23:07:18 +0200 Subject: gnu: suitesparse: Update to 5.9.0. * gnu/packages/maths.scm (suitesparse): Update to 5.9.0. [arguments]: Use cc-for-target instead of hard-coding gcc. Signed-off-by: Efraim Flashner --- gnu/packages/maths.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2e072e7d82..5cd11ec435 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Felix Gruber +;;; Copyright © 2020, 2021 Felix Gruber ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Nicolò Balzarotti @@ -3910,7 +3910,7 @@ Fresnel integrals, and similar related functions as well.") (define-public suitesparse (package (name "suitesparse") - (version "5.8.1") + (version "5.9.0") (source (origin (method git-fetch) @@ -3920,7 +3920,7 @@ Fresnel integrals, and similar related functions as well.") (file-name (git-file-name name version)) (sha256 (base32 - "0qjlyfxs8s48rs63c2fzspisgq1kk4bwkgnhmh125hgkdhrq2w1c")) + "1zhkix58afw92s7p291prljdm3yi0pjg1kbi3lczdb8rb14jkz5n")) (patches (search-patches "suitesparse-mongoose-cmake.patch")) (modules '((guix build utils))) (snippet @@ -3930,9 +3930,9 @@ Fresnel integrals, and similar related functions as well.") #t)))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;no "check" target + `(#:tests? #f ;no "check" target #:make-flags - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) "TBB=-ltbb" "MY_METIS_LIB=-lmetis" ;; Flags for cmake (required to build GraphBLAS and Mongoose) -- cgit v1.2.3 From b6acaa1c2e0726f3e3f525fd5bffcb1c9753b38b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Apr 2021 15:09:54 +0300 Subject: gnu: go-github-com-puerkitobio-goquery: Adjust inputs. * gnu/packages/golang.scm (go-github-com-puerkitobio-goquery) [native-inputs]: Move all inputs ... [propagated-inputs]: ... to here. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 904f16539e..278a2efa00 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5504,7 +5504,7 @@ the parse trees produced by the html package.") (build-system go-build-system) (arguments `(#:import-path "github.com/PuerkitoBio/goquery")) - (native-inputs + (propagated-inputs `(("go-github-com-andybalholm-cascadia" ,go-github-com-andybalholm-cascadia) ("go-golang-org-x-net" ,go-golang-org-x-net))) (home-page "https://github.com/PuerkitoBio/goquery") -- cgit v1.2.3 From fffa137e6e46e073e23bc24542cca1e68a90e9a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 5 Apr 2021 15:47:54 +0200 Subject: gnu: perl-net-cidr-lite: Update to 0.22 [security fixes]. * gnu/packages/networking.scm (perl-net-cidr-lite): Update to 0.22. --- gnu/packages/networking.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7cbf1de9bf..133f525cb9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2098,22 +2098,19 @@ It is intended primarily for use in testing.") (define-public perl-net-cidr-lite (package (name "perl-net-cidr-lite") - (version "0.21") + (version "0.22") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-" + "mirror://cpan/authors/id/S/ST/STIGTSP/Net-CIDR-Lite-" version ".tar.gz")) (sha256 - (base32 - "14shj73zbqmfjbp0qz1fs9j4p2dpvz5hfkm4qfdjbydflbl2b8fg")))) + (base32 "05w57db2lx4djb4vixzdr6qgrzyzkk047nl812g7nq8s6k5xh5s3")))) (build-system perl-build-system) - (home-page - "https://metacpan.org/release/Net-CIDR-Lite") - (synopsis - "Perl extension for merging IPv4 or IPv6 CIDR addresses") + (home-page "https://metacpan.org/release/Net-CIDR-Lite") + (synopsis "Perl extension for merging IPv4 or IPv6 CIDR addresses") (description "Net::CIDR::Lite merges IPv4 or IPv6 CIDR addresses.") (license license:gpl1+))) -- cgit v1.2.3 From d8e6486877643d7d948557badc614c2b844a6d85 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 19 Mar 2021 14:24:49 -0400 Subject: gnu: chez-scheme: Update nanopass to 1.9.2. * gnu/packages/chez.scm (nanopass): Update nanopass to 1.9.2. Signed-off-by: Leo Prikler --- gnu/packages/chez.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index eac556c4d0..3918e7741d 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Brendan Tildesley +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,13 +44,13 @@ #:use-module (srfi srfi-1)) (define nanopass - (let ((version "1.9.1")) + (let ((version "1.9.2")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/nanopass/nanopass-framework-scheme") (commit (string-append "v" version)))) - (sha256 (base32 "1synadgaycca39jfx525975ss9y0lkl516sdrc62wrrllamm8n21")) + (sha256 (base32 "16vjsik9rrzbabbhbxbaha51ppi3f9n8rk59pc6zdyffs0vziy4i")) (file-name (git-file-name "nanopass" version))))) (define stex -- cgit v1.2.3 From 6f71fd4a5e9f2ccd0ae8b78cdb59d53e9cde9544 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 19 Mar 2021 14:24:50 -0400 Subject: gnu: chez-scheme: Update stex. Get a patch from upstream that will help us simplify the build process for the Chez Scheme documentation. * gnu/packages/chez.scm (chez-stex): Update to commit 5405149. Signed-off-by: Leo Prikler --- gnu/packages/chez.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 3918e7741d..b0b9abfd05 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -54,13 +54,17 @@ (file-name (git-file-name "nanopass" version))))) (define stex - (let ((version "1.2.2")) + ;; This commit includes a fix, which we would otherwise want to use as + ;; patch. Let's revert to tagged releases as soon as one becomes available. + (let* ((commit "54051494434a197772bf6ca5b4e6cf6be55f39a5") + (version "1.2.2") + (version (git-version version "1" commit))) (origin (method git-fetch) (uri (git-reference (url "https://github.com/dybvig/stex") - (commit (string-append "v" version)))) - (sha256 (base32 "1q5i8pf4cdfjsj6r2k1rih7ljbfggyxdng2p2fvsgarzihpsin2i")) + (commit commit))) + (sha256 (base32 "01jnvw8qw33gnpzwrakwhsr05h6b609lm180jnspcrb7lds2p23d")) (file-name (git-file-name "stex" version))))) (define-public chez-scheme -- cgit v1.2.3 From e29b1fff1d8147623ab149fca7b0cc42a376bf62 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 19 Mar 2021 14:24:51 -0400 Subject: gnu: chez-scheme: simplify packaging Take advantage of patches that have been accepted upstream. These changes lay a foundation for reusing more of Chez's build process for Racket. * gnu/packages/patches/chez-scheme-build-util-paths-backport.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/chez.scm (chez-scheme)[source](patches): Use it. [source](snippet): Remove bundled libraries here, not in configure phase. [inputs]: Organize. Move "nanopass", "stex", and "xorg-rgb" to ... [native-inputs]: ... this field. [arguments]: Add (ice-9 ftw) to #:modules. Remove unneeded 'patch-processor-detection' phase. Add 'unpack-nanopass+stex' phase (refactored from 'configure'). Simplify 'configure' phase by removing patches that have been upstreamed. Add "--nogzip-man-pages" flag so we can remove 'make-manpages-writable' phase. Stop ignoring #:configure-flags, move "--threads" there, and remove unneeded workaround. Add 'prepare-stex' phase (refactored from 'install-doc'). Use it to streamline 'install-doc' phase, installing all of the right files into the right places. Signed-off-by: Leo Prikler --- gnu/local.mk | 1 + gnu/packages/chez.scm | 246 ++++--- .../chez-scheme-build-util-paths-backport.patch | 780 +++++++++++++++++++++ 3 files changed, 923 insertions(+), 104 deletions(-) create mode 100644 gnu/packages/patches/chez-scheme-build-util-paths-backport.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a1a08fa911..1d7133667d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -887,6 +887,7 @@ dist_patch_DATA = \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ + %D%/packages/patches/chez-scheme-build-util-paths-backport.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index b0b9abfd05..1cd2cde71b 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -30,6 +30,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (gnu packages compression) #:use-module (gnu packages ncurses) @@ -79,21 +80,41 @@ (commit (string-append "v" version)))) (sha256 (base32 "0prgn2z9l888j93ydxaf04ph424g0fi3a8w7f8m0b2r7fr1v7388")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (patches + (search-patches + ;; backported from upstream: remove on next release + "chez-scheme-build-util-paths-backport.patch")) + (snippet + ;; remove bundled libraries + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (for-each (lambda (dir) + (when (directory-exists? dir) + (delete-file-recursively dir))) + '("stex" + "nanopass" + "lz4" + "zlib"))))))) (build-system gnu-build-system) (inputs - `(("ncurses" ,ncurses) - ("libuuid" ,util-linux "lib") - ("libx11" ,libx11) - ("lz4" ,lz4) - ("lz4:static" ,lz4 "static") - ("xorg-rgb" ,xorg-rgb) - ("nanopass" ,nanopass) + `(("libuuid" ,util-linux "lib") ("zlib" ,zlib) ("zlib:static" ,zlib "static") - ("stex" ,stex))) + ("lz4" ,lz4) + ("lz4:static" ,lz4 "static") + ;; for expeditor: + ("ncurses" ,ncurses) + ;; for X11 clipboard support in expeditor: + ;; https://github.com/cisco/ChezScheme/issues/9#issuecomment-222057232 + ("libx11" ,libx11))) (native-inputs - `(("texlive" ,(texlive-union (list texlive-latex-oberdiek + `(("nanopass" ,nanopass) ; source only + ;; for docs + ("stex" ,stex) + ("xorg-rgb" ,xorg-rgb) + ("texlive" ,(texlive-union (list texlive-latex-oberdiek texlive-generic-epsf))) ("ghostscript" ,ghostscript) ("netpbm" ,netpbm))) @@ -103,96 +124,54 @@ (files (list (string-append "lib/csv" version "-site")))))) (outputs '("out" "doc")) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 match)) + `(#:modules + ((guix build gnu-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 match)) #:test-target "test" #:configure-flags - (list ,(match (or (%current-target-system) (%current-system)) - ("x86_64-linux" '(list "--machine=ta6le")) - ("i686-linux" '(list "--machine=ti3le")) - ;; Let autodetection have its attempt on other architectures. - (_ - '()))) + '("--threads") ;; TODO when we fix armhf, it doesn't support --threads #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-processor-detection - (lambda _ (substitute* "configure" - (("uname -a") "uname -m")) - #t)) - ;; Adapt the custom 'configure' script. + ;; put these where configure expects them to be + (add-after 'unpack 'unpack-nanopass+stex + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (dep) + (define src + (assoc-ref (or native-inputs inputs) dep)) + (copy-recursively src dep + #:keep-mtime? #t)) + '("nanopass" "stex")) + #t)) + ;; NOTE: the custom Chez 'configure' script doesn't allow + ;; unrecognized flags, such as those automatically added + ;; by `gnu-build-system`. (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (nanopass (assoc-ref inputs "nanopass")) - (stex (assoc-ref inputs "stex")) - (lz4-static (assoc-ref inputs "lz4:static")) - (zlib-static (assoc-ref inputs "zlib:static")) - (unpack (assoc-ref %standard-phases 'unpack)) - (patch-source-shebangs - (assoc-ref %standard-phases 'patch-source-shebangs))) - (map (match-lambda - ((src orig-name new-name) - (with-directory-excursion "." - (apply unpack (list #:source src)) - (apply patch-source-shebangs (list #:source src))) - (delete-file-recursively new-name) - (invoke "mv" orig-name new-name))) - `((,nanopass "source" "nanopass") - (,stex "source" "stex"))) - ;; The configure step wants to CURL all submodules as it - ;; detects a checkout without submodules. Disable curling, - ;; and manually patch the needed modules for compilation. - (substitute* "configure" - (("! -f '") "-d '")) ; working around CURL. - (substitute* (find-files "mats" "Mf-.*") - (("^[[:space:]]+(cc ) *") "\tgcc ")) - (substitute* - (find-files "." (string-append - "(" - "Mf-[a-zA-Z0-9.]+" - "|Makefile[a-zA-Z0-9.]*" - "|checkin" - "|stex\\.stex" - "|newrelease" - "|workarea" - "|unix\\.ms" - "|^6\\.ms" - ;;"|[a-zA-Z0-9.]+\\.ms" ; guile can't read - ")")) - (("/bin/rm") (which "rm")) - (("/bin/ln") (which "ln")) - (("/bin/cp") (which "cp")) - (("/bin/echo") (which "echo"))) - (substitute* "makefiles/installsh" - (("/bin/true") (which "true"))) - (substitute* "stex/Makefile" - (("PREFIX=/usr") (string-append "PREFIX=" out))) - (invoke "./configure" "--threads" - (string-append "ZLIB=" zlib-static "/lib/libz.a") - (string-append "LZ4=" lz4-static "/lib/liblz4.a") - (string-append "--installprefix=" out))))) - ;; Installation of the documentation requires a running "chez". - (add-after 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version))) - (invoke "make" "docs") - (with-directory-excursion "csug" - (substitute* "Makefile" - ;; The ‘installdir=’ can't be overruled on the command line. - (("/tmp/csug9") doc) - ;; $m is the ‘machine type’, e.g. ‘ta6le’ on x86_64, but is - ;; set incorrectly for some reason, e.g. to ‘a6le’ on x86_64. - ;; Avoid the whole mess by running the (machine-independent) - ;; ‘installsh’ script at its original location. - (("\\$m/installsh") "makefiles/installsh")) - (invoke "make" "install") - (install-file "csug.pdf" doc)) - (with-directory-excursion "release_notes" - (install-file "release_notes.pdf" doc)) + (lambda* (#:key inputs outputs + (configure-flags '()) + #:allow-other-keys) + (let* ((zlib-static (assoc-ref inputs "zlib:static")) + (lz4-static (assoc-ref inputs "lz4:static")) + (out (assoc-ref outputs "out")) + ;; add flags which are always required: + (flags (cons* + (string-append "--installprefix=" out) + (string-append "ZLIB=" zlib-static "/lib/libz.a") + (string-append "LZ4=" lz4-static "/lib/liblz4.a") + ;; Guix will do compress man pages, + ;; and letting Chez try causes an error + "--nogzip-man-pages" + configure-flags))) + (format #t "configure flags: ~s~%" flags) + ;; Some makefiles (for tests) don't seem to propagate CC + ;; properly, so we take it out of their hands: + (setenv "CC" ,(cc-for-target)) + (apply invoke + "./configure" + flags) #t))) - ;; The binary file name is called "scheme" as the one from MIT/GNU + ;; The binary file name is called "scheme" as is the one from MIT/GNU ;; Scheme. We add a symlink to use in case both are installed. (add-after 'install 'install-symlink (lambda* (#:key outputs #:allow-other-keys) @@ -207,16 +186,75 @@ "/" name ".boot"))) (find-files lib "scheme.boot")) #t))) - (add-before 'reset-gzip-timestamps 'make-manpages-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files (string-append (assoc-ref outputs "out") - "/share/man") - ".*\\.gz$")) - #t))))) - ;; According to the documentation MIPS is not supported. - ;; Cross-compiling for the Raspberry Pi is supported, but not native ARM. + ;; Building explicitly lets us avoid using substitute* + ;; to re-write makefiles. + (add-after 'install-symlink 'prepare-stex + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (let* ((stex+version + (strip-store-file-name + (assoc-ref (or native-inputs inputs) "stex"))) + ;; Eventually we want to install stex as a real + ;; package so it's reusable. For now: + (stex-output "/tmp") + (doc-dir (string-append stex-output + "/share/doc/" + stex+version))) + (with-directory-excursion "stex" + (invoke "make" + "install" + (string-append "LIB=" + stex-output + "/lib/" + stex+version) + (string-append "Scheme=" + (assoc-ref outputs "out") + "/bin/scheme")) + (for-each (lambda (pth) + (install-file pth doc-dir)) + '("ReadMe" ; includes the license + "doc/stex.html" + "doc/stex.css" + "doc/stex.pdf")) + #t)))) + ;; Building the documentation requires stex and a running scheme. + ;; FIXME: this is probably wrong for cross-compilation + (add-after 'prepare-stex 'install-doc + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (let* ((chez+version (strip-store-file-name + (assoc-ref outputs "out"))) + (stex+version + (strip-store-file-name + (assoc-ref (or native-inputs inputs) "stex"))) + (scheme (string-append (assoc-ref outputs "out") + "/bin/scheme")) + ;; see note on stex-output in phase build-stex, above: + (stexlib (string-append "/tmp" + "/lib/" + stex+version)) + (doc-dir (string-append (assoc-ref outputs "doc") + "/share/doc/" + chez+version))) + (define* (stex-make #:optional (suffix "")) + (invoke "make" + "install" + (string-append "Scheme=" scheme) + (string-append "STEXLIB=" stexlib) + (string-append "installdir=" doc-dir suffix))) + (with-directory-excursion "csug" + (stex-make "/csug")) + (with-directory-excursion "release_notes" + (stex-make "/release_notes")) + (with-directory-excursion doc-dir + (symlink "release_notes/release_notes.pdf" + "release_notes.pdf") + (symlink "csug/csug9_5.pdf" + "csug.pdf")) + #t)))))) + ;; Chez Scheme does not have a MIPS backend. + ;; FIXME: Debian backports patches to get armhf working. + ;; We should too. It is the Chez machine type arm32le + ;; (no threaded version upstream yet, though there is in + ;; Racket's fork), more specifically (per the release notes) ARMv6. (supported-systems (fold delete %supported-systems '("mips64el-linux" "armhf-linux"))) (home-page "https://cisco.github.io/ChezScheme/") diff --git a/gnu/packages/patches/chez-scheme-build-util-paths-backport.patch b/gnu/packages/patches/chez-scheme-build-util-paths-backport.patch new file mode 100644 index 0000000000..aad2d99996 --- /dev/null +++ b/gnu/packages/patches/chez-scheme-build-util-paths-backport.patch @@ -0,0 +1,780 @@ +From 2447e047b750c3371778beb487f881641a582e66 Mon Sep 17 00:00:00 2001 +From: Philip McGrath +Date: Thu, 11 Mar 2021 18:17:47 -0500 +Subject: [PATCH] avoid hard-coded paths for utilities in build scripts + +Backported from +https://github.com/cisco/ChezScheme/commit/8f4633ce24ac6425b2ab13cc78026b1c9bb5361e + +Specific changes: + - `cc` -> `$(CC)` + - `/bin/rm` -> `rm` + - `/bin/ln` -> `ln` + - `/bin/cp` -> `cp` + - `/bin/echo` -> `echo` + - in `makefiles/installsh`, add a case to find `true` + at an unusual path or as a shell builtin + +Co-authored-by: Andy Keep +--- + LOG | 12 ++++++++++++ + csug/gifs/Makefile | 8 ++++---- + csug/math/Makefile | 4 ++-- + examples/Makefile | 2 +- + makefiles/Makefile-csug.in | 6 +++--- + makefiles/Makefile-release_notes.in | 2 +- + makefiles/Mf-install.in | 4 ++-- + makefiles/installsh | 3 ++- + mats/6.ms | 2 +- + mats/Mf-a6fb | 4 ++-- + mats/Mf-a6le | 4 ++-- + mats/Mf-a6nb | 4 ++-- + mats/Mf-a6ob | 4 ++-- + mats/Mf-a6osx | 4 ++-- + mats/Mf-arm32le | 4 ++-- + mats/Mf-i3fb | 4 ++-- + mats/Mf-i3le | 4 ++-- + mats/Mf-i3nb | 4 ++-- + mats/Mf-i3ob | 4 ++-- + mats/Mf-i3osx | 4 ++-- + mats/Mf-i3qnx | 4 ++-- + mats/Mf-ppc32le | 4 ++-- + mats/Mf-ta6fb | 4 ++-- + mats/Mf-ta6le | 4 ++-- + mats/Mf-ta6nb | 4 ++-- + mats/Mf-ta6ob | 4 ++-- + mats/Mf-ta6osx | 4 ++-- + mats/Mf-ti3fb | 4 ++-- + mats/Mf-ti3le | 4 ++-- + mats/Mf-ti3nb | 4 ++-- + mats/Mf-ti3ob | 4 ++-- + mats/Mf-ti3osx | 4 ++-- + mats/Mf-tppc32le | 4 ++-- + mats/unix.ms | 4 ++-- + newrelease | 22 +++++++++++----------- + pkg/Makefile | 2 +- + release_notes/gifs/Makefile | 6 +++--- + release_notes/math/Makefile | 4 ++-- + s/Mf-base | 2 +- + workarea | 10 +++++----- + 40 files changed, 101 insertions(+), 88 deletions(-) + +diff --git a/LOG b/LOG +index e1631df..399104d 100644 +--- a/LOG ++++ b/LOG +@@ -2119,3 +2119,15 @@ + bintar/Makefile rpm/Makefile pkg/Makefile wininstall/Makefile + wininstall/a6nt.wxs wininstall/i3nt.wxs wininstall/ta6nt.wxs + wininstall/ti3nt.wxs ++9.5.5 changes: ++- avoid hard-coded paths for utilities in build scripts ++ checkin csug/gifs/Makefile csug/math/Makefile examples/Makefile ++ makefiles/Makefile-csug.in makefiles/Makefile-release_notes.in ++ makefiles/Mf-install.in makefiles/installsh mats/6.ms mats/Mf-a6fb ++ mats/Mf-a6le mats/Mf-a6nb mats/Mf-a6ob mats/Mf-a6osx mats/Mf-arm32le ++ mats/Mf-i3fb mats/Mf-i3le mats/Mf-i3nb mats/Mf-i3ob mats/Mf-i3osx ++ mats/Mf-i3qnx mats/Mf-ppc32le mats/Mf-ta6fb mats/Mf-ta6le mats/Mf-ta6nb ++ mats/Mf-ta6ob mats/Mf-ta6osx mats/Mf-ti3fb mats/Mf-ti3le mats/Mf-ti3nb ++ mats/Mf-ti3ob mats/Mf-ti3osx mats/Mf-tppc32le mats/unix.ms newrelease ++ pkg/Makefile release_notes/gifs/Makefile release_notes/math/Makefile ++ s/Mf-base workarea +diff --git a/csug/gifs/Makefile b/csug/gifs/Makefile +index 8676e4c..4253ffd 100644 +--- a/csug/gifs/Makefile ++++ b/csug/gifs/Makefile +@@ -18,7 +18,7 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f $*.dvi $*.log *.aux ++ rm -f $*.dvi $*.log *.aux + test -f $*.gif && chmod 644 $*.gif + + # translate ps file to gif w/o transparent white background +@@ -28,7 +28,7 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif > $*.gif +- /bin/rm -f $*.dvi $*.log *.aux ++ rm -f $*.dvi $*.log *.aux + test -f $*.gif && chmod 644 $*.gif + + all: ${gifs} +@@ -57,7 +57,7 @@ ghostRightarrow.gif: Rightarrow.tex + giftrans -g '#000000=#ffffff' |\ + giftopnm |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux ++ rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux + test -f $*.gif && chmod 644 $*.gif + +-clean: ; /bin/rm -f *.gif Make.out ++clean: ; rm -f *.gif Make.out +diff --git a/csug/math/Makefile b/csug/math/Makefile +index 3385fdb..3392ea8 100644 +--- a/csug/math/Makefile ++++ b/csug/math/Makefile +@@ -15,11 +15,11 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f $*.dvi $*.log $*.aux ++ rm -f $*.dvi $*.log $*.aux + test -f $*.gif && chmod 644 $*.gif + + all: ${gifs} + + ${gifs}: mathmacros + +-clean: ; /bin/rm -f *.gif Make.out ++clean: ; rm -f *.gif Make.out +diff --git a/examples/Makefile b/examples/Makefile +index b1b4e1d..3edfdd0 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -25,4 +25,4 @@ needed: ${obj} + + all: ; echo "(time (for-each compile-file (map symbol->string '(${src}))))" | ${Scheme} + +-clean: ; /bin/rm -f $(obj) expr.md ++clean: ; rm -f $(obj) expr.md +diff --git a/makefiles/Makefile-csug.in b/makefiles/Makefile-csug.in +index df24092..6f8a8d9 100644 +--- a/makefiles/Makefile-csug.in ++++ b/makefiles/Makefile-csug.in +@@ -29,7 +29,7 @@ install: target + # thrice is not enough when starting from scratch + logcheck1: $(x).thirdrun + @if [ -n "`grep 'Warning: Label(s) may have changed' $(x).log`" ] ; then\ +- /bin/rm -f $(x).thirdrun ;\ ++ rm -f $(x).thirdrun ;\ + $(MAKE) $(x).thirdrun;\ + fi + +@@ -55,7 +55,7 @@ stexsrc = csug.stex title.stex copyright.stex contents.stex\ + texsrc = ${stexsrc:%.stex=%.tex} + + title.tex contents.tex bibliography.tex: +- /bin/rm -f $*.tex ++ rm -f $*.tex + echo "%%% DO NOT EDIT THIS FILE" > $*.tex + echo "%%% Edit the .stex version instead" >> $*.tex + echo "" >> $*.tex +@@ -147,7 +147,7 @@ code: $(stexsrc) + echo '(load "code" pretty-print)' | $(Scheme) -q + + $(x).clean: +- -/bin/rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\ ++ -rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\ + $(x).prethirdrun $(x).ans\ + $(x).hprefirstrun $(x).hpresecondrun $(x).hprethirdrun\ + tspl.aux tspl.haux tspl.rfm tspl.idx in.hidx\ +diff --git a/makefiles/Makefile-release_notes.in b/makefiles/Makefile-release_notes.in +index 4435b6f..64348a4 100644 +--- a/makefiles/Makefile-release_notes.in ++++ b/makefiles/Makefile-release_notes.in +@@ -38,7 +38,7 @@ install: $x.pdf $x.html + $(INSTALL) -m 2755 -d $(installdir)/gifs + $(INSTALL) -m 0644 --ifdiff gifs/*.gif $(installdir)/gifs + $(INSTALL) -m 2755 -d $(installdir)/math +- -/bin/rm -rf $(installdir)/$(mathdir) ++ -rm -rf $(installdir)/$(mathdir) + $(INSTALL) -m 2755 -d $(installdir)/$(mathdir) + if [ -e $(mathdir)/0.gif ] ; then $(INSTALL) -m 0644 $(mathdir)/*.gif $(installdir)/$(mathdir) ; fi + +diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in +index a702c34..c09043d 100644 +--- a/makefiles/Mf-install.in ++++ b/makefiles/Mf-install.in +@@ -114,12 +114,12 @@ bininstall: ${Bin} + libbininstall: ${LibBin} + $I -m 444 ${PetiteBoot} ${LibBin}/petite.boot + if [ "${InstallPetiteName}" != "petite" ]; then\ +- /bin/rm -f ${LibBin}/${InstallPetiteName}.boot;\ ++ rm -f ${LibBin}/${InstallPetiteName}.boot;\ + ln -f ${LibBin}/petite.boot ${LibBin}/${InstallPetiteName}.boot;\ + fi + $I -m 444 ${SchemeBoot} ${LibBin}/scheme.boot;\ + if [ "${InstallSchemeName}" != "scheme" ]; then\ +- /bin/rm -f ${LibBin}/${InstallSchemeName}.boot;\ ++ rm -f ${LibBin}/${InstallSchemeName}.boot;\ + ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallSchemeName}.boot;\ + fi + ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallScriptName}.boot; +diff --git a/makefiles/installsh b/makefiles/installsh +index 48f1e46..95d85fb 100755 +--- a/makefiles/installsh ++++ b/makefiles/installsh +@@ -1,7 +1,8 @@ + #! /bin/sh + if [ -x /bin/true ]; then TRUE=/bin/true; + elif [ -x /usr/bin/true ]; then TRUE=/usr/bin/true; +-else echo "Can't find /bin/true or /usr/bin/true" ; exit 1; ++elif command -v true &> /dev/null; then TRUE=true; ++else echo "Can't find /bin/true or /usr/bin/true and no true command" ; exit 1; + fi + + while ${TRUE} ; do +diff --git a/mats/6.ms b/mats/6.ms +index 102f84b..e504230 100644 +--- a/mats/6.ms ++++ b/mats/6.ms +@@ -2685,7 +2685,7 @@ + (begin + (system "ln -s ../examples .") + (load "examples/fatfib.ss" compile) +- (system "/bin/rm examples") ++ (system "rm -f examples") + #t)) + (or (windows?) (embedded?) + (equal? +diff --git a/mats/Mf-a6fb b/mats/Mf-a6fb +index b16d1b6..ff9e687 100644 +--- a/mats/Mf-a6fb ++++ b/mats/Mf-a6fb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-a6le b/mats/Mf-a6le +index d6fee09..a3bda76 100644 +--- a/mats/Mf-a6le ++++ b/mats/Mf-a6le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m64 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m64 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-a6nb b/mats/Mf-a6nb +index 48187ef..0f7ac17 100644 +--- a/mats/Mf-a6nb ++++ b/mats/Mf-a6nb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-a6ob b/mats/Mf-a6ob +index 12758f3..0ffcccc 100644 +--- a/mats/Mf-a6ob ++++ b/mats/Mf-a6ob +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-a6osx b/mats/Mf-a6osx +index f1dbf85..57bac22 100644 +--- a/mats/Mf-a6osx ++++ b/mats/Mf-a6osx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-arm32le b/mats/Mf-arm32le +index f33a665..83896eb 100644 +--- a/mats/Mf-arm32le ++++ b/mats/Mf-arm32le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -fomit-frame-pointer -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -fomit-frame-pointer -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3fb b/mats/Mf-i3fb +index 150cedb..1e4e8fc 100644 +--- a/mats/Mf-i3fb ++++ b/mats/Mf-i3fb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3le b/mats/Mf-i3le +index 8f521c8..b248620 100644 +--- a/mats/Mf-i3le ++++ b/mats/Mf-i3le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3nb b/mats/Mf-i3nb +index e81f6ff..8afeb5c 100644 +--- a/mats/Mf-i3nb ++++ b/mats/Mf-i3nb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3ob b/mats/Mf-i3ob +index 4e3ee1b..fcd4dee 100644 +--- a/mats/Mf-i3ob ++++ b/mats/Mf-i3ob +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3osx b/mats/Mf-i3osx +index 53c7d4a..a55f6ee 100644 +--- a/mats/Mf-i3osx ++++ b/mats/Mf-i3osx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3qnx b/mats/Mf-i3qnx +index 724f2db..3e1437a 100644 +--- a/mats/Mf-i3qnx ++++ b/mats/Mf-i3qnx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ppc32le b/mats/Mf-ppc32le +index 28151a8..547ca00 100644 +--- a/mats/Mf-ppc32le ++++ b/mats/Mf-ppc32le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6fb b/mats/Mf-ta6fb +index 921d609..5ed233e 100644 +--- a/mats/Mf-ta6fb ++++ b/mats/Mf-ta6fb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6le b/mats/Mf-ta6le +index cd014ec..21c686a 100644 +--- a/mats/Mf-ta6le ++++ b/mats/Mf-ta6le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m64 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m64 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6nb b/mats/Mf-ta6nb +index 6b1929d..9b9b898 100644 +--- a/mats/Mf-ta6nb ++++ b/mats/Mf-ta6nb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6ob b/mats/Mf-ta6ob +index a7aee91..8f25aed 100644 +--- a/mats/Mf-ta6ob ++++ b/mats/Mf-ta6ob +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6osx b/mats/Mf-ta6osx +index 42da5d7..0dd386f 100644 +--- a/mats/Mf-ta6osx ++++ b/mats/Mf-ta6osx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m64 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m64 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3fb b/mats/Mf-ti3fb +index c891145..56bf7d3 100644 +--- a/mats/Mf-ti3fb ++++ b/mats/Mf-ti3fb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3le b/mats/Mf-ti3le +index 12e77b8..22b4148 100644 +--- a/mats/Mf-ti3le ++++ b/mats/Mf-ti3le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3nb b/mats/Mf-ti3nb +index 028c652..573946e 100644 +--- a/mats/Mf-ti3nb ++++ b/mats/Mf-ti3nb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3ob b/mats/Mf-ti3ob +index 8a4741c..4472b60 100644 +--- a/mats/Mf-ti3ob ++++ b/mats/Mf-ti3ob +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3osx b/mats/Mf-ti3osx +index 6913c34..9273b44 100644 +--- a/mats/Mf-ti3osx ++++ b/mats/Mf-ti3osx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-tppc32le b/mats/Mf-tppc32le +index a12b515..8b9d9f0 100644 +--- a/mats/Mf-tppc32le ++++ b/mats/Mf-tppc32le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/unix.ms b/mats/unix.ms +index cfba3e7..db7f6f9 100644 +--- a/mats/unix.ms ++++ b/mats/unix.ms +@@ -72,8 +72,8 @@ + (mat system + (eqv? (with-output-to-file "testfile.ss" void '(replace)) (void)) + (begin +- (system (format "~:[~;/pkg~]/bin/rm testfile.ss" (embedded?))) +- (system (format "~:[~;/pkg~]/bin/echo hello > testfile.ss" (embedded?))) ++ (system "rm -f testfile.ss") ++ (system "echo hello > testfile.ss") + (let ([p (open-input-file "testfile.ss")]) + (and (eq? (read p) 'hello) + (begin (close-input-port p) #t)))) +diff --git a/newrelease b/newrelease +index e903956..2d06740 100755 +--- a/newrelease ++++ b/newrelease +@@ -75,13 +75,13 @@ if ($status != 0) exit 1 + + cd $W + +-/bin/rm -f BUILDING ++rm -f BUILDING + sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \ + -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \ + ../BUILDING > BUILDING + set updatedfiles = ($updatedfiles BUILDING) + +-/bin/rm -f NOTICE ++rm -f NOTICE + sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \ + -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \ + ../NOTICE > NOTICE +@@ -92,19 +92,19 @@ sed -e "s/csv[0-9]\.[0-9]\(\.[0-9]\)*/csv$R/" ../makefiles/Mf-install.in > makef + sed -e "s/csug[0-9]\.[0-9]/csug$MR.$mR/" -e "s/csug[0-9]_[0-9]/csug$MR""_$mR/" ../makefiles/Makefile-csug.in > makefiles/Makefile-csug.in + set updatedfiles = ($updatedfiles makefiles/Mf-install.in makefiles/Makefile-csug.in) + +-/bin/rm scheme.1.in ++rm -f scheme.1.in + sed -e "s/Chez Scheme Version [0-9]\.[0-9]\(\.[0-9]\)* .* [0-9][0-9]*/Chez Scheme Version $R `date +'%B %Y'`/" \ + -e "s/Copyright .* Cisco Systems, Inc./Copyright `date +%Y` Cisco Systems, Inc./" \ + ../scheme.1.in > scheme.1.in + set updatedfiles = ($updatedfiles scheme.1.in) + +-/bin/rm -f c/Makefile.{,t}{i3,a6}nt ++rm -f c/Makefile.{,t}{i3,a6}nt + foreach fn (c/Makefile.{,t}{a6,i3}nt) + set updatedfiles = ($updatedfiles $fn) + sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn + end + +-/bin/rm -f mats/Mf-{,t}{i3,a6}nt ++rm -f mats/Mf-{,t}{i3,a6}nt + foreach fn (mats/Mf-{,t}{a6,i3}nt) + set updatedfiles = ($updatedfiles $fn) + sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn +@@ -123,11 +123,11 @@ sed -e "s/FILEVERSION .*/FILEVERSION $RCVERSION/"\ + -e "s/Copyright 1984-..../Copyright 1984-`date +%Y`/g" ../c/scheme.rc > c/scheme.rc + set updatedfiles = ($updatedfiles c/scheme.rc) + +-/bin/rm -f s/7.ss ++rm -f s/7.ss + sed -e "s/nCopyright 1984-..../nCopyright 1984-`date +%Y`/g" ../s/7.ss > s/7.ss + set updatedfiles = ($updatedfiles s/7.ss) + +-/bin/rm -f s/cmacros.ss ++rm -f s/cmacros.ss + set VNUM = `printf "%04x%02x%02x" $MR $mR $bR` + sed -e "s/scheme-version #x......../scheme-version #x$VNUM/" ../s/cmacros.ss > s/cmacros.ss + set updatedfiles = ($updatedfiles s/cmacros.ss) +@@ -146,17 +146,17 @@ sed -e "s/Revised\(.*\)for Chez Scheme Version [^ ]*
/Revised\1for Chez Schem + ../csug/csug.stex > csug/csug.stex + set updatedfiles = ($updatedfiles csug/copyright.stex csug/csug.stex) + +-/bin/rm bintar/Makefile ++rm -f bintar/Makefile + sed -e "s/^version = .*/version = $R/" \ + -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" \ + ../bintar/Makefile > bintar/Makefile + set updatedfiles = ($updatedfiles bintar/Makefile) + +-/bin/rm rpm/Makefile ++rm -f rpm/Makefile + sed -e "s/^version = .*/version = $R/" ../rpm/Makefile > rpm/Makefile + set updatedfiles = ($updatedfiles rpm/Makefile) + +-/bin/rm pkg/Makefile ++rm -f pkg/Makefile + sed -e "s/^version = .*/version = $R/" \ + -e "s/© .* Cisco Systems/\© `date +%Y` Cisco Systems/" \ + ../pkg/Makefile > pkg/Makefile +@@ -170,7 +170,7 @@ foreach fn (wininstall/{,t}{a6,i3}nt.wxs) + sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/" ../$fn > $fn + end + +-/bin/rm LOG ++rm -f LOG + cat ../LOG > LOG + echo "" >> LOG + echo "$R changes:" >> LOG +diff --git a/pkg/Makefile b/pkg/Makefile +index e0eef67..a3fe83f 100644 +--- a/pkg/Makefile ++++ b/pkg/Makefile +@@ -39,7 +39,7 @@ $(PKG): $(BUILDROOT)/$(PKG) + --package-path $(BUILDROOT)\ + $(PKG) + sudo chown $(DOTUSER):$(DOTGROUP) $(PKG) +- sudo /bin/rm -rf $(RELEASE) $(BUILDROOT) ++ sudo rm -rf $(RELEASE) $(BUILDROOT) + + $(BUILDROOT)/$(PKG): $(PKGCONTENT) + sudo /usr/bin/pkgbuild\ +diff --git a/release_notes/gifs/Makefile b/release_notes/gifs/Makefile +index 9572965..701d53a 100644 +--- a/release_notes/gifs/Makefile ++++ b/release_notes/gifs/Makefile +@@ -15,7 +15,7 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f $*.dvi $*.log *.aux ++ rm -f $*.dvi $*.log *.aux + test -f $*.gif && chmod 644 $*.gif + + all: ${gifs} +@@ -44,7 +44,7 @@ ghostRightarrow.gif: Rightarrow.tex + giftrans -g '#000000=#ffffff' |\ + giftopnm |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux ++ rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux + test -f $*.gif && chmod 644 $*.gif + +-clean: ; /bin/rm -f *.gif Make.out ++clean: ; rm -f *.gif Make.out +diff --git a/release_notes/math/Makefile b/release_notes/math/Makefile +index b3ffae3..9eca430 100644 +--- a/release_notes/math/Makefile ++++ b/release_notes/math/Makefile +@@ -16,11 +16,11 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f $*.dvi $*.log $*.aux ++ rm -f $*.dvi $*.log $*.aux + test -f $*.gif && chmod 644 $*.gif + + all: ${gifs} + + ${gifs}: mathmacros + +-clean: ; /bin/rm -f *.gif Make.out ++clean: ; rm -f *.gif Make.out +diff --git a/s/Mf-base b/s/Mf-base +index c709608..40d816c 100644 +--- a/s/Mf-base ++++ b/s/Mf-base +@@ -206,7 +206,7 @@ profiled: + $(MAKE) all loadspd=t bp=t PetiteBoot=../boot/$m/xpetite.boot SchemeBoot=../boot/$m/xscheme.boot + $(MAKE) prettyclean + $(MAKE) io.$m loadspd=t dumpbpd=t Scheme="../bin/$m/scheme -b ../boot/$m/xpetite.boot -b ../boot/$m/xscheme.boot" +- /bin/rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot ++ rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot + $(MAKE) prettyclean + $(MAKE) all loadspd=t loadbpd=t + +diff --git a/workarea b/workarea +index bacc712..0461919 100755 +--- a/workarea ++++ b/workarea +@@ -70,9 +70,9 @@ esac + + if [ "$OS" = "Windows_NT" ] + then +- ln="/bin/cp -R" ++ ln="cp -R" + else +- ln="/bin/ln -s" ++ ln="ln -s" + fi + + # This shell script creates a workarea for local modifications to the +@@ -102,7 +102,7 @@ workln() + forceworkln() + { + if [ ! -e $2 ] ; then +- /bin/ln -s $1 $2 2> /dev/null ++ ln -s $1 $2 2> /dev/null + fi + } + +@@ -168,13 +168,13 @@ done + # deep copy submodules where builds occur so changes don't propagate through symlinks + for dir in `echo zlib` ; do + if [ ! -e $W/$dir ] ; then +- /bin/cp -R $dir $W/$dir ++ cp -R $dir $W/$dir + fi + done + + for dir in `echo lz4` ; do + if [ ! -e $W/$dir ] ; then +- /bin/cp -R $dir $W/$dir ++ cp -R $dir $W/$dir + fi + done + +-- +2.21.1 (Apple Git-122.3) + -- cgit v1.2.3 From 8b578c217f57ce009dbbc9df1036a06b6b822754 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 29 Mar 2021 17:59:47 +0200 Subject: gnu: crypto++: Update to 8.5.0. * gnu/packages/crypto.scm (crypto++): Update to 8.5.0. [origin]: Use git-fetch and git-reference. --- gnu/packages/crypto.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 94f9cbeebf..57d417de80 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -773,15 +773,18 @@ data on your platform, so the seed itself will be as random as possible. (define-public crypto++ (package (name "crypto++") - (version "8.4.0") + (version "8.5.0") (source (origin - (method url-fetch/zipbomb) - (uri (string-append "https://cryptopp.com/cryptopp" - (string-join (string-split version #\.) "") - ".zip")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/weidai11/cryptopp") + (commit + (string-append "CRYPTOPP_" + (string-replace-substring version "." "_"))))) (sha256 (base32 - "16kvfm11xv7j9a3yykzysjgw38a9b7lnc5n5x5h82g395k6ybxf0")))) + "0in7rlazq91vfi519g9wr7bh87hii47cimxv7fmj0f88vhjaidq3")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 81f65a3a2c5f4d1a5e8d74a4525181d8ae7d5408 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 2 Apr 2021 11:11:10 +0100 Subject: tests: libvirt: Catch issues with incorrect /var and /etc in package. * gnu/tests/virtualization.scm (run-libvirt-test): Chdir to "/tmp" before running test. Add "connect" test. --- gnu/tests/virtualization.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index e95787ee19..9f9d3a5e26 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2020 Ludovic Courtès ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,10 +93,20 @@ 0 (marionette-eval `(begin + (chdir "/tmp") (system* ,(string-append #$libvirt "/bin/virsh") "-c" "qemu:///system" "version")) marionette)) + (test-eq "connect" + 0 + (marionette-eval + `(begin + (chdir "/tmp") + (system* ,(string-append #$libvirt "/bin/virsh") + "-c" "qemu:///system" "connect")) + marionette)) + (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) -- cgit v1.2.3 From ee5c4f70b6bc85cdb63a05c75683587528e89b2b Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 18 Feb 2021 21:48:09 +0100 Subject: gnu: libvirt: Enable disk and directory storage. * gnu/packages/virtualization.scm (libvirt)[inputs]: Add parted. [arguments]: Add configure flags to support disk and directory storage. --- gnu/packages/virtualization.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index b365d722f9..88313d54a2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1081,6 +1081,8 @@ manage system or application containers.") (list "--with-qemu" "--with-qemu-user=nobody" "--with-qemu-group=kvm" + "--with-storage-disk" + "--with-storage-dir" "--with-polkit" (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version) @@ -1142,6 +1144,7 @@ manage system or application containers.") ("dmidecode" ,dmidecode) ("dnsmasq" ,dnsmasq) ("ebtables" ,ebtables) + ("parted" ,parted) ("iproute" ,iproute) ("iptables" ,iptables))) (native-inputs -- cgit v1.2.3 From 0d4ae86bc2e5c5a87e3d343d2b144ed9afd75314 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 2 Apr 2021 11:49:34 +0100 Subject: gnu: libvirt: Update to 7.2.0. * gnu/packages/virtualization.scm (libvirt): Update to 7.2.0. [arguemnts]: Switch to meson, only build system supported by upstream. [inputs]: Add libssh2 and readline. [native-inputs]: Add bash-completion, gettext, python-docutils and rpcsvc-proto. * gnu/packages/patches/libvirt-add-install-prefix.patch: New file... * gnu/local.mk: ...add it. * gnu/packages/patches/libvirt-create-machine-cgroup.patch: Delete file, merged by upstream. Tested-by: Pierre Langlois --- gnu/local.mk | 4 +- .../patches/libvirt-add-install-prefix.patch | 329 +++++++++++++++++++++ gnu/packages/virtualization.scm | 82 +++-- 3 files changed, 367 insertions(+), 48 deletions(-) create mode 100644 gnu/packages/patches/libvirt-add-install-prefix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1d7133667d..075504e302 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -34,7 +34,7 @@ # Copyright © 2020, 2021 Felix Gruber # Copyright © 2020 Ryan Prior # Copyright © 2020 Jan Wielkiewicz -# Copyright © 2020 Brice Waegeneire +# Copyright © 2020, 2021 Brice Waegeneire # Copyright © 2020 Tanguy Le Carrour # Copyright © 2020 Martin Becze # Copyright © 2020 Malte Frank Gerdes @@ -1264,7 +1264,7 @@ dist_patch_DATA = \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ - %D%/packages/patches/libvirt-create-machine-cgroup.patch \ + %D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/patches/libvirt-add-install-prefix.patch b/gnu/packages/patches/libvirt-add-install-prefix.patch new file mode 100644 index 0000000000..1331fa9b6f --- /dev/null +++ b/gnu/packages/patches/libvirt-add-install-prefix.patch @@ -0,0 +1,329 @@ +Patch from NixOS: +https://raw.githubusercontent.com/NixOS/nixpkgs/b98031a49c66095dd1eb9185ecdaeeb5e3cd752d/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + +From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Thu, 14 Jan 2021 00:32:00 -0800 +Subject: [PATCH] meson: patch in an install prefix for building on nix + +Used in the nixpkgs version of libvirt so that we can install things in +the nix store, but read them from the root filesystem. +--- + meson.build | 9 +++++++++ + meson_options.txt | 2 ++ + src/libxl/meson.build | 6 +++--- + src/locking/meson.build | 8 ++++---- + src/lxc/meson.build | 6 +++--- + src/meson.build | 18 +++++++++--------- + src/network/meson.build | 12 ++++++------ + src/nwfilter/xml/meson.build | 2 +- + src/qemu/meson.build | 14 +++++++------- + src/remote/meson.build | 6 +++--- + src/security/apparmor/meson.build | 8 ++++---- + tools/meson.build | 4 ++-- + 12 files changed, 53 insertions(+), 42 deletions(-) + +diff --git a/meson.build b/meson.build +index b5164f6..33719f1 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' + conf.set('WINVER', '0x0600') # Win Vista / Server 2008 + endif + ++# patched in for nix ++install_prefix = get_option('install_prefix') + + # set various paths + +@@ -57,6 +59,13 @@ else + sysconfdir = prefix / get_option('sysconfdir') + endif + ++# nix: don't prefix the localstatedir; some things need to write to it, so it ++# can't be in the nix store, and that's what the prefix is. ++# We'll prefix things ourselves where needed ++localstatedir = get_option('localstatedir') ++# Same for sysconfidr ++sysconfdir = get_option('sysconfdir') ++ + # if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for + # sysconfdir as this makes a lot of things break in testing situations + if prefix == '/usr' +diff --git a/meson_options.txt b/meson_options.txt +index e5d79c2..081cd32 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,5 @@ ++option('install_prefix', type: 'string', value: '', description: 'prefix for nix store installation') ++ + option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') + option('packager', type: 'string', value: '', description: 'Extra packager name') + option('packager_version', type: 'string', value: '', description: 'Extra packager version') +diff --git a/src/libxl/meson.build b/src/libxl/meson.build +index 3bb6cc5..78d7be0 100644 +--- a/src/libxl/meson.build ++++ b/src/libxl/meson.build +@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', + ] + endif +diff --git a/src/locking/meson.build b/src/locking/meson.build +index 8a28310..9da81cc 100644 +--- a/src/locking/meson.build ++++ b/src/locking/meson.build +@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lockd', +- localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', +- runstatedir / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', ++ install_prefix + runstatedir / 'libvirt' / 'lockd', + ] + + if conf.has('WITH_SANLOCK') + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'sanlock', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'sanlock', + ] + endif + endif +diff --git a/src/lxc/meson.build b/src/lxc/meson.build +index f8e2a88..96d6687 100644 +--- a/src/lxc/meson.build ++++ b/src/lxc/meson.build +@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', +- localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', + ] + endif +diff --git a/src/meson.build b/src/meson.build +index 7c47821..d33d16a 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -669,7 +669,7 @@ endforeach + + virt_conf_files += 'libvirt.conf' + +-install_data(virt_conf_files, install_dir: confdir) ++install_data(virt_conf_files, install_dir: install_prefix + confdir) + install_data(virt_aug_files, install_dir: virt_aug_dir) + + # augeas_test_data: +@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs + output: '@0@.conf'.format(data['name']), + configuration: daemon_conf, + install: true, +- install_dir: confdir, ++ install_dir: install_prefix + confdir, + ) + + if data.get('with_ip', false) +@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') + + install_data( + init_file, +- install_dir: sysconfdir / 'init.d', ++ install_dir: install_prefix + sysconfdir / 'init.d', + rename: [ init['name'] ], + ) + + if init.has_key('confd') + install_data( + init['confd'], +- install_dir: sysconfdir / 'conf.d', ++ install_dir: install_prefix + sysconfdir / 'conf.d', + rename: [ init['name'] ], + ) + endif +@@ -872,7 +872,7 @@ if init_script != 'none' + foreach sysconf : sysconf_files + install_data( + sysconf['file'], +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: [ sysconf['name'] ], + ) + endforeach +@@ -897,10 +897,10 @@ endif + # Install empty directories + + virt_install_dirs += [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', ++ install_prefix + localstatedir / 'cache' / 'libvirt', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'images', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'filesystems', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot', + ] + + meson.add_install_script( +diff --git a/src/network/meson.build b/src/network/meson.build +index 3ec598c..b02040b 100644 +--- a/src/network/meson.build ++++ b/src/network/meson.build +@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'network', +- localstatedir / 'lib' / 'libvirt' / 'dnsmasq', +- runstatedir / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', ++ install_prefix + runstatedir / 'libvirt' / 'network', + ] + + configure_file( +@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') + output: '@BASENAME@', + copy: true, + install: true, +- install_dir: confdir / 'qemu' / 'networks', ++ install_dir: install_prefix + confdir / 'qemu' / 'networks', + ) + + meson.add_install_script( + meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), +- confdir / 'qemu' / 'networks' / 'autostart', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + '../default.xml', 'default.xml', + ) + +diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build +index 0d96c54..66c92a1 100644 +--- a/src/nwfilter/xml/meson.build ++++ b/src/nwfilter/xml/meson.build +@@ -25,4 +25,4 @@ nwfilter_xml_files = [ + 'qemu-announce-self.xml', + ] + +-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') ++install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') +diff --git a/src/qemu/meson.build b/src/qemu/meson.build +index 90640b0..8802cec 100644 +--- a/src/qemu/meson.build ++++ b/src/qemu/meson.build +@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- localstatedir / 'cache' / 'libvirt' / 'qemu', +- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'swtpm', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + ] + endif +diff --git a/src/remote/meson.build b/src/remote/meson.build +index 9ad2f6a..429a15b 100644 +--- a/src/remote/meson.build ++++ b/src/remote/meson.build +@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') + } + + virt_install_dirs += [ +- localstatedir / 'log' / 'libvirt', ++ install_prefix + localstatedir / 'log' / 'libvirt', + ] + + logrotate_conf = configuration_data() +@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') + ) + install_data( + log_file, +- install_dir: sysconfdir / 'logrotate.d', ++ install_dir: install_prefix + sysconfdir / 'logrotate.d', + rename: [ name ], + ) + endforeach +@@ -309,7 +309,7 @@ endif + if conf.has('WITH_SASL') + install_data( + 'libvirtd.sasl', +- install_dir: sysconfdir / 'sasl2', ++ install_dir: install_prefix + sysconfdir / 'sasl2', + rename: [ 'libvirt.conf' ], + ) + endif +diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build +index af43780..e2d6c81 100644 +--- a/src/security/apparmor/meson.build ++++ b/src/security/apparmor/meson.build +@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles + output: name, + configuration: apparmor_gen_profiles_conf, + install: true, +- install_dir: apparmor_dir, ++ install_dir: install_prefix + apparmor_dir, + ) + endforeach + + install_data( + [ 'libvirt-qemu', 'libvirt-lxc' ], +- install_dir: apparmor_dir / 'abstractions', ++ install_dir: install_prefix + apparmor_dir / 'abstractions', + ) + + install_data( + [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], +- install_dir: apparmor_dir / 'libvirt', ++ install_dir: install_prefix + apparmor_dir / 'libvirt', + ) + + install_data( + 'usr.lib.libvirt.virt-aa-helper.local', +- install_dir: apparmor_dir / 'local', ++ install_dir: install_prefix + apparmor_dir / 'local', + rename: 'usr.lib.libvirt.virt-aa-helper', + ) +diff --git a/tools/meson.build b/tools/meson.build +index b8c6802..dacd0ff 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') + install_rpath: libvirt_rpath, + ) + +- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt') ++ install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt') + endif + + if host_machine.system() == 'windows' +@@ -274,7 +274,7 @@ configure_file( + if init_script == 'systemd' + install_data( + 'libvirt-guests.sysconf', +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: 'libvirt-guests', + ) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 88313d54a2..3c6b61499a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020, 2021 Maxim Cournoyer @@ -42,6 +42,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages build-tools) #:use-module (gnu packages check) @@ -97,6 +98,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages readline) #:use-module (gnu packages selinux) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) @@ -1065,66 +1067,48 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "5.8.0") + (version "7.2.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) - (patches - (search-patches "libvirt-create-machine-cgroup.patch")))) - (build-system gnu-build-system) + (base32 "1l6i1rz1v9rnp61sgzlrlbsfh03208dbm3b259i0jl5sqz85kx01")) + (patches (search-patches "libvirt-add-install-prefix.patch")))) + (build-system meson-build-system) (arguments `(#:configure-flags - (list "--with-qemu" - "--with-qemu-user=nobody" - "--with-qemu-group=kvm" - "--with-storage-disk" - "--with-storage-dir" - "--with-polkit" - (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" + (list "-Ddriver_qemu=enabled" + "-Dqemu_user=nobody" + "-Dqemu_group=kvm" + "-Dstorage_disk=enabled" + "-Dstorage_dir=enabled" + "-Dpolkit=enabled" + "-Dnls=enabled" ;translations + (string-append "-Ddocdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version) + "-Dbash_completion=enabled" + (string-append "-Dinstall_prefix=" (assoc-ref %outputs "out")) "--sysconfdir=/etc" "--localstatedir=/var") + #:meson ,meson-0.55 #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-BOURNE_SHELL-definition - ;; BOURNE_SHELL is hard-#defined to ‘/bin/sh’, causing test failures. - (lambda _ - (substitute* "config.h.in" - (("/bin/sh") (which "sh"))) - #t)) - (add-before 'configure 'patch-libtirpc-file-names - (lambda* (#:key inputs #:allow-other-keys) - ;; libvirt uses an m4 macro instead of pkg-config to determine where - ;; the RPC headers are located. Tell it to look in the right place. - (substitute* "configure" - (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 - (string-append (assoc-ref inputs "libtirpc") - "/include/tirpc"))) - #t)) (add-before 'configure 'disable-broken-tests (lambda _ - (let ((tests (list "commandtest" ; hangs idly - "qemuxml2argvtest" ; fails - "qemuhotplugtest" ; fails - "virnetsockettest" ; tries to network - "virshtest"))) ; fails - (substitute* "tests/Makefile.in" - (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|"))) + (let ((tests (list "commandtest" ; hangs idly + "qemuxml2argvtest" ; fails + "virnetsockettest"))) ; tries to network + (substitute* "tests/meson.build" + (((format #f ".*'name': '(~a)'.*" (string-join tests "|"))) "")) #t))) - (replace 'install - ;; Since the sysconfdir and localstatedir should be /etc and /var - ;; at runtime, we must prevent writing to them at installation - ;; time. - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install" - "sysconfdir=/tmp/etc" - "localstatedir=/tmp/var" - make-flags)))))) + (add-before 'install 'no-polkit-magic + ;; Meson ‘magically’ invokes pkexec, which fails (not setuid). + (lambda _ + (setenv "PKEXEC_UID" "something") + #t))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) @@ -1133,11 +1117,13 @@ manage system or application containers.") ("dbus" ,dbus) ("libpcap" ,libpcap) ("libnl" ,libnl) + ("libssh2" ,libssh2) ;optional ("libtirpc" ,libtirpc) ;for ("libuuid" ,util-linux "lib") ("lvm2" ,lvm2) ;for libdevmapper ("curl" ,curl) ("openssl" ,openssl) + ("readline" ,readline) ("cyrus-sasl" ,cyrus-sasl) ("libyajl" ,libyajl) ("audit" ,audit) @@ -1148,11 +1134,15 @@ manage system or application containers.") ("iproute" ,iproute) ("iptables" ,iptables))) (native-inputs - `(("xsltproc" ,libxslt) + `(("bash-completion" ,bash-completion) + ("gettext" ,gettext-minimal) + ("xsltproc" ,libxslt) ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-docutils" ,python-docutils) ;for rst2html + ("rpcsvc-proto" ,rpcsvc-proto))) ;for rpcgen (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization -- cgit v1.2.3 From 28cc447fc5bd0a219ad54836a343826cc34d9bd7 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:23 +0000 Subject: gnu: python-libvirt: Update to 7.2.0. * gnu/packages/virtualization.scm (python-libvirt): Update to 7.2.0. --- gnu/packages/virtualization.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3c6b61499a..953b09a325 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1196,14 +1197,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "5.8.0") + (version "7.2.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) + (base32 "1ryfimhf47s9k4n0gys233bh15l68fccs2bvj8bjwqjm9k2vmhy0")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 29383ecc8ccd8d8df77e5c60e59aba42e5ca0fec Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:24 +0000 Subject: gnu: libvirt-glib: Update to 4.0.0. * gnu/packages/virtualization.scm (libvirt-glib): Update to 4.0.0. [build-system]: Switch to meson-build-system. --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 953b09a325..13f97a1625 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1155,15 +1155,15 @@ to integrate other virtualization mechanisms if needed.") (define-public libvirt-glib (package (name "libvirt-glib") - (version "3.0.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "ftp://libvirt.org/libvirt/glib/" - "libvirt-glib-" version ".tar.gz")) + "libvirt-glib-" version ".tar.xz")) (sha256 (base32 - "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz")))) - (build-system gnu-build-system) + "1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4")))) + (build-system meson-build-system) (inputs `(("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From 653faaebd60c407cbd2265c6ee8a72a521f6b116 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:25 +0000 Subject: gnu: virt-manager: Update to 3.2.0. * gnu/packages/virtualization.scm (virt-manager): Update to 3.2.0. [arguments]: Remove #:test-target. Remove fix-qemu-img-reference phase. Adapt check phase to use pytest, although they still do not run. [native-inputs]: Add python-docutils. Suggest adding python-pytest to enable tests. --- gnu/packages/virtualization.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 13f97a1625..5fc6ff8e4f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1236,7 +1236,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "2.2.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -1244,11 +1244,10 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) + "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command - #:test-target "test_ui" #:tests? #f ; TODO The tests currently fail ; RuntimeError: Loop condition wasn't ; met @@ -1266,12 +1265,6 @@ virtualization library.") (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) - (add-after 'unpack 'fix-qemu-img-reference - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "virtconv/formats.py" - (("/usr(/bin/qemu-img)" _ suffix) - (string-append (assoc-ref inputs "qemu") suffix))) - #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. @@ -1302,11 +1295,12 @@ virtualization library.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") + (setenv "XDG_CACHE_HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be enabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) + (invoke "dbus-run-session" "--" "pytest" "--uitests")) #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) @@ -1336,7 +1330,9 @@ virtualization library.") ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool) + ("rst2man" ,python-docutils) ;; The following are required for running the tests + ;; ("python-pytest" ,python-pytest) ;; ("python-dogtail" ,python-dogtail) ;; ("xvfb" ,xorg-server-for-tests) ;; ("dbus" ,dbus) -- cgit v1.2.3 From 92ff287e746ab294427aaafbede74f57678e28e5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 5 Apr 2021 19:20:59 +0200 Subject: gnu: Add dream. * gnu/packages/radio.scm (dream): New variable. --- gnu/packages/radio.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 826693a538..bd26252c64 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -36,6 +37,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) @@ -49,6 +51,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages gps) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -1414,3 +1417,72 @@ Compatible hardware/software: @item Icom IC-9700 @end itemize\n") (license license:expat))) + +(define-public dream + (package + (name "dream") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/drm/dream/" version + "/dream-" version "-svn808.tar.gz")) + (sha256 + (base32 "01dv6gvljz64zrjbr08mybr9aicvpq2c6qskww46lngdjyhk8xs1")))) + (build-system qt-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("faad2" ,faad2) + ("fftw" ,fftw) + ("libsndfile" ,libsndfile) + ("libpcap" ,libpcap) + ("opus" ,opus) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtwebkit" ,qtwebkit) + ("qwt" ,qwt) + ("speexdsp" ,speexdsp) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "dream.pro" + (("target\\.path = /usr/bin") + (string-append "target.path = " + (assoc-ref outputs "out") "/bin")) + (("documentation\\.path = /usr/share/man/man1") + (string-append "documentation.path = " + (assoc-ref outputs "out") + "/share/man/man1")) + (("/usr/include/pulse/") + (string-append (assoc-ref inputs "pulseaudio") + "/include/pulse/")) + (("/usr/include/sndfile\\.h") + (string-append (assoc-ref inputs "libsndfile") + "/include/sndfile.h")) + (("/usr/include/opus/") + (string-append (assoc-ref inputs "opus") + "/include/opus/")) + (("/usr/include/speex/") + (string-append (assoc-ref inputs "speexdsp") + "/include/speex/")) + (("/usr/include/qwt/") + (string-append (assoc-ref inputs "qwt") + "/include/qwt/")) + (("\\$\\$OUT_PWD/include/neaacdec\\.h") + (string-append (assoc-ref inputs "faad2") + "/include/neaacdec.h"))))) + (replace 'configure + (lambda _ + (invoke "qmake")))))) + (home-page "https://sourceforge.net/projects/drm/") + (synopsis "Digital Radio Mondiale receiver") + (description + "Dream is a software implementation of a Digital Radio Mondiale (DRM) +receiver.") + (license license:gpl2+))) -- cgit v1.2.3 From 561017f83823253a496b1eb650377c96623c2385 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 5 Apr 2021 20:56:00 +0200 Subject: gnu: Add welle-io. * gnu/packages/radio.scm (welle-io): New variable. --- gnu/packages/radio.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index bd26252c64..afe93081b3 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages maths) + #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -1486,3 +1487,43 @@ Compatible hardware/software: "Dream is a software implementation of a Digital Radio Mondiale (DRM) receiver.") (license license:gpl2+))) + +(define-public welle-io + (package + (name "welle-io") + (version "2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/albrechtl/welle.io") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa")))) + (build-system qt-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("faad2" ,faad2) + ("fftwf" ,fftwf) + ("lame" ,lame) + ("libusb" ,libusb) + ("mpg123" ,mpg123) + ("rtl-sdr" ,rtl-sdr) + ("qtbase" ,qtbase) + ("qtcharts" ,qtcharts) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtmultimedia" ,qtmultimedia) + ("qtquickcontrols2" ,qtquickcontrols2))) + (arguments + `(#:configure-flags '("-DRTLSDR=ON") + #:tests? #f)) + (home-page "https://www.welle.io/") + (synopsis "DAB and DAB+ software radio") + (description + "@code{welle.io} is a Digital Audio Broadcasting (DAB and DAB+) software +defined radio with support for rtl-sdr.") + (license license:gpl2+))) -- cgit v1.2.3 From ab0ed26eb70931e04c921ceef313ca67e3c6d61c Mon Sep 17 00:00:00 2001 From: Ron Nazarov via Guix-patches via Date: Sat, 3 Apr 2021 22:19:08 +0100 Subject: gnu: Add node-wrappy. * gnu/packages/node-xyz.scm (node-wrappy): New variable. Signed-off-by: Leo Famulari --- gnu/packages/node-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 60cc005ea4..f401380310 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2021 Noisytoot ;;; ;;; This file is part of GNU Guix. ;;; @@ -272,3 +273,28 @@ function with browser support.") "@code{node-semver} is a JavaScript implementation of the @uref{https://semver.org/, SemVer.org} specification.") (license license:isc))) + +(define-public node-wrappy + (package + (name "node-wrappy") + (version "1.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/npm/wrappy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ymlc61cja6v5438vwb04gq8wg2b784lj39zf0g4i36fvgcw9783")))) + (build-system node-build-system) + (arguments + '(#:tests? #f ; FIXME: Tests depend on node-tap + #:phases + (modify-phases %standard-phases + ;; The only dependency to check for is tap, which we don't have. + (delete 'configure)))) + (home-page "https://github.com/npm/wrappy") + (synopsis "Callback wrapping utility") + (description "@code{wrappy} is a utility for Node.js to wrap callbacks.") + (license license:isc))) -- cgit v1.2.3 From 14392c77896561c5846c0f3a0588720792d61e95 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 6 Apr 2021 10:57:19 +0200 Subject: gnu: python-tortoise-orm: Fix dependencies. * gnu/packages/databases.scm (python-tortoise-orm) [propagated-inputs]: Add missing dependency. [arguments]: Relax pytz version requirement, remove iso8601 requirement. --- gnu/packages/databases.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 130e94d535..ce7afa82d0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2469,7 +2469,10 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (lambda _ (substitute* "setup.py" (("pypika>=0\\.44\\.0,<0\\.45\\.0") "pypika") - (("aiosqlite>=0.16.0,<0.17.0") "aiosqlite")) + (("aiosqlite>=0.16.0,<0.17.0") "aiosqlite") + (("pytz>=2020\\.4,<2021\\.0") "pytz") + ;; Not required, since ciso8601 is used. + (("'iso8601>=0\\.1\\.13,<0\\.2\\.0',") "")) #t))))) (native-inputs `(("python-asynctest" ,python-asynctest) @@ -2478,6 +2481,7 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") `(("python-aiosqlite" ,python-aiosqlite) ("python-pypika" ,python-pypika) ("python-ciso8601" ,python-ciso8601) + ("python-pytz" ,python-pytz) ("python-typing-extensions" ,python-typing-extensions))) (home-page -- cgit v1.2.3 From a7f12433248a6a2732b81c5302ee81dd37d5f33d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 6 Apr 2021 12:27:36 +0200 Subject: gnu: libpano13: Update to 2.9.20_rc3 [security fixes]. Fixes at least CVE-2021-20307. * gnu/packages/photo.scm (libpano13): Update to 2.9.20_rc3. --- gnu/packages/photo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5fd57af4a5..c0c8632d9a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -355,15 +355,16 @@ and a wide variety of other metadata.") (define-public libpano13 (package (name "libpano13") - (version "2.9.19") + (version "2.9.20_rc3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/panotools/libpano13/" - "libpano13-" version "/" - "libpano13-" version ".tar.gz")) + "libpano13-" (first + (string-split version #\_)) + "/libpano13-" version ".tar.gz")) (sha256 (base32 - "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3")))) + "12cv4886l1czfjwy7k6ipgf3zjksgwhdjzr2s9fdg33vqcv2hlrv")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg-turbo) -- cgit v1.2.3 From c6eb6d471da1b7bdf7264defac0cc33fd1d48c81 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 6 Apr 2021 13:55:04 +0200 Subject: gnu: txr: Update to 255. * gnu/packages/lisp.scm (txr): Update to 255. --- gnu/packages/lisp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3704d226fe..1d8c1ac601 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2019, 2020 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve -;;; Copyright © 2019, 2020 Guillaume Le Vaillant +;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Zhu Zihao ;;; Copyright © 2021 Sharlatan Hellseher @@ -847,7 +847,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "246") + (version "255") (source (origin (method git-fetch) @@ -856,7 +856,7 @@ enough to play the original mainframe Zork all the way through.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ynkz0ss7nn1ssiaxagpq80iabknf085nk0pra9hn8y9hx7av0db")))) + (base32 "0fjca44761x29xg5hh60yf4i3k7462z7ysnadbk2wzisp42yxk6j")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 05a5e222e9e9250dbac61a278762dd47f2eb8897 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 6 Apr 2021 14:49:20 +0200 Subject: gnu: sbcl-cl-webkit: Update to 20210406. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20210406. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index fe86cc8b18..d7fd0a9061 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3418,10 +3418,10 @@ is a library for creating graphical user interfaces.") (sbcl-package->ecl-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "6e8315613d496089ba858c13afabb2c0f6d28740")) + (let ((commit "1f4ae84a10fd81914b1adedc0a7d34392837521e")) (package (name "sbcl-cl-webkit") - (version (git-version "2.4" "11" commit)) + (version (git-version "2.4" "12" commit)) (source (origin (method git-fetch) @@ -3431,7 +3431,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "121jk3irxaz8jnmhjnpdypb9shwd844rf4b3x94y1ig4dxw7gx6h")))) + "051gvx7jy6yx3272y7vswxqzbjdbwany025g2drcjck5h79w6af5")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit v1.2.3 From bed31da50d8edfefa7255d9e80ab837c2d88349e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 6 Apr 2021 14:55:45 +0200 Subject: gnu: bitcoin-unlimited: Update to 1.9.1.1. * gnu/packages/finance.scm (bitcoin-unlimited): Update to 1.9.1.1. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3ccc077b94..08b7a95292 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1404,7 +1404,7 @@ following three utilities are included with the library: (define-public bitcoin-unlimited (package (name "bitcoin-unlimited") - (version "1.9.0.1") + (version "1.9.1.1") (source (origin (method git-fetch) @@ -1413,7 +1413,7 @@ following three utilities are included with the library: (commit (string-append "BCHunlimited" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pan24g3d5csa004d7zvlizj4mv58ly5i579341isp944phl3g5v")))) + (base32 "0vyvfawss40v9jaic9zq0z3cjvxiq04d4wgq4rnkha7ilm9zqyd7")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 535417a6cbabaa0fc6b662f1cbc9078a7954fd0c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 6 Apr 2021 15:20:01 +0200 Subject: gnu: bitcoin-unlimited: Use new source repository. * gnu/packages/finance.scm (bitcoin-unlimited)[source]: Update git repository URL. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 08b7a95292..f18438bc88 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1409,7 +1409,7 @@ following three utilities are included with the library: (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited") + (url "https://gitlab.com/bitcoinunlimited/BCHUnlimited.git/") (commit (string-append "BCHunlimited" version)))) (file-name (git-file-name name version)) (sha256 -- cgit v1.2.3 From 26f34f3de4239544cc03a914de137e246ac99abe Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 6 Apr 2021 19:14:53 +0200 Subject: gnu: python-django: Update to 3.1.8 [security fixes]. * gnu/packages/django.scm (python-django): Update to 3.1.8. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 7122ba3071..cba7929b60 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -47,13 +47,13 @@ (define-public python-django (package (name "python-django") - (version "3.1.7") + (version "3.1.8") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "19v5lfijnjx18y9ax962z3gnbxy9k8i3w4j0qfzcp85nx4p7kkij")))) + "1b0ymqv09b523k3c2jnpb2gjy2fsy6irbfyc2g9x5hjyw41k2fgq")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 1467080de4ddf49d0bf2fbc3ff9e1cf8dccba44a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 6 Apr 2021 19:15:01 +0200 Subject: gnu: python-django-2.2: Update to 2.2.20 [security fixes]. * gnu/packages/django.scm (python-django-2.2): Update to 2.2.20. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index cba7929b60..dfc3d314ad 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -132,13 +132,13 @@ to the @dfn{don't repeat yourself} (DRY) principle.") (define-public python-django-2.2 (package (inherit python-django) - (version "2.2.19") + (version "2.2.20") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "0hysjf8bz4g8xrn2cdx6pmawimpyr6ag2fg3jxsnc1byr3g3bhih")))) + "0r3a6gbhwngxl172yy6n0sq5knibl2vxc0wbk1g8licfbzfgjs95")))) (native-inputs `(;; XXX: In 2.2 and 3.0, selenium is required for the test suite. ("python-selenium" ,python-selenium) -- cgit v1.2.3 From 5fd046cbfd73ac178c02c503f3d8e2104a929e52 Mon Sep 17 00:00:00 2001 From: Franck Pérignon Date: Tue, 6 Apr 2021 11:20:00 +0000 Subject: gnu: Add scotch and pt-scotch with shared libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scotch-shared, pt-scotch-shared): New variables. Signed-off-by: Leo Famulari --- gnu/packages/maths.scm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5cd11ec435..ff1b46f095 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Gerd Heber +;;; Copyright © 2021 Franck Pérignon ;;; ;;; This file is part of GNU Guix. ;;; @@ -3246,6 +3247,63 @@ YACC = bison -pscotchyy -y -b y (synopsis "Programs and libraries for graph algorithms (32-bit integers)"))) +(define-public scotch-shared + (package (inherit scotch) + (name "scotch-shared") + (native-inputs + `(("gcc" ,gcc) + ("flex" ,flex) + ("bison" ,bison))) + (arguments + (substitute-keyword-arguments (package-arguments scotch) + ((#:phases scotch-shared-phases) + `(modify-phases ,scotch-shared-phases + (replace + 'configure + (lambda _ + ;; Otherwise, the RUNPATH will lack the final path component. + (setenv "RPATHFLAGS" (string-append "-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib")) + (call-with-output-file "Makefile.inc" + (lambda (port) + (format port " +EXE = +LIB = .so +OBJ = .o +MAKE = make +AR = gcc +ARFLAGS = -shared -o +CAT = cat +CCS = gcc +CCP = mpicc +CCD = gcc +CPPFLAGS =~{ -D~a~} +CFLAGS = -O2 -g -fPIC $(CPPFLAGS) $(RPATHFLAGS) +CLIBFLAGS = -shared -fPIC +LDFLAGS = -lz -lm -lrt -lpthread -Xlinker --no-as-needed +CP = cp +LEX = flex -Pscotchyy -olex.yy.c +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = echo +YACC = bison -pscotchyy -y -b y +" + '("COMMON_FILE_COMPRESS_GZ" + "COMMON_PTHREAD" + "COMMON_RANDOM_FIXED_SEED" + "INTSIZE64" ;use 'int64_t' + ;; Prevents symbolc clashes with libesmumps + "SCOTCH_RENAME" + ;; XXX: Causes invalid frees in superlu-dist tests + ;; "SCOTCH_PTHREAD" + ;; "SCOTCH_PTHREAD_NUMBER=2" + "restrict=__restrict" + ))))#t)) + (delete 'check))))) + (synopsis + "Programs and libraries for graph algorithms (shared libraries version)"))) + (define-public pt-scotch (package (inherit scotch) (name "pt-scotch") @@ -3293,6 +3351,28 @@ YACC = bison -pscotchyy -y -b y (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) +(define-public pt-scotch-shared + (package (inherit scotch-shared) + (name "pt-scotch-shared") + (propagated-inputs + `(("openmpi" ,openmpi))) ;Headers include MPI headers + (arguments + (substitute-keyword-arguments (package-arguments scotch-shared) + ((#:phases scotch-shared-phases) + `(modify-phases ,scotch-shared-phases + (replace + 'build + (lambda _ + (invoke "make" (format #f "-j~a" (parallel-job-count)) + "ptscotch" "ptesmumps") + + ;; Install the serial metis compatibility library + (invoke "make" "-C" "libscotchmetis" "install"))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) + (synopsis "Graph algorithms (shared libraries version, with MPI)"))) + + (define-public metis (package (name "metis") -- cgit v1.2.3 From 87aaccbf5584eaca421e5e238534c79ef5fd4d2a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 6 Apr 2021 13:35:56 -0400 Subject: gnu: emacs-php-mode: Fix installation prefix. * gnu/packages/emacs-xyz.scm (emacs-php-mode) [include]: Remove argument. [phases]{add-lisp-dir-to-emacs-load-path}: Remove phase. {enter-source-directory}: Add phase. --- gnu/packages/emacs-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 239915fffe..8e80ccbb56 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12486,13 +12486,11 @@ using Imenu, and Compilation mode support for MSBuild, devenv and xbuild.") (base32 "0bs9q62bd7885c39v7x1qz3w1fhpmpdgm72xwsk2yygw0ii425nn")))) (build-system emacs-build-system) (arguments - `(#:include (cons "^lisp/" %default-include) - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'add-source-to-load-path 'add-lisp-dir-to-emacs-load-path + (add-after 'unpack 'enter-source-directory (lambda _ - (setenv "EMACSLOADPATH" - (string-append (getcwd) "/lisp:" (getenv "EMACSLOADPATH")))))))) + (chdir "lisp")))))) (propagated-inputs `(("emacs-projectile" ,emacs-projectile))) (home-page "https://github.com/ejmr/php-mode") (synopsis "Major mode for editing PHP code") -- cgit v1.2.3 From 41d0b233bac19a2ce0289bf2279a1e7f831b8aee Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 6 Apr 2021 21:00:16 +0200 Subject: gnu: umoci: Update to 0.4.7 [fixes CVE-2021-29136]. * gnu/packages/virtualization.scm (umoci): Update to 0.4.7. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5fc6ff8e4f..64e5c88fd1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1605,7 +1605,7 @@ Open Container Initiative specification.") (define-public umoci (package (name "umoci") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) @@ -1614,7 +1614,7 @@ Open Container Initiative specification.") version "/umoci.tar.xz")) (file-name (string-append "umoci-" version ".tar.xz")) (sha256 - (base32 "06q7xfwnqysc013hapx31jhlzmyg8qb467qfkynj673qc7p9bd6h")))) + (base32 "0fvljj9k4f83wbqzd8nbijz0p1zaq633f8yxyvl5sy3wjf03ffk9")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/umoci" -- cgit v1.2.3 From 8515a506ca71ae5e3709930754d6df77614ffb71 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 6 Apr 2021 16:31:16 -0400 Subject: gnu: qemu: Fix the Texinfo manual. The makeinfo command splits the generated info output in multiple files (in 300 KiB chunks) by default; this meant the build system would have had to install the multiple QEMU.info-1, QEMU.info-2, etc. files for the info manual to work as intended. Instead, keep the info manual as one single file by specifying the --no-split option to makeinfo. * gnu/packages/patches/qemu-build-info-manual.patch (sphinxinfo) : Invoke with the --no-split argument. --- gnu/packages/patches/qemu-build-info-manual.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/patches/qemu-build-info-manual.patch b/gnu/packages/patches/qemu-build-info-manual.patch index c837040d45..f2bee30ab0 100644 --- a/gnu/packages/patches/qemu-build-info-manual.patch +++ b/gnu/packages/patches/qemu-build-info-manual.patch @@ -90,7 +90,7 @@ index ebd85d59f9..1243839461 100644 + output: 'QEMU.info', + install: true, + install_dir: get_option('infodir'), -+ command: [makeinfo, '@INPUT0@', '--output=@OUTPUT@']) ++ command: [makeinfo, '--no-split', '@INPUT0@', '--output=@OUTPUT@']) + alias_target('texi', sphinxtexi) + alias_target('info', sphinxinfo) + endif -- cgit v1.2.3 From 66d8dc3d745442efdfe13decdff6bde748fb4c53 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Wed, 17 Feb 2021 20:43:30 +0100 Subject: gnu: Add opensmtpd-filter-rspamd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (opensmtpd-filter-rspamd): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/mail.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 489053544b..56fae3fcba 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2020 Eric Brown ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020 Alexey Abramov +;;; Copyright © 2020, 2021 Alexey Abramov ;;; Copyright © 2020 Tim Gesthuizen ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Oleg Pykhalov @@ -159,6 +159,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system go) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system guile) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -3169,6 +3170,39 @@ writing OpenSMTPd filters.") messages with @acronym{DKIM, DomainKeys Identified Mail} (RFC 4871).") (license license:expat))) +(define-public opensmtpd-filter-rspamd + (package + (name "opensmtpd-filter-rspamd") + (version "0.1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/poolpOrg/filter-rspamd") + (commit (string-append "v" version)))) + (sha256 + (base32 "1qhrw20q9y44ffgx5k14nvqc9dh47ihywgzza84g0zv9xgif7hd5")) + (file-name (git-file-name name version)))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/poolpOrg/filter-rspamd" + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-bootstrap-variables + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Tell the build system where to install binaries + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec/opensmtpd"))) + (setenv "GOBIN" libexec))))))) + (native-inputs + `(("opensmtpd" ,opensmtpd))) + (home-page "https://github.com/poolpOrg/filter-rspamd") + (synopsis "OpenSMTPd filter to request an Rspamd analysis") + (description + "The @command{filter-rspamd} OpenSMTPd filter implements the +Rspamd protocol and allows OpenSMTPd to request an Rspamd analysis of +an SMTP transaction before a message is committed to queue.") + (license license:isc))) + (define-public mailman (package (name "mailman") -- cgit v1.2.3 From 5a6e27bfbdf04bb4555b49fd06766266807a3092 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Wed, 17 Feb 2021 20:43:59 +0100 Subject: services: dovecot: Fix serialization of a free-form-args arguments. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/mail.scm (serialize-free-form-args): Change destination and return a string containing the formated text. Signed-off-by: Ludovic Courtès --- gnu/services/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index c0f6371104..81f692e437 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -159,7 +159,7 @@ (define (serialize-free-form-args field-name val) (serialize-field field-name (string-join - (map (match-lambda ((k . v) (format #t "~a=~a" k v))) val) + (map (match-lambda ((k . v) (format #f "~a=~a" k v))) val) " "))) (define-configuration dict-configuration -- cgit v1.2.3 From ee9c44c76752231ea40f2492304426f204f93a0e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 17 Feb 2021 22:45:08 +0000 Subject: gnu: Add camlidl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (camlidl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ocaml.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 086f3b048a..0948377d08 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 divoplade ;;; Copyright © 2020 pukkamustard ;;; Copyright © 2021 aecepoglu +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -466,6 +467,71 @@ depend: $(STDLIB_MLIS) $(STDLIB_DEPS)")) for building OCaml library and programs.") (license license:lgpl2.1+))) +(define-public camlidl + (package + (name "camlidl") + (version "1.09") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xavierleroy/camlidl") + (commit "camlidl109"))) + (sha256 + (base32 "0zrkaq7fk23b2b9vg6jwdjx7l0hdqp4synbbrw1zcg8gjf6n3c80")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;; No test suite + #:make-flags + (list + (string-append + "BINDIR=" (assoc-ref %outputs "out") "/bin") + (string-append + "OCAMLLIB=" (assoc-ref %outputs "out") "/lib/ocaml/site-lib/camlidl")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (copy-file "config/Makefile.unix" "config/Makefile") + ;; Note: do not pass '-jN' as this appears to not be + ;; parallel-safe (race condition related to libcamlidl.a). + (invoke "make" "all") + #t)) + (add-before 'install 'create-target-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (string-append (assoc-ref outputs "out")))) + (mkdir-p + (string-append out "/bin")) + (mkdir-p + (string-append out "/lib/ocaml/site-lib/camlidl/stublibs")) + (mkdir-p + (string-append out "/lib/ocaml/site-lib/camlidl/caml"))) + #t)) + (add-after 'install 'install-meta + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-output-to-file + (string-append out "/lib/ocaml/site-lib/camlidl/META") + (lambda _ + (display + (string-append + "description = \"Stub code generator for OCaml/C interface\" +version = \"" ,version "\" +directory = \"^\" +archive(byte) = \"com.cma\" +archive(native) = \"com.cmxa\""))))) + #t))))) + (native-inputs + `(("ocaml" ,ocaml))) + (home-page "https://github.com/xavierleroy/camlidl") + (synopsis "Stub code generator for OCaml/C interface") + (description + "Camlidl is a stub code generator for Objective Caml. It generates stub +code for interfacing Caml with C from an IDL description of the C functions.") + (license license:lgpl2.1))) + (define-public ocaml-extlib (package (name "ocaml-extlib") -- cgit v1.2.3 From 8e4d44ad390c2171e8ae212dea0ec93d6af278f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 5 Apr 2021 17:23:16 +0200 Subject: gnu: Add cfm. * gnu/packages/admin.scm (cfm): New public variable. --- gnu/packages/admin.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2963f3e049..8e43d8fe97 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -329,6 +329,38 @@ interface and is based on GNU Guile.") #t))) ,@(package-arguments shepherd))))) +(define-public cfm + (package + (name "cfm") + (version "0.6.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WillEccles/cfm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14gapia902f29wa4dlrrj8jcwcff9bfvyhjccw9ddy2gxx2g8wmr")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; Keeping xdg-open optional avoids a size increase of 293%. + (delete 'configure)))) ; no configure script + (home-page "https://eccles.dev/cfm/") + (synopsis + "Simple terminal file manager with @command{vi}-inspired key bindings") + (description + "The Cactus File Manager (@command{cfm}) helps you manage your files +visually from a text terminal. It aims to be simple and fast, with key bindings +inspired by @command{vi}.") + (license license:mpl2.0))) + (define-public cloud-utils (package (name "cloud-utils") -- cgit v1.2.3 From 08512512eae2bd8b71f2e99251ee8dcadcefc1a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 00:54:05 +0200 Subject: gnu: stunnel: Update to 5.59. * gnu/packages/web.scm (stunnel): Update to 5.59. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7bc638ba88..fc4abfdf81 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5888,14 +5888,14 @@ tools like SSH (Secure Shell) to reach the outside world.") (define-public stunnel (package (name "stunnel") - (version "5.58") + (version "5.59") (source (origin (method url-fetch) (uri (string-append "https://www.stunnel.org/downloads/stunnel-" version ".tar.gz")) (sha256 - (base32 "0y9vjzjqi340vy6h321r1cskb7l6a4prr9d2ysixqzjpjv04rhfl")))) + (base32 "17yf2n47j5hw2y9527mrkx3j7q9jk5vvg46m3hgp1wg8dggpcxqk")))) (build-system gnu-build-system) (native-inputs ;; For tests. -- cgit v1.2.3 From d6f0987669ab4a23e04191787dd3171220152bed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 00:54:21 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 95a31f80fd..8f0ea5223f 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, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Oleg Pykhalov ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Edouard Klein -- cgit v1.2.3 From b0a53c526887dc31f0f328b4e3950edfa766902b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 00:54:34 +0200 Subject: gnu: mpv: Update to 0.33.1. * gnu/packages/video.scm (mpv): Update to 0.33.1. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4cd36cbd7f..0a6bd3f57a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu -;;; Copyright © 201–72021 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Ethan R. Jones @@ -1995,7 +1995,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.33.0") + (version "0.33.1") (source (origin (method git-fetch) (uri (git-reference @@ -2004,7 +2004,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (file-name (git-file-name name version)) (sha256 (base32 - "06cmycd2gb826kf2zv470w6nhzyk9sdhjydsdiinbgb902lzcpfy")))) + "06rw1f55zcsj78ql8w70j9ljp2qb1pv594xj7q9cmq7i92a7hq45")))) (build-system waf-build-system) (native-inputs `(("perl" ,perl) ; for zsh completion file -- cgit v1.2.3 From d3184ee437f1c11b7203676fcd1ffb1a9ae24bd8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 00:54:41 +0200 Subject: gnu: di: Update to 4.50. * gnu/packages/admin.scm (di): Update to 4.50. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8e43d8fe97..4cb23ddc01 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2957,13 +2957,13 @@ a new command using the matched rule, and runs it.") (define-public di (package (name "di") - (version "4.49") + (version "4.50") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/diskinfo-di/di-" version ".tar.gz")) (sha256 - (base32 "1y38jhp2bpwbwzdzjlhgfqc7bxxz9cwapxd61799zjf54jkslkf0")))) + (base32 "0aj9ldkvmj8fmrk685vd2gagz0q8lwsn2nfbx6r6mza94mn8pw42")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; obscure test failures -- cgit v1.2.3 From a121f4c54a3534c7191b1dc5d2b932510c477e35 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 7 Apr 2021 11:57:21 +0200 Subject: gnu: cuirass: Update to 1.0.0-6.ec0be96. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-6.ec0be96. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index cdfe725a65..eaf3b304ca 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "eb94e7da6a5985a4b92d92aa22955e4013490e9c") - (revision "5")) + (let ((commit "ec0be96407f039a7a2f7daf4baf1d26e47773753") + (revision "6")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1fyj33bhfl0zl7ik98dxqvb58n24zv3aw037gvri0p0xzyp2fhbx")))) + "1cxwbsf4if7lk1i0fhpp1m7dga35afq4dgpkbj9a9f2z8cxi1w1d")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From a060977239690bc6fadf45efc55ec61e34f89cac Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 28 Mar 2021 12:56:53 +0300 Subject: gnu: Add entt. * gnu/packages/cpp.scm (entt): New variable. Signed-off-by: Leo Prikler --- gnu/packages/game-development.scm | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ea879568f5..3e74de449d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages compression) + #:use-module (gnu packages check) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) @@ -1761,6 +1763,44 @@ provide high-quality 3D rendering, it contains an animation editor, and can be scripted in a Python-like language.") (license license:expat))) +(define-public entt + (package + (name "entt") + (version "3.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/skypjack/entt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nzvnhiw3r6nkmxp749zwxc8kzja09nijyxibdbri3g2i7pysf58")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DENTT_BUILD_TESTING=ON" + "-DENTT_FIND_GTEST_PACKAGE=ON" + "-DENTT_BUILD_DOCS=ON") + ;; Only tests are compiled, and they need assertions to work correctly. + #:build-type "Debug")) + (native-inputs + `(;; for testing + ("googletest" ,googletest) + ;; for documentation + ("doxygen" ,doxygen) + ("graphviz" ,graphviz))) + (synopsis "Entity component system") + (description "EnTT is a header-only library, containing (among other things) +@itemize +@item an entity component system based on sparse sets, +@item a configuration system using the monostate pattern, +@item a static reflection system, +@item and a cooperative scheduler. +@end itemize") + (home-page "https://github.com/skypjack/entt") + (license (list license:expat ; code + license:cc-by4.0)))) ; documentation + (define-public eureka (package (name "eureka") -- cgit v1.2.3 From 37d8def701839200c44c76cb2fa2abfb27a7b88b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 7 Apr 2021 15:28:01 +0200 Subject: gnu: cuirass: Update to 1.0.0-7.1b35a77. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-7.1b35a77. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index eaf3b304ca..eaf32d9739 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "ec0be96407f039a7a2f7daf4baf1d26e47773753") - (revision "6")) + (let ((commit "1b35a7785627f3e8c5b6d8f37bf11eb4a470b4c4") + (revision "7")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1cxwbsf4if7lk1i0fhpp1m7dga35afq4dgpkbj9a9f2z8cxi1w1d")))) + "1hy8inhwpi9i92yg5alvmqgp1vjnrhinckywkv9kgyjlskzshib3")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 8a32b6a542e49ae989a4418c73546e558c547479 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 7 Apr 2021 19:31:57 +0200 Subject: gnu: sbcl-cl-webkit: Update to 20210407. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20210407. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d7fd0a9061..8d527005e9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3418,10 +3418,10 @@ is a library for creating graphical user interfaces.") (sbcl-package->ecl-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "1f4ae84a10fd81914b1adedc0a7d34392837521e")) + (let ((commit "db855639d4a13f6ba296959cf11635b6b67421bf")) (package (name "sbcl-cl-webkit") - (version (git-version "2.4" "12" commit)) + (version (git-version "2.4" "13" commit)) (source (origin (method git-fetch) @@ -3431,7 +3431,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "051gvx7jy6yx3272y7vswxqzbjdbwany025g2drcjck5h79w6af5")))) + "01alj5bfsh2983pwpdy0zpa2rvl4kl0mqzs08ff46is3cb8fqs0g")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit v1.2.3 From 2d77c270f4196cddd5739cda0156b610607a26a5 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 7 Apr 2021 18:48:21 +0100 Subject: gnu: Add texlive-fontaxes. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ec21221ea1..c8bac7eea7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7905,3 +7905,26 @@ matching maths fonts are provided by the @code{fourier} and @code{mathdesign} font packages.") (license (license:fsf-free "http://mirrors.ctan.org/fonts/utopia/README")))) + +(define-public texlive-fontaxes + (package + (name "texlive-fontaxes") + (version "1.0e") + (source + (origin + (method svn-fetch) + (uri (texlive-ref "latex" "fontaxes")) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "19mhp9l7cjw0sbq55c9lz0l2pffkyhyir3i63jqynifjmglbgkl7")))) + (build-system texlive-build-system) + (arguments '(#:tex-directory "latex/fontaxes")) + (home-page "http://www.ctan.org/pkg/fontaxes") + (synopsis "Additional font axes for LaTeX") + (description "The @code{fontaxes} package adds several new font +axes on top of LaTeX's New Font Selection Scheme (NFSS). In +particular, it splits the shape axis into a primary and a secondary +shape axis and it adds three new axes to deal with the different +figure versions offered by many professional fonts.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 0bc6ae5843a29320bea971c6a3a0a3b6814fb291 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 19:55:06 +0200 Subject: gnu: tmux-xpanes: Update to 4.1.3. * gnu/packages/tmux.scm (tmux-xpanes): Update to 4.1.3. --- gnu/packages/tmux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 8f0ea5223f..b8355600b3 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -228,7 +228,7 @@ them, etc., by attaching to the corresponding pane in tmux.") (define-public tmux-xpanes (package (name "tmux-xpanes") - (version "4.1.2") + (version "4.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -237,7 +237,7 @@ them, etc., by attaching to the corresponding pane in tmux.") (file-name (git-file-name name version)) (sha256 (base32 - "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0")))) + "09fmnn1q76r1l4cv7clmfr3j9cjmd053kq238d0qj2i486948ivv")))) (build-system trivial-build-system) (inputs `(("bash" ,bash))) -- cgit v1.2.3 From 6b1b6b0ed06cf7593ad8476cfa28273ed0bdb44d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 21:22:52 +0200 Subject: gnu: nmrpflash: Update to 0.9.15. * gnu/packages/admin.scm (nmrpflash): Update to 0.9.15. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4cb23ddc01..06fc6baa46 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4318,7 +4318,7 @@ entries, providing commands to add, remove, comment, and search.") (define-public nmrpflash (package (name "nmrpflash") - (version "0.9.14") + (version "0.9.15") (source (origin (method git-fetch) @@ -4327,7 +4327,7 @@ entries, providing commands to add, remove, comment, and search.") (url "https://github.com/jclehner/nmrpflash") (commit (string-append "v" version)))) (sha256 - (base32 "1fdjrxhjs96rdclbkld57xarf592slhkp79h46z833npxpn12ck1")) + (base32 "0ssfls1sfh8w748qsnkfgndlpw395100x2yynzbk5jd56scxvp20")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 2b605ef3b145ec136530f08ee7aa27382aa64b46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 21:25:58 +0200 Subject: gnu: libupnp: Update to 1.14.5 [fixes CVE-2021-28302]. * gnu/packages/upnp.scm (libupnp): Update to 1.14.5. --- gnu/packages/upnp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 307ea14e96..2743ba456d 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -96,14 +96,14 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.14.4") + (version "1.14.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/pupnp/pupnp/releases/download" "/release-" version "/libupnp-" version".tar.bz2")) (sha256 - (base32 "0qxydxf11dnq5rd33pa35mc5i5li7xdysc7ph23bisbh63srwr6d")))) + (base32 "16hlcpffmqd4rja57m6km1dpx3abgv91vvmb8971vfg6gd0glzr2")))) (native-inputs `(("pkg-config" ,pkg-config))) (build-system gnu-build-system) -- cgit v1.2.3 From 43110e8d4e3b88481b99ffd8a88158d1fc54837e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 21:26:32 +0200 Subject: gnu: youtube-dl: Update to 2021.04.07. * gnu/packages/video.scm (youtube-dl): Update to 2021.04.07. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0a6bd3f57a..571dbb70c6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.04.01") + (version "2021.04.07") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "1vw9l32bv115129v1lfar626y3vivvxkp36bc1phjcrsjfayz67h")) + "02d51l6gdjr3zhhi7ydf5kzv8dv4jzq0ygja7zb2h9k7hnl0l27m")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit v1.2.3 From 1ccc5cfc387d14fa3ebe864e16c0637994819b0f Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 7 Apr 2021 17:08:21 -0400 Subject: gnu: tiled: Update to 1.5.0. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 3e74de449d..07a17763f8 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -448,7 +448,7 @@ support.") (define-public tiled (package (name "tiled") - (version "1.4.3") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -457,7 +457,7 @@ support.") (file-name (git-file-name name version)) (sha256 (base32 - "14bx4gywfzr2f07ldqk3la82g5ag1agj21f7ccrxip12ydmpx0xb")))) + "1prajkx1xpp3csa0xpkrn3c2cnzvmwzxgrqb9d3gqszp3sllr2dg")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 096897889f54f1649c2c18f27d62f9f00207334e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 23:36:02 +0200 Subject: gnu: solarus: Update to 1.6.5. * gnu/packages/games.scm (solarus): Update to 1.6.5. (solarus-quest-editor)[source]: Update hash. [arguments]: Remove obsolete 'fix-qt-build phase. --- gnu/packages/games.scm | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3f909aad4b..048784ab2c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2325,7 +2325,7 @@ and defeat them with your bubbles!") (name "solarus") ;; XXX: When updating this package, please also update hash in ;; `solarus-quest-editor' below. - (version "1.6.4") + (version "1.6.5") (source (origin (method git-fetch) @@ -2334,7 +2334,7 @@ and defeat them with your bubbles!") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1n6l91yyqjx0pz4w1lp3yybpq0fs2yjswfcm8c1wjfkxwiznbdxi")))) + (base32 "0ny9dgqphjv2l39rff2621hnrzpf8qin8vmnv7jdz20azjk4m8id")))) (build-system cmake-build-system) (arguments `(#:phases @@ -2393,19 +2393,9 @@ in mind.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn")))) + (base32 "1pvjgd4faxii5sskw1h55lw90hlbazhwni8nxyywzrmkjbq7irm0")))) (arguments - `(#:tests? #false ;no test - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-qt-build - ;; XXX: Fix build with Qt 5.15. It has been applied upstream as - ;; 81d5c7f1 and can be removed at next upgrade. - (lambda _ - (substitute* "src/entities/jumper.cpp" - (("#include " all) - (string-append all "\n" "#include \n"))) - #t))))) + `(#:tests? #false)) ; no test suite (inputs `(("solarus" ,solarus) ,@(package-inputs solarus))) -- cgit v1.2.3 From 887531a231c2beacc8e7345fe382af961d575ea7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 23:37:53 +0200 Subject: gnu: nsd: Update to 4.3.6. * gnu/packages/dns.scm (nsd): Update to 4.3.6. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index afdf2867a7..c940657ce9 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -539,14 +539,14 @@ asynchronous fashion.") (define-public nsd (package (name "nsd") - (version "4.3.5") + (version "4.3.6") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "0wj490rxqs86z8s4lxjwk06ry5pvkdqqyq1cf83z7mxk60zb98kx")))) + (base32 "062zwx4k5rgpg2c0b4721ldj36aj8clrxv79mlfw9b15ap7w1rmy")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 2ffd92abf23e3fb3b3bac3c3efd43630ba616f4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 23:38:53 +0200 Subject: gnu: libxlsxwriter: Update to 1.0.1. * gnu/packages/xml.scm (libxlsxwriter): Update to 1.0.1. --- gnu/packages/xml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 130fe45995..1c34fe499a 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -221,7 +221,7 @@ project (but it is usable outside of the Gnome platform).") (define-public libxlsxwriter (package (name "libxlsxwriter") - (version "1.0.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -230,8 +230,7 @@ project (but it is usable outside of the Gnome platform).") (commit (string-append "RELEASE_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "070pfqggia71z4ichr5yrwfndfz903z941ns72vy0lvb1mpp7g05")) + (base32 "0dsqv4qdd582fhwj6m80iz50gkyw4m8n9h4mkd2871csa03sbilf")) (modules '((guix build utils))) (snippet ;; Remove bundled minizip source -- cgit v1.2.3 From 3118fde135da3c661de8d61f73ebb4f633d096ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Apr 2021 21:25:06 +0200 Subject: gnu: r-seurat: Update to 4.0.1. * gnu/packages/cran.scm (r-seurat): Update to 4.0.1. [arguments]: Remove. [propagated-inputs]: Replace r-spatstat with r-spatstat-core and r-spatstat-geom. --- gnu/packages/cran.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 044ad8f5bb..fcde611f5d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26484,27 +26484,15 @@ other R users.") (define-public r-seurat (package (name "r-seurat") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1mp3py00bmzj4541d8ry5sfzkpfzvnl9dpa8n4qhakd13dl30xdn")))) + "17cmp9mimvykb8ny796dn1zwmvg0pwwjw1zcixyamc5q1lwnxi3p")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) - ;; This is needed because r-spatstat has been split up and there has - ;; been no new release of Seurat since then. - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-spatstat-import - (lambda _ - (substitute* "NAMESPACE" - (("importFrom\\(spatstat,markvario\\)") - "importFrom(spatstat.core,markvario)") - (("importFrom\\(spatstat,ppp\\)") - "importFrom(spatstat.geom,ppp)"))))))) (propagated-inputs `(("r-cluster" ,r-cluster) ("r-cowplot" ,r-cowplot) @@ -26545,7 +26533,8 @@ other R users.") ("r-sctransform" ,r-sctransform) ("r-seuratobject" ,r-seuratobject) ("r-shiny" ,r-shiny) - ("r-spatstat" ,r-spatstat) + ("r-spatstat-core" ,r-spatstat-core) + ("r-spatstat-geom" ,r-spatstat-geom) ("r-tibble" ,r-tibble) ("r-uwot" ,r-uwot))) (home-page "http://www.satijalab.org/seurat") -- cgit v1.2.3 From a2b1c149df1626e5a9ac6b3dc9c4d465ba79aedd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:23:56 +0200 Subject: gnu: Add r-workflowsets. * gnu/packages/cran.scm (r-workflowsets): New variable. --- gnu/packages/cran.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fcde611f5d..f47d35ae42 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25853,6 +25853,45 @@ for finding reasonable values of hyper-parameters in models, pre-processing methods, and post-processing steps.") (license license:expat))) +(define-public r-workflowsets + (package + (name "r-workflowsets") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "workflowsets" version)) + (sha256 + (base32 + "1q41isvj7hhbkx3y8k6kazpiygig92xannsz8dpklh0k3j9l3c2p")))) + (properties `((upstream-name . "workflowsets"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cli" ,r-cli) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-prettyunits" ,r-prettyunits) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-rsample" ,r-rsample) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) + ("r-tune" ,r-tune) + ("r-vctrs" ,r-vctrs) + ("r-withr" ,r-withr) + ("r-workflows" ,r-workflows))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/tidymodels/workflowsets") + (synopsis "Create a collection of tidymodels workflows") + (description + "A workflow is a combination of a model and preprocessors (e.g, a +formula, recipe, etc.). In order to try different combinations of these, an +object can be created that contains many workflows. There are functions to +create workflows en masse as well as training them and visualizing the +results.") + (license license:expat))) + (define-public r-tidyposterior (package (name "r-tidyposterior") -- cgit v1.2.3 From 08462c02c2a93ad82444222b3f20f8cb05c18c3a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:48 +0200 Subject: gnu: r-diffobj: Update to 0.3.4. * gnu/packages/cran.scm (r-diffobj): Update to 0.3.4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f47d35ae42..597a317f9c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -156,14 +156,14 @@ automatically pruning objects to maintain the constraints.") (define-public r-diffobj (package (name "r-diffobj") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) (uri (cran-uri "diffobj" version)) (sha256 (base32 - "1x3d5sk8mk0s2d7dq8wxi1zv6krlx33n22ls2jwnb58b8xrmakj1")))) + "1z4yhfasjpi9rxl1lh9bny7yvs947a6hhc768azc1wwad748mk9q")))) (properties `((upstream-name . "diffobj"))) (build-system r-build-system) (propagated-inputs `(("r-crayon" ,r-crayon))) -- cgit v1.2.3 From c55b81d99f3aecc7c91871c84b45064334fc47df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:48 +0200 Subject: gnu: r-ggpmisc: Update to 0.3.9. * gnu/packages/cran.scm (r-ggpmisc): Update to 0.3.9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 597a317f9c..21a455a6fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -393,13 +393,13 @@ variables.") (define-public r-ggpmisc (package (name "r-ggpmisc") - (version "0.3.8-1") + (version "0.3.9") (source (origin (method url-fetch) (uri (cran-uri "ggpmisc" version)) (sha256 (base32 - "0kcrh73nwha52vl6z35wafmqs5lsdh2p4nqvi2ir70cv1k5y46zf")))) + "0nb0lpwqph9334s9sq77mk3nd22icy9d9hywz4awhf6nvp5rcc2v")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit v1.2.3 From 3e30068225f3ea52a3a4a5d7d7e953283c186318 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:48 +0200 Subject: gnu: r-oenb: Update to 0.0.2. * gnu/packages/cran.scm (r-oenb): Update to 0.0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 21a455a6fe..0542bb325d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -501,14 +501,14 @@ higher.") (define-public r-oenb (package (name "r-oenb") - (version "0.0.1") + (version "0.0.2") (source (origin (method url-fetch) (uri (cran-uri "oenb" version)) (sha256 (base32 - "1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz")))) + "1jgxw7ycx2lcdzglg9nix8k08fs4r6i5jdsjzrd6w1dg6smsinl5")))) (properties `((upstream-name . "oenb"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 183e3b413c5e24d20f565ef94ec653f90e66419b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-reprex: Update to 2.0.0. * gnu/packages/cran.scm (r-reprex): Update to 2.0.0. [propagated-inputs]: Add r-rstudioapi. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0542bb325d..f3452c2653 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -927,14 +927,14 @@ package is a port of the Python package @code{cssselect}.") (define-public r-reprex (package (name "r-reprex") - (version "1.0.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "reprex" version)) (sha256 (base32 - "07nzx0fdl48jw95ipx17ql0l13q60yl3rjrkj1m375wrc7h1v5nx")))) + "1lcnxczy28n4g3rvph09va7svcznfyqa7zdggklqb924qvy7flwh")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) @@ -945,6 +945,7 @@ package is a port of the Python package @code{cssselect}.") ("r-knitr" ,r-knitr) ("r-rlang" ,r-rlang) ("r-rmarkdown" ,r-rmarkdown) + ("r-rstudioapi" ,r-rstudioapi) ("r-withr" ,r-withr))) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 2eafe4ee97f47707c3d7a5c2777b5a5eccf255f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-callr: Update to 3.6.0. * gnu/packages/cran.scm (r-callr): Update to 3.6.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f3452c2653..1aa80edbf1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -984,14 +984,14 @@ same time tries to group instances from the same class together.") (define-public r-callr (package (name "r-callr") - (version "3.5.1") + (version "3.6.0") (source (origin (method url-fetch) (uri (cran-uri "callr" version)) (sha256 (base32 - "15l6ppsxdadlnl4fk0f8bvf327n8izk96px5d08m1ay9iij8qcyf")))) + "050s7l1ipi6snbj6xnk052l6acycnxjyzv84026adw5x8kki0yz6")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) -- cgit v1.2.3 From 667f719b447b23a860443a9e2531ddd0c0d3b4ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-psych: Update to 2.1.3. * gnu/packages/cran.scm (r-psych): Update to 2.1.3. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1aa80edbf1..39cb7522a0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4223,19 +4223,21 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "2.0.12") + (version "2.1.3") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "0k5dw5nb7kx7f21b0z01dry99qcpnk7iaicv7xq9d35wv2hx8wca")))) + "1ibh1ivr280wpmk3qjgm715dk79wx0ikjl9jjjcqs03q6vz4wmdx")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) ("r-mnormt" ,r-mnormt) ("r-nlme" ,r-nlme))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/psych/") (synopsis "Procedures for psychological, psychometric, and personality research") (description -- cgit v1.2.3 From bd005c093a8fb87ca8a8518517aea28596eecf0c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-broom: Update to 0.7.6. * gnu/packages/cran.scm (r-broom): Update to 0.7.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 39cb7522a0..73bcbc1106 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4278,14 +4278,14 @@ by base R methods related to model fitting.") (define-public r-broom (package (name "r-broom") - (version "0.7.5") + (version "0.7.6") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "1qjyl5b100bsakm48w1vi3819lkpys7vb86n1sv9h4y2wr1c4jmw")))) + "1ljcl8mh0yqxw3qxzar482qwbxbcaim1x6y1wm82ws12pfdw0j8n")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit v1.2.3 From c6976608be1a91a15e2f7c9837bbd40aa5cf7cc2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-vioplot: Update to 0.3.6. * gnu/packages/cran.scm (r-vioplot): Update to 0.3.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 73bcbc1106..3d060a6f9b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4768,14 +4768,14 @@ structure.") (define-public r-vioplot (package (name "r-vioplot") - (version "0.3.5") + (version "0.3.6") (source (origin (method url-fetch) (uri (cran-uri "vioplot" version)) (sha256 (base32 - "0aiy615kn9lpr2cs757g3pklg81n01yhqh0wrwv111fn3cy86r0v")))) + "15vmrm9gwdhfg8mnq8rsg7m59kzc9h53cv96am4ds1dkm56w4n6p")))) (build-system r-build-system) (propagated-inputs `(("r-sm" ,r-sm) -- cgit v1.2.3 From db62940b1339cdca8f0f8c746faefec8343f7f56 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:50 +0200 Subject: gnu: r-cli: Update to 2.4.0. * gnu/packages/cran.scm (r-cli): Update to 2.4.0. [propagated-inputs]: Remove r-assertthat. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3d060a6f9b..dbcda18133 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5051,18 +5051,17 @@ plots in @code{ggplot2}.") (define-public r-cli (package (name "r-cli") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "1jh64ixn6mg2ap1sx4azrxkjnlsyjbfxyc9zjkx8m9dlakgf4v2i")))) + "0l1s9yv23bc7mm0hfdlamgz4wjfrisv8aylr65ihjs98jsynrkg3")))) (build-system r-build-system) (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-glue" ,r-glue))) + `(("r-glue" ,r-glue))) (home-page "https://github.com/r-lib/cli#readme") (synopsis "Helpers for developing command line interfaces") (description "This package provides a suite of tools designed to build -- cgit v1.2.3 From ab9531e3b7ff50f4bb0f2af051ad697b814bf6f4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:50 +0200 Subject: gnu: r-processx: Update to 3.5.1. * gnu/packages/cran.scm (r-processx): Update to 3.5.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dbcda18133..45de6ae91b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5113,13 +5113,13 @@ constants, and control debugging of packages via environment variables.") (define-public r-processx (package (name "r-processx") - (version "3.4.5") + (version "3.5.1") (source (origin (method url-fetch) (uri (cran-uri "processx" version)) (sha256 - (base32 "055v2gdrgqsfy8s672wsq79bqr44b4jjmcbqivx4p2d6lqx10s73")))) + (base32 "1z7zag7g041xlhzhkdfl33y2phc877h1pwj9k69p69b967qi6p6k")))) (build-system r-build-system) (propagated-inputs `(("r-ps" ,r-ps) -- cgit v1.2.3 From 69c18192d7bcee2b97a6a13d89f620190d045d15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:50 +0200 Subject: gnu: r-vctrs: Update to 0.3.7. * gnu/packages/cran.scm (r-vctrs): Update to 0.3.7. [propagated-inputs]: Remove r-digest. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 45de6ae91b..e9b5091982 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5325,18 +5325,17 @@ to variables on the left-hand side of the assignment.") (define-public r-vctrs (package (name "r-vctrs") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "09ddxgzyah7lw42hn6n8fynsixf43s10jamsf94d2aidky63czfz")))) + "03hyxk3x635xfdn2x707gygdb2xk0cayl1nl44zib9bwqyyb7nas")))) (build-system r-build-system) (propagated-inputs - `(("r-digest" ,r-digest) - ("r-ellipsis" ,r-ellipsis) + `(("r-ellipsis" ,r-ellipsis) ("r-glue" ,r-glue) ("r-rlang" ,r-rlang))) (native-inputs -- cgit v1.2.3 From 5666f9919958e1da5c25cf2eac0b280686f04485 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:50 +0200 Subject: gnu: r-tinytex: Update to 0.31. * gnu/packages/cran.scm (r-tinytex): Update to 0.31. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e9b5091982..3b5a53b51c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5413,14 +5413,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.30") + (version "0.31") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "0dk6mpszwh1m65b0wfwjlcvpzywmasf6p31niqiq53wnd92my0gw")))) + "04a3ncaxix30n9m73slpsn1idxv7j1f7fy3nhxpvkk514x9rgg0p")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From f802ddb2422355d9870513a400633d9226db29d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:51 +0200 Subject: gnu: r-sapa: Update to 2.0-3. * gnu/packages/cran.scm (r-sapa): Update to 2.0-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3b5a53b51c..d9e50162b2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5728,14 +5728,14 @@ sapa R packages.") (define-public r-sapa (package (name "r-sapa") - (version "2.0-2") + (version "2.0-3") (source (origin (method url-fetch) (uri (cran-uri "sapa" version)) (sha256 (base32 - "056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds")))) + "0kj681rd4c2lvqr926lb6f4qwp281x5274dg6vbk8pf5y7s0qlpc")))) (build-system r-build-system) (propagated-inputs `(("r-ifultools" ,r-ifultools) -- cgit v1.2.3 From 07958074342bd54a472e2d73cb3147fbaa5b834a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:51 +0200 Subject: gnu: r-arules: Update to 1.6-7. * gnu/packages/cran.scm (r-arules): Update to 1.6-7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d9e50162b2..84b77463aa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6707,14 +6707,14 @@ evaluated by the @dfn{Akaike Information Criterion} (AIC).") (define-public r-arules (package (name "r-arules") - (version "1.6-6") + (version "1.6-7") (source (origin (method url-fetch) (uri (cran-uri "arules" version)) (sha256 (base32 - "1pk3jjizn2m5rwi7qkdkbq9f07acgpy0qdzzqmx0agg47cwahlkm")))) + "0m80kndfbannw8h53nqdd5wl8h33q2z259aa1cp1nwadaxf9fc1q")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 3d7e85a832a2f60f732ce79ff1a07a1756c19b06 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:51 +0200 Subject: gnu: r-rastervis: Update to 0.50.1. * gnu/packages/cran.scm (r-rastervis): Update to 0.50.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 84b77463aa..7b6158c8bd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7232,14 +7232,14 @@ Python's @url{https://github.com/ActiveState/appdirs,Appdirs} to R.") (define-public r-rastervis (package (name "r-rastervis") - (version "0.50") + (version "0.50.1") (source (origin (method url-fetch) (uri (cran-uri "rasterVis" version)) (sha256 (base32 - "0m7fjd53apxim0d0rjnyzc28vmfcg4spcrn0zbnk8llillxji1hi")))) + "1fkmyllydnmk3j2cmgf86r91wyxf2kh573x8bkck7wgkfniw4h7w")))) (properties `((upstream-name . "rasterVis"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 74554d52695c5a4256bec25d6c5654f2698e23b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:52 +0200 Subject: gnu: r-renv: Update to 0.13.2. * gnu/packages/cran.scm (r-renv): Update to 0.13.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7b6158c8bd..d4b15f42c6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7291,14 +7291,14 @@ those searches and pull data into their R sessions.") (define-public r-renv (package (name "r-renv") - (version "0.13.0") + (version "0.13.2") (source (origin (method url-fetch) (uri (cran-uri "renv" version)) (sha256 (base32 - "16n2dz9jibc03f7q1wrzxss6l5jmaks7m2lnli9dz9anvcmxbdia")))) + "0jlsf6vfvqhr4i35xy3xf1ixkfillivzy3wbpl6ca9vyjpnhiwj1")))) (properties `((upstream-name . "renv"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From d62f9f8de6a094a3b0ca5de3313201a43b80c7c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:52 +0200 Subject: gnu: r-rbibutils: Update to 2.1. * gnu/packages/cran.scm (r-rbibutils): Update to 2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d4b15f42c6..73055c06e4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7862,14 +7862,14 @@ hierarchical models using Markov Chain Monte Carlo (MCMC) simulation.") (define-public r-rbibutils (package (name "r-rbibutils") - (version "2.0") + (version "2.1") (source (origin (method url-fetch) (uri (cran-uri "rbibutils" version)) (sha256 (base32 - "1vfg2188i4dyhrmvnwpsh2la8qkd4wkryz2fpj4cppi1wfz3ml83")))) + "13phw0dk3p3s1z45ff7dbqnn27zws1209mp3d4763zh7xnsdsl44")))) (properties `((upstream-name . "rbibutils"))) (build-system r-build-system) (home-page "https://geobosh.github.io/rbibutils/") -- cgit v1.2.3 From d54765907cff3925966e1aca4b615df642a13e36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:52 +0200 Subject: gnu: r-officer: Update to 0.3.18. * gnu/packages/cran.scm (r-officer): Update to 0.3.18. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 73055c06e4..94b11e9ab0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7910,14 +7910,14 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.3.17") + (version "0.3.18") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1apg0dh1zfhrqcbbmm8318l40gyjbqc2l9sdvwxx7qi8mzc1mqvw")))) + "1j3bv4j8x5ijj0j447vpdsk4p8pl3ncwdwnns6n3plfrqgsf3vsg")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) -- cgit v1.2.3 From 60f6aa20e9862dfeba7c3943ccb83ab0f09a80c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:52 +0200 Subject: gnu: r-insight: Update to 0.13.2. * gnu/packages/cran.scm (r-insight): Update to 0.13.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 94b11e9ab0..7c74659481 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8171,14 +8171,14 @@ other add-on packages.") (define-public r-insight (package (name "r-insight") - (version "0.13.1") + (version "0.13.2") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "1la4yxzfl9fnknamnaziil6gvpdzl78z16lfzis9jgzg8r9q0y5l")))) + "03b7kd17h25mi1si40ibcp3jpasyqpj51mr8js0ywywyfw7909j1")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From f1d038bd0e5fae9fd0d4fe05a84357cebb38c58b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:53 +0200 Subject: gnu: r-magick: Update to 2.7.1. * gnu/packages/cran.scm (r-magick): Update to 2.7.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7c74659481..ff368b6a6b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9668,14 +9668,14 @@ samples is large and the number of mixture components is not too large.") (define-public r-magick (package (name "r-magick") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "0m1kij6pp7dmsrhl80h60iyccjqmbbb3zdnqdc9sgy1kj1x3pscp")))) + "16svy84dq25g69axqgympsrh8dzssa1w3zz08zc8m6nprr3jqwqf")))) (build-system r-build-system) (inputs `(("imagemagick" ,imagemagick) -- cgit v1.2.3 From 8f0c5bd3ebdc083967c105cf20b9dfbff790eebc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:53 +0200 Subject: gnu: r-emmeans: Update to 1.5.5-1. * gnu/packages/cran.scm (r-emmeans): Update to 1.5.5-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ff368b6a6b..9b400cad2f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10110,14 +10110,14 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-emmeans (package (name "r-emmeans") - (version "1.5.4") + (version "1.5.5-1") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "1rbh3ls23fazrwpsam5llk3kqdzz2zvsms3i4f1cgn34ky3w8361")))) + "0l5dd71ihhs7zy6ygniy07iisgy7a1ai1w41hqf84swb0j3cl6iz")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit v1.2.3 From 51d9bcf64ba29c5162f72f331383cdf089fd3f00 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:53 +0200 Subject: gnu: r-ggeffects: Update to 1.0.2. * gnu/packages/cran.scm (r-ggeffects): Update to 1.0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9b400cad2f..38703f2b0b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10400,14 +10400,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "1c5rvycaqp7zp1j6j17c84v8nlpi0w7bhfxmcha4n37m0snk1kgy")))) + "0qh8x8yi8gkb5x7zfxmb1c689k7bhc1f5947yymny34j7xdsb9s8")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight) -- cgit v1.2.3 From 799526f97c9488abc4060f5330636648980ba568 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:53 +0200 Subject: gnu: r-effectsize: Update to 0.4.4-1. * gnu/packages/cran.scm (r-effectsize): Update to 0.4.4-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 38703f2b0b..97ee2f50d2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10430,14 +10430,14 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.4.4") + (version "0.4.4-1") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "0mgkq12ym72ncakkjpkzkjglhksyhj3iw8v4a8fjgpf7prvn191g")))) + "02rwf3lxnzgc8yh0wridsc6lqr9s6v0cqzbk4biwnr494rvs46zb")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8917f29fba9cb5aa83c8c9e41cb590cc92add3b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:54 +0200 Subject: gnu: r-gh: Update to 1.2.1. * gnu/packages/cran.scm (r-gh): Update to 1.2.1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 97ee2f50d2..45d0ed9327 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10547,14 +10547,14 @@ repositories.") (define-public r-gh (package (name "r-gh") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "gh" version)) (sha256 (base32 - "1zvy3ylxvni10lhvmbm9h14mg4wlsbdbzbzviwf28jxss8749219")))) + "16xa1qb1r28f8yc6ybjrxiq2zigxj886dp9k29jpsn5091xbzkq0")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit v1.2.3 From 43f88bc36d26a4cc909212b9a23d2a1ce9a96e60 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:54 +0200 Subject: gnu: r-gert: Update to 1.3.0. * gnu/packages/cran.scm (r-gert): Update to 1.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 45d0ed9327..1dbda7d706 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10658,14 +10658,14 @@ user credentials.") (define-public r-gert (package (name "r-gert") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "gert" version)) (sha256 (base32 - "0ag2ia6cfb5drf3517lg5nhik1w0nv09a75wdy5jdciws1qra3d6")))) + "1fh72p92wj83yv1ch77jms6k1gjqfji8cmgw23vpxd0p8l9jj4h7")))) (properties `((upstream-name . "gert"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From c9dbd368569b3ac5157ea95101e2694d9eddcac9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:54 +0200 Subject: gnu: r-remotes: Update to 2.3.0. * gnu/packages/cran.scm (r-remotes): Update to 2.3.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1dbda7d706..c9b5f780ca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10758,14 +10758,14 @@ more information about packages, and where they were installed from.") (define-public r-remotes (package (name "r-remotes") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "remotes" version)) (sha256 (base32 - "1f1kdw9j1wald3fs8b3n68x1kljy07j60g3aw1aarx26ikyk9whj")))) + "0f35648bdxhvplcfj80r4hfj5w21f1s01kcz6b29d098c1mnfzb7")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From 77ca025cfe5159067af6d9883a500e81b703531e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:54 +0200 Subject: gnu: r-summarytools: Update to 0.9.9. * gnu/packages/cran.scm (r-summarytools): Update to 0.9.9. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c9b5f780ca..6baad1ec19 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10884,14 +10884,14 @@ ways.") (define-public r-summarytools (package (name "r-summarytools") - (version "0.9.8") + (version "0.9.9") (source (origin (method url-fetch) (uri (cran-uri "summarytools" version)) (sha256 (base32 - "0n7rad6bkfn9cb99wbfzbwl5qzch48r0gafhddfcqvyh4fbn2k0j")))) + "0ig7vgjvldbndwhky1bsi38zifr9ji8xvvfqbfffplac08llvrbr")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) -- cgit v1.2.3 From 3626d0674544d957eaec1a1a912a939738cc3940 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:55 +0200 Subject: gnu: r-biocmanager: Update to 1.30.12. * gnu/packages/cran.scm (r-biocmanager): Update to 1.30.12. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 6baad1ec19..caa1f43226 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11275,15 +11275,17 @@ netCDF files.") (define-public r-biocmanager (package (name "r-biocmanager") - (version "1.30.10") + (version "1.30.12") (source (origin (method url-fetch) (uri (cran-uri "BiocManager" version)) (sha256 - (base32 "03n9s2vf7vgpgb5alpxwamf9xfkn32cbzngwyn6spq1bnh9a9dzk")))) + (base32 "0c2anza01pc36manj3cvycbq8p57qpq18dsimk3y3gpks70hhqf3")))) (properties `((upstream-name . "BiocManager"))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/BiocManager/") (synopsis "Access the Bioconductor project package repository") (description -- cgit v1.2.3 From d47d3c9c9f09c8bca07e409cfa313174818c23ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:55 +0200 Subject: gnu: r-tiff: Update to 0.1-8. * gnu/packages/cran.scm (r-tiff): Update to 0.1-8. [native-inputs]: Add pkg-config. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index caa1f43226..c33960b2e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11702,19 +11702,21 @@ redundant complex conjugate when the input is real data.") (define-public r-tiff (package (name "r-tiff") - (version "0.1-7") + (version "0.1-8") (source (origin (method url-fetch) (uri (cran-uri "tiff" version)) (sha256 (base32 - "101n6x70fr1dhcwx53g3s8q1j4wh93y0388v1s1316f8558rxqxh")))) + "18m17g5q3nz4v4wrqxnb129b1j02873g2vknddczkklf1pvq4x2b")))) (build-system r-build-system) (inputs `(("libtiff" ,libtiff) ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://www.rforge.net/tiff/") (synopsis "Read and write TIFF images") (description -- cgit v1.2.3 From 1efeb891adb2387a26ff7421d28267240c7b078b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:55 +0200 Subject: gnu: r-gargle: Update to 1.1.0. * gnu/packages/cran.scm (r-gargle): Update to 1.1.0. [propagated-inputs]: Add r-cli, r-rappdirs, and r-rstudioapi. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c33960b2e0..c88d56683e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12618,21 +12618,24 @@ and manipulating sets of ontological terms.") (define-public r-gargle (package (name "r-gargle") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "gargle" version)) (sha256 (base32 - "0hsqn4hf935wn6vk2pwym7la4sdvy271y4cashp38pg4hkpg9zph")))) + "03y29dzz54bw9px5k8a72vmc000lcyrkc5l0izkqcciyi9ijkr3w")))) (build-system r-build-system) (propagated-inputs - `(("r-fs" ,r-fs) + `(("r-cli" ,r-cli) + ("r-fs" ,r-fs) ("r-glue" ,r-glue) ("r-httr" ,r-httr) ("r-jsonlite" ,r-jsonlite) + ("r-rappdirs" ,r-rappdirs) ("r-rlang" ,r-rlang) + ("r-rstudioapi" ,r-rstudioapi) ("r-withr" ,r-withr))) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From dd3b0dd9b8cfd78506eb860ddceaf21370ebe4a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:55 +0200 Subject: gnu: r-rmpfr: Update to 0.8-3. * gnu/packages/cran.scm (r-rmpfr): Update to 0.8-3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c88d56683e..af057197ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12710,14 +12710,14 @@ limitations\" using the GNU Multiple Precision library.") (define-public r-rmpfr (package (name "r-rmpfr") - (version "0.8-2") + (version "0.8-3") (source (origin (method url-fetch) (uri (cran-uri "Rmpfr" version)) (sha256 (base32 - "007pc7fpzl2mcg3qxa2vfjip6m2dr314qjsnybkj3kdj70bszxkl")))) + "1m9wwwch9wg886147brr2zfih65yfdfs3vmfvim1w6jykycasc9a")))) (properties `((upstream-name . "Rmpfr"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 24e9b0cee963e7000b1e20a4bdcc10504ea4dd54 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:56 +0200 Subject: gnu: r-units: Update to 0.7-1. * gnu/packages/cran.scm (r-units): Update to 0.7-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index af057197ab..267f8097fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15135,14 +15135,14 @@ utilities for sequence data management under the ACNUC system.") (define-public r-units (package (name "r-units") - (version "0.7-0") + (version "0.7-1") (source (origin (method url-fetch) (uri (cran-uri "units" version)) (sha256 (base32 - "0kwfcrrbcwl7s50n1wp33vswqzmprh91clvakbd1jpznqpg5m3js")))) + "0wwndzjjgqj795xvx1jwa86nwd8adfiwj0pn15yyzzk9baky2axw")))) (build-system r-build-system) (inputs `(("udunits" ,udunits))) -- cgit v1.2.3 From b5b7975fa1169ed117579638ad3174092f165d1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:56 +0200 Subject: gnu: r-sf: Update to 0.9-8. * gnu/packages/cran.scm (r-sf): Update to 0.9-8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 267f8097fe..a4220d11d6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15288,14 +15288,14 @@ tessellation.") (define-public r-sf (package (name "r-sf") - (version "0.9-7") + (version "0.9-8") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "175fmnnw11fjhfgjv9sn9b0jfjcqbybpgwsvv99d5yddigvw5jja")))) + "096gg2hbynn6mv3w8n69x987fklg5rrgd0d4nbqaw7vhg1jhlmqi")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) -- cgit v1.2.3 From ba22116deb1e3349bdfbb00b67955551bf5a2ce3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:56 +0200 Subject: gnu: r-spdep: Update to 1.1-7. * gnu/packages/cran.scm (r-spdep): Update to 1.1-7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a4220d11d6..49394ea4bb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15325,14 +15325,14 @@ datum transformations.") (define-public r-spdep (package (name "r-spdep") - (version "1.1-5") + (version "1.1-7") (source (origin (method url-fetch) (uri (cran-uri "spdep" version)) (sha256 (base32 - "0pbd7wrg5v44p2yxsjp774lpyzap3madir5mn5p3ix7ibk7ldjs7")))) + "0sg417d95paww625663lgmk6jwhs88djqzc96gbs1hxazlf77qb1")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) -- cgit v1.2.3 From 6b575bfd19238ee656644f828cfcc1f658ad1788 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:56 +0200 Subject: gnu: r-rms: Update to 6.2-0. * gnu/packages/cran.scm (r-rms): Update to 6.2-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 49394ea4bb..bd911159bd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15528,13 +15528,13 @@ lspec, polyclass, and polymars.") (define-public r-rms (package (name "r-rms") - (version "6.1-1") + (version "6.2-0") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "1zgfd60lzbakcv7x0i5k3lkw3s0xx5bzssjgangna5lq2j17cdli")))) + (base32 "1di4xvsx0rwkr77nfqiysbg4qf699199xqil70i39d4zwfzqrm8h")))) (build-system r-build-system) (propagated-inputs `(("r-cluster" ,r-cluster) -- cgit v1.2.3 From 455f5339db63df56cee074cad8b1e1438dbace5c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:57 +0200 Subject: gnu: r-tweenr: Update to 1.0.2. * gnu/packages/cran.scm (r-tweenr): Update to 1.0.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bd911159bd..272ce32e8d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16272,14 +16272,14 @@ packages with Rcpp.") (define-public r-tweenr (package (name "r-tweenr") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "tweenr" version)) (sha256 (base32 - "0sq90pbln6lkc2q3zflhkxxwpqdw5dd7igrxhdnlynkdrmi83mpg")))) + "17znizh4yabh2zs9mzyr0sl6p0pw49961i61br7cl1b7v9sza18q")))) (build-system r-build-system) (propagated-inputs `(("r-farver" ,r-farver) -- cgit v1.2.3 From 3cfed8ca6a31544bcb38c03bbf2363bbdea9c043 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:57 +0200 Subject: gnu: r-styler: Update to 1.4.1. * gnu/packages/cran.scm (r-styler): Update to 1.4.1. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 272ce32e8d..1f7e043457 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17186,14 +17186,14 @@ batch correction, and data correction.") (define-public r-styler (package (name "r-styler") - (version "1.3.2") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "styler" version)) (sha256 (base32 - "1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz")))) + "10fj4cnazicb2z9djbv5pszcmrf7wbzagbjvksffqpdc5vbbbw5x")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) @@ -17207,6 +17207,8 @@ batch correction, and data correction.") ("r-tibble" ,r-tibble) ("r-withr" ,r-withr) ("r-xfun" ,r-xfun))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-lib/styler") (synopsis "Non-invasive pretty printing of R code") (description -- cgit v1.2.3 From ad59fd9e6013cec3732493475b07ef2be0f2964b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:57 +0200 Subject: gnu: r-dae: Update to 3.1-37. * gnu/packages/cran.scm (r-dae): Update to 3.1-37. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1f7e043457..f88e847a71 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17462,14 +17462,14 @@ classification and regression models.") (define-public r-dae (package (name "r-dae") - (version "3.1-32") + (version "3.1-37") (source (origin (method url-fetch) (uri (cran-uri "dae" version)) (sha256 (base32 - "126w1lb9pz8mb2ajl2vz5dj798nbifp0dypnzfgcwixif5g5bpqi")))) + "102fgbdpn7yvm1zj180cv4sr1096sz35d4gndsv7w9kriqyi1c1l")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit v1.2.3 From ca88d9c0273811f8b3911a205813e8517012588b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-dalex: Update to 2.2.0. * gnu/packages/cran.scm (r-dalex): Update to 2.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f88e847a71..86072f0e68 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17501,14 +17501,14 @@ been used in the call to @code{aov}.") (define-public r-dalex (package (name "r-dalex") - (version "2.1.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "1dnqsml94s648w8swsrq8spddnd4mj5pl3q6xxr917w6a1jxgyfz")))) + "1qnjbhilv4jfmwqxfi9xc5ysrh8gr84a2a5imjfci7d1n3zcnryn")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From bc65d86b946dc5438d70670370e87ccffa509e19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-gamlss-data: Update to 6.0-1. * gnu/packages/cran.scm (r-gamlss-data): Update to 6.0-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 86072f0e68..1b643d4304 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19581,14 +19581,14 @@ discussed in Reisen et al. (2017) @url{doi:10.1016/j.jspi.2017.02.008}.") (define-public r-gamlss-data (package (name "r-gamlss-data") - (version "5.1-4") + (version "6.0-1") (source (origin (method url-fetch) (uri (cran-uri "gamlss.data" version)) (sha256 (base32 - "1dgfspbmps6ipzcmw681wjdp320nm50dwsxafgrcwxndqgc7fdqd")))) + "1cjb2n5i5mnhmb5qbqycdbfg65j7nxb9s74yihqs9kpa39byrzcq")))) (properties `((upstream-name . "gamlss.data"))) (build-system r-build-system) (home-page "http://www.gamlss.org/") -- cgit v1.2.3 From ab5850c7d940ec151371318b2034fbb60126c126 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-gamlss: Update to 5.3-4. * gnu/packages/cran.scm (r-gamlss): Update to 5.3-4. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1b643d4304..a0293a2471 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19602,14 +19602,14 @@ models.") (define-public r-gamlss (package (name "r-gamlss") - (version "5.3-1") + (version "5.3-4") (source (origin (method url-fetch) (uri (cran-uri "gamlss" version)) (sha256 (base32 - "1ngf6g4zixwm6ni5r0fs0f6132xd2f2a6mlski9hlqnvvwb46iwr")))) + "06mh00jjxnqwknbv777hawjk0zm81ixrp35fg59mrlqz8y3p2w3j")))) (properties `((upstream-name . "gamlss"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From c3ebc726cd71cd20fd039e84eea63817ee930806 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-actuar: Update to 3.1-2. * gnu/packages/cran.scm (r-actuar): Update to 3.1-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a0293a2471..818edbf3b5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20813,14 +20813,14 @@ API; see the package vignette for details.") (define-public r-actuar (package (name "r-actuar") - (version "3.1-1") + (version "3.1-2") (source (origin (method url-fetch) (uri (cran-uri "actuar" version)) (sha256 (base32 - "0sxn1mskh7x164f1vbrqnadgxnq7y2p3a9mlmqc0sp6cqkw9lhp9")))) + "0gaqm8bkjly2b1jkr1nqnxlp5vqvfpj0a4jd70jv4f9ndlif676y")))) (properties `((upstream-name . "actuar"))) (build-system r-build-system) (propagated-inputs `(("r-expint" ,r-expint))) -- cgit v1.2.3 From b615567e4f229c8b33ab6ccffe9791d93f16a8a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-imager: Update to 0.42.8. * gnu/packages/cran.scm (r-imager): Update to 0.42.8. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 818edbf3b5..a02620a09c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20890,14 +20890,14 @@ number embedded in the file rather than the file extension.") (define-public r-imager (package (name "r-imager") - (version "0.42.7") + (version "0.42.8") (source (origin (method url-fetch) (uri (cran-uri "imager" version)) (sha256 (base32 - "1dq0rblnrmnk689bcdmml179gk9lff8x92s2npkjllgjq5q2vfpd")))) + "1kzl93l6k9i4528bbycbqxdn28mj7hnx0fbxisva859xl1wys5c5")))) (properties `((upstream-name . "imager"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 83f2c1479046837fd8151037c9c33ea7f7861cb5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:59 +0200 Subject: gnu: r-univoutl: Update to 0.3. * gnu/packages/cran.scm (r-univoutl): Update to 0.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a02620a09c..67cdb3f35a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21039,14 +21039,14 @@ functions.") (define-public r-univoutl (package (name "r-univoutl") - (version "0.2") + (version "0.3") (source (origin (method url-fetch) (uri (cran-uri "univOutl" version)) (sha256 (base32 - "0rlc3w7cx2hfxacpjs9kmjzv5p8v9wxnlpxi3rh276wiy5zdr91v")))) + "1hhpxrpmp2wbrynx9xjndnp2sccirgky2x6ksd6yk6phmk0rbzjp")))) (properties `((upstream-name . "univOutl"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From f3785d8a1fdefbf02d99ab616b8a9b993137215d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:59 +0200 Subject: gnu: r-shapes: Update to 1.2.6. * gnu/packages/cran.scm (r-shapes): Update to 1.2.6. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 67cdb3f35a..109ecdd5cf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21254,14 +21254,14 @@ different conceptual parts of the algorithm.") (define-public r-shapes (package (name "r-shapes") - (version "1.2.5") + (version "1.2.6") (source (origin (method url-fetch) (uri (cran-uri "shapes" version)) (sha256 (base32 - "0gfpdydfysp5mwg7qmkn73s67gvh2szb40mzqrx97h41ijgcgd8s")))) + "1p9fr95zk3q2v277c5ksb0nh26mcpzwjzjb2lmag51z6hck8cb66")))) (properties `((upstream-name . "shapes"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 13aca4c035d36e44d871fc84d15c6a393a6cda70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:59 +0200 Subject: gnu: r-quanteda: Update to 3.0.0. * gnu/packages/cran.scm (r-quanteda): Update to 3.0.0. [propagated-inputs]: Remove r-data-table, r-digest, r-extrafont, r-ggplot2, r-ggrepel, r-jsonlite, r-network, r-proxyc, and r-sna. --- gnu/packages/cran.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 109ecdd5cf..b208ba6f07 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22054,32 +22054,23 @@ Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.") (define-public r-quanteda (package (name "r-quanteda") - (version "2.1.2") + (version "3.0.0") (source (origin (method url-fetch) (uri (cran-uri "quanteda" version)) (sha256 (base32 - "13rjwgmg5v1dbryrs9ifyy76s5ib6wrbrm2y5af44vhf1h6p9cvy")))) + "0b1jfkdhpsg5jhjz4p0nf4cmi9p8w40wv3i2f17jf2x1n1y2hjj8")))) (properties `((upstream-name . "quanteda"))) (build-system r-build-system) (propagated-inputs - `(("r-data-table" ,r-data-table) - ("r-digest" ,r-digest) - ("r-extrafont" ,r-extrafont) - ("r-fastmatch" ,r-fastmatch) - ("r-ggplot2" ,r-ggplot2) - ("r-ggrepel" ,r-ggrepel) - ("r-jsonlite" ,r-jsonlite) + `(("r-fastmatch" ,r-fastmatch) ("r-magrittr" ,r-magrittr) ("r-matrix" ,r-matrix) - ("r-network" ,r-network) - ("r-proxyc" ,r-proxyc) ("r-rcpp" ,r-rcpp) ("r-rcpparmadillo" ,r-rcpparmadillo) ("r-rcppparallel" ,r-rcppparallel) - ("r-sna" ,r-sna) ("r-snowballc" ,r-snowballc) ("r-stopwords" ,r-stopwords) ("r-stringi" ,r-stringi) -- cgit v1.2.3 From 3a849bf973d69d34e59e40bcb51030676ee392a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:59 +0200 Subject: gnu: r-packrat: Update to 0.6.0. * gnu/packages/cran.scm (r-packrat): Update to 0.6.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b208ba6f07..e9235568bb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22839,14 +22839,14 @@ interesting features. iheatmapr uses the plotly library for interactivity.") (define-public r-packrat (package (name "r-packrat") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "packrat" version)) (sha256 (base32 - "1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n")))) + "01cn2vf95nc8bh0hh8imkn030yra3hx64q1fb8jwsr52p9s397fr")))) (properties `((upstream-name . "packrat"))) (build-system r-build-system) (home-page "https://github.com/rstudio/packrat/") -- cgit v1.2.3 From 13747f581489b121f40382acd398a44eafadf280 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:00 +0200 Subject: gnu: r-latex2exp: Update to 0.5.0. * gnu/packages/cran.scm (r-latex2exp): Update to 0.5.0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e9235568bb..372ef17740 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23515,17 +23515,19 @@ appropriate dog and cat images for many status codes.") (define-public r-latex2exp (package (name "r-latex2exp") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "latex2exp" version)) (sha256 (base32 - "12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw")))) + "0qknpw7zwwbzsbry94j8fn48mq7kq5rc5448g9hybbisain3wfvg")))) (build-system r-build-system) (propagated-inputs `(("r-stringr" ,r-stringr) ("r-magrittr" ,r-magrittr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/stefano-meschiari/latex2exp/") (synopsis "Use LaTeX expressions in plots") (description "@code{latex2exp} parses and converts LaTeX math formulas to -- cgit v1.2.3 From e138e27410db5678054b317ded3774ac9deaf543 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:00 +0200 Subject: gnu: r-lightgbm: Update to 3.2.0. * gnu/packages/cran.scm (r-lightgbm): Update to 3.2.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 372ef17740..aafdfdd524 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24387,14 +24387,14 @@ input.") (define-public r-lightgbm (package (name "r-lightgbm") - (version "3.1.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (cran-uri "lightgbm" version)) (sha256 (base32 - "1pwsh6j9ksahh58b15j5ij56bsc6syy3z4k4a5zhy5n7829rz555")))) + "0aw1zcrg7nhddfaif9544hn8g8qcylv6vzpkf8d3kl07nzvgxkvj")))) (properties `((upstream-name . "lightgbm"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 213d7e76492cf19ebbdd41a740086a15e371102e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:00 +0200 Subject: gnu: r-shapforxgboost: Update to 0.1.1. * gnu/packages/cran.scm (r-shapforxgboost): Update to 0.1.1. [propagated-inputs]: Remove r-lightgbm. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index aafdfdd524..e94f44707d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24423,14 +24423,14 @@ designed to be distributed and efficient with the following goals: (define-public r-shapforxgboost (package (name "r-shapforxgboost") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (cran-uri "SHAPforxgboost" version)) (sha256 (base32 - "0jgyss9bawl7sf4dwa75sn7ld3mvrrr0z2074lbkq3f5qb9gwsly")))) + "106nsf02b1w3yshb55lwnyw1rl1a60162v2wk8znjz3b4ln3mqj5")))) (properties `((upstream-name . "SHAPforxgboost"))) (build-system r-build-system) @@ -24441,9 +24441,10 @@ designed to be distributed and efficient with the following goals: ("r-ggforce" ,r-ggforce) ("r-ggplot2" ,r-ggplot2) ("r-ggpubr" ,r-ggpubr) - ("r-lightgbm" ,r-lightgbm) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-xgboost" ,r-xgboost))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/liuyanguu/SHAPforxgboost") (synopsis "SHAP Plots for XGBoost") (description -- cgit v1.2.3 From 35654c72850558e8f40369ec227c689b084be09e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:00 +0200 Subject: gnu: r-spatstat-utils: Update to 2.1-0. * gnu/packages/cran.scm (r-spatstat-utils): Update to 2.1-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e94f44707d..f00fd6c025 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24776,14 +24776,14 @@ diagonals. This package allows you to compute the tensor product of arrays.") (define-public r-spatstat-utils (package (name "r-spatstat-utils") - (version "2.0-0") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.utils" version)) (sha256 (base32 - "1li0vksxpkvgyx3j2wi40kj5687vwakkfdix6icm6g01a0lb2m5d")))) + "18gqsc1a85pk69aifi10wprv1c0lci3zxp4wqjb27dlmlbz6jdgd")))) (properties `((upstream-name . "spatstat.utils"))) (build-system r-build-system) -- cgit v1.2.3 From 1134bab6d099d16a8c0bfeea39c9f450e6ce91f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-sparse: Update to 2.0-0. * gnu/packages/cran.scm (r-spatstat-sparse): Update to 2.0-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f00fd6c025..4434e16380 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24797,14 +24797,14 @@ which may also be useful for other purposes.") (define-public r-spatstat-sparse (package (name "r-spatstat-sparse") - (version "1.2-1") + (version "2.0-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.sparse" version)) (sha256 (base32 - "1w312q7gxzchigxxzk9akscdsz66j5085lgjryamschjgp4f8yk2")))) + "1iqrpazb88s4w208adf2qgm4ajwz3kwqck65k9g5l28zw9jcxyr7")))) (properties `((upstream-name . "spatstat.sparse"))) (build-system r-build-system) -- cgit v1.2.3 From 8561ce6a8ca3be11c015cf049a728e38b588a744 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-data: Update to 2.1-0. * gnu/packages/cran.scm (r-spatstat-data): Update to 2.1-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4434e16380..c4ed0b392d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24824,14 +24824,14 @@ matrix calculations that are common in statistics, such as quadratic forms.") (define-public r-spatstat-data (package (name "r-spatstat-data") - (version "2.0-0") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.data" version)) (sha256 (base32 - "1z1jb1yzb7qhfg55dhzcrdvn5x8hpg9xif0hpnapddbmhxd1hbb7")))) + "0csmz5vjaxnznkbsfah8qd3v8p0y56jvis01ialxzvf71snl160v")))) (properties `((upstream-name . "spatstat.data"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From b6aa3ada62c7a16a52606f549c9bb6768ab11297 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-geom: Update to 2.0-1. * gnu/packages/cran.scm (r-spatstat-geom): Update to 2.0-1. [propagated-inputs]: Remove r-spatstat-sparse. --- gnu/packages/cran.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c4ed0b392d..4c11f7614b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24847,21 +24847,20 @@ package.") (define-public r-spatstat-geom (package (name "r-spatstat-geom") - (version "1.65-5") + (version "2.0-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.geom" version)) (sha256 (base32 - "0g0m5b3nbzpyblbp77n56k6aiw3fn23jkk72h9fhqlg1ydn2fzpk")))) + "1r7nlgh62apchidg28fxq1a22iv1b29y5xmsg1kjwfvkbq8zxsvh")))) (properties `((upstream-name . "spatstat.geom"))) (build-system r-build-system) (propagated-inputs `(("r-deldir" ,r-deldir) ("r-polyclip" ,r-polyclip) ("r-spatstat-data" ,r-spatstat-data) - ("r-spatstat-sparse" ,r-spatstat-sparse) ("r-spatstat-utils" ,r-spatstat-utils))) (home-page "http://spatstat.org/") (synopsis "Geometrical functionality of the spatstat package") -- cgit v1.2.3 From 2ef03976f35034d273b747b230b71c29496adc32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-core: Update to 2.0-0. * gnu/packages/cran.scm (r-spatstat-core): Update to 2.0-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4c11f7614b..355889fb4e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24873,14 +24873,14 @@ for the geometry of linear networks.") (define-public r-spatstat-core (package (name "r-spatstat-core") - (version "1.65-5") + (version "2.0-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.core" version)) (sha256 (base32 - "0wq61sd53hwyk3fzjdc2prrr66n67zbwb5i3ii7kvyhfwx0xikm3")))) + "19wv27nfx48xkqa1amys4jf93k0d8xns20p84n5kqyibscdsksgx")))) (properties `((upstream-name . "spatstat.core"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 3069514325d601b70391f4044fab9b39ea1194c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-linnet: Update to 2.1-1. * gnu/packages/cran.scm (r-spatstat-linnet): Update to 2.1-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 355889fb4e..dad72e2cd8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24905,14 +24905,14 @@ user-level code from spatstat, except for the code for linear networks.") (define-public r-spatstat-linnet (package (name "r-spatstat-linnet") - (version "1.65-3") + (version "2.1-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.linnet" version)) (sha256 (base32 - "1y088r26h5yv006ydgcb4iwpvnc7ql857gky0hbi7xqqciqr8wdv")))) + "1ia0qgggddiwhhyd3q516f3p6by0p4xnq26wqz7410n2ja60bbb4")))) (properties `((upstream-name . "spatstat.linnet"))) (build-system r-build-system) -- cgit v1.2.3 From a387de2fa7dd75dcf61f12919f4e9c6291f4618d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:02 +0200 Subject: gnu: r-spatstat: Update to 2.1-0. * gnu/packages/cran.scm (r-spatstat): Update to 2.1-0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dad72e2cd8..2d9b8cfd9b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24932,14 +24932,14 @@ for spatial data on a linear network.") (define-public r-spatstat (package (name "r-spatstat") - (version "2.0-1") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat" version)) (sha256 (base32 - "1xq11ijc0d0lbixxb3wnvyr4gplfj2d2i64ynsa089xd525zzzbw")))) + "0vr5md53247v6crvjvg9m82vc6h914zzvkzfkga8x79hv35ii4as")))) (properties `((upstream-name . "spatstat"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 397490236205fb02194a9b003c8b7b76699a7772 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:02 +0200 Subject: gnu: r-cpp11: Update to 0.2.7. * gnu/packages/cran.scm (r-cpp11): Update to 0.2.7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2d9b8cfd9b..0031fdb0f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24993,14 +24993,14 @@ for linear mixed models (AIREML).") (define-public r-cpp11 (package (name "r-cpp11") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri (cran-uri "cpp11" version)) (sha256 (base32 - "118i8s7978vl9xyhnb47wcbd6rcc6b958mq2w8s3rdsd4pxv62gz")))) + "1m31yq3kn5wqvm0ahj08kb4bszbbhfybx3l2x975cjzgv3058h8x")))) (properties `((upstream-name . "cpp11"))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From f5c72b2cd74b6160528a1641e3dc475f417bc623 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:02 +0200 Subject: gnu: r-muhaz: Update to 1.2.6.3. * gnu/packages/cran.scm (r-muhaz): Update to 1.2.6.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0031fdb0f2..b1781c7560 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25178,14 +25178,14 @@ to speed up repeated queries of the same set of target points.") (define-public r-muhaz (package (name "r-muhaz") - (version "1.2.6.1") + (version "1.2.6.3") (source (origin (method url-fetch) (uri (cran-uri "muhaz" version)) (sha256 (base32 - "08qh43zx6h3yby44q2vxphfvmfdmqxpgyp0734yn341sy9n8pkkk")))) + "1lzc8arbpcxgfap3dfsgq8crpp1cxd9qlbrhvyvl79zgpxjqx4q2")))) (properties `((upstream-name . "muhaz"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 47d8e0c1ad6227ed00743b7bd631300c66c86589 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:02 +0200 Subject: gnu: r-yardstick: Update to 0.0.8. * gnu/packages/cran.scm (r-yardstick): Update to 0.0.8. [propagated-inputs]: Add r-vctrs. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b1781c7560..25838dd46f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25650,14 +25650,14 @@ workflow. The advantages are: (define-public r-yardstick (package (name "r-yardstick") - (version "0.0.7") + (version "0.0.8") (source (origin (method url-fetch) (uri (cran-uri "yardstick" version)) (sha256 (base32 - "1yrvlhn4gxyn9f20z5yv3xam0j0a8z362jwa32r33r0g0jk5z2fq")))) + "13b0lyj2k0r568mwlyz9yvp9156rzlj4jqnjazaffh9vwqh4whir")))) (properties `((upstream-name . "yardstick"))) (build-system r-build-system) (propagated-inputs @@ -25665,7 +25665,8 @@ workflow. The advantages are: ("r-generics" ,r-generics) ("r-proc" ,r-proc) ("r-rlang" ,r-rlang) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/tidymodels/yardstick") -- cgit v1.2.3 From 7ac3cefc64299896ebca5efef16d2be870942168 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:03 +0200 Subject: gnu: r-slider: Update to 0.2.1. * gnu/packages/cran.scm (r-slider): Update to 0.2.1. [propagated-inputs]: Add r-ellipsis. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 25838dd46f..8e7ce2c78d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25705,18 +25705,19 @@ observations.") (define-public r-slider (package (name "r-slider") - (version "0.1.5") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "slider" version)) (sha256 (base32 - "1x4jwfxam4czfkb1s5qds5krfw1h2p5a4rh6f5z4yvhsv0d81xck")))) + "1jijh8f3qcn8fa677sqvgl2fb4r5vca1cw4l2vbcqscxb2hr4bqw")))) (properties `((upstream-name . "slider"))) (build-system r-build-system) (propagated-inputs - `(("r-glue" ,r-glue) + `(("r-ellipsis" ,r-ellipsis) + ("r-glue" ,r-glue) ("r-rlang" ,r-rlang) ("r-vctrs" ,r-vctrs) ("r-warp" ,r-warp))) -- cgit v1.2.3 From ed5f5f0274fa8140e5fff853edfbf0007862a36b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:48 +0200 Subject: gnu: r-tidyposterior: Update to 0.1.0. * gnu/packages/cran.scm (r-tidyposterior): Update to 0.1.0. [propagated-inputs]: Remove r-lifecycle; add r-tune and r-workflowsets. --- gnu/packages/cran.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8e7ce2c78d..cacd2fa459 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25900,28 +25900,29 @@ results.") (define-public r-tidyposterior (package (name "r-tidyposterior") - (version "0.0.3") + (version "0.1.0") (source (origin (method url-fetch) (uri (cran-uri "tidyposterior" version)) (sha256 (base32 - "0wsv800w056ziqbnwal7ncmdy4li8cn5yrdx07w35b7j8kl4mwhg")))) + "1h1664sjrg6akph6nrk8ynn2kjiswv6gshy35gamam1h4axf6wah")))) (properties `((upstream-name . "tidyposterior"))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-generics" ,r-generics) ("r-ggplot2" ,r-ggplot2) - ("r-lifecycle" ,r-lifecycle) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-rsample" ,r-rsample) ("r-rstanarm" ,r-rstanarm) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) - ("r-vctrs" ,r-vctrs))) + ("r-tune" ,r-tune) + ("r-vctrs" ,r-vctrs) + ("r-workflowsets" ,r-workflowsets))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://tidyposterior.tidymodels.org") -- cgit v1.2.3 From 3ba3fb71fb04ddc94e360bffd0c806d178f19d59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:48 +0200 Subject: gnu: r-altmeta: Update to 3.3. * gnu/packages/cran.scm (r-altmeta): Update to 3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cacd2fa459..fe60620eab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26318,14 +26318,14 @@ phylogenetic relatedness) can also be conducted.") (define-public r-altmeta (package (name "r-altmeta") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (cran-uri "altmeta" version)) (sha256 (base32 - "0z252lbsknqp33i0b0xf5r7spr535iq47bv40vgip6nsqhgrl7b0")))) + "1xq12hnzxh7kgv2i36xprg4lkvqfmxwz3sq4a1jlq2d5g3narvcm")))) (properties `((upstream-name . "altmeta"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6e93ab06666e624d04648fdafcb0e7c2d8c66e8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:48 +0200 Subject: gnu: r-qtl: Update to 1.48-1. * gnu/packages/cran.scm (r-qtl): Update to 1.48-1. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fe60620eab..0907233000 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26380,14 +26380,14 @@ covariate (usually group indicator) and the scores.") (define-public r-qtl (package (name "r-qtl") - (version "1.47-9") + (version "1.48-1") (source (origin (method url-fetch) (uri (cran-uri "qtl" version)) (sha256 (base32 - "0hffirsvw9j82cdx6l7vhqn3a7ab52claqjlinv3lswl1nsfg93b")))) + "098mgmfj8ndi8yipr9b3f6gbbh78cgp9j7y561nlnhrnyc8bsih9")))) (build-system r-build-system) (home-page "https://rqtl.org/") (synopsis "R package for analyzing QTL experiments in genetics") -- cgit v1.2.3 From b83b2a3a4b1a5c39f55614d9f1d496dc220b172f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:48 +0200 Subject: gnu: r-phangorn: Update to 2.6.3. * gnu/packages/cran.scm (r-phangorn): Update to 2.6.3. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0907233000..d3239ec33d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26596,14 +26596,14 @@ discovery of differentially expressed genes and markers.") (define-public r-phangorn (package (name "r-phangorn") - (version "2.5.5") + (version "2.6.3") (source (origin (method url-fetch) (uri (cran-uri "phangorn" version)) (sha256 (base32 - "0ihkaykqjmf80d8wrk3saphxvnv58zma6pd13633bd3cwanc33f5")))) + "08yqz8qlw960x4b52wzrm22f242xnpc8695pjkhy7bi1nzm303ga")))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) @@ -26613,6 +26613,8 @@ discovery of differentially expressed genes and markers.") ("r-matrix" ,r-matrix) ("r-quadprog" ,r-quadprog) ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/KlausVigo/phangorn") (synopsis "Phylogenetic analysis in R") (description -- cgit v1.2.3 From ae3df456bb513c0f1b56fab407b7e0836dc590ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:49 +0200 Subject: gnu: r-mlr3misc: Update to 0.8.0. * gnu/packages/cran.scm (r-mlr3misc): Update to 0.8.0. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d3239ec33d..a151d9651a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26874,13 +26874,13 @@ are.") (define-public r-mlr3misc (package (name "r-mlr3misc") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3misc" version)) (sha256 (base32 - "19k3l2d6wnqvdng0m7p54rrlvwl5457lcy7bg82m2bbpqxi8qch3")))) + "0mzicqs8rhzppyd7v3ljqs35k8pp7p2jg5cs7hx21mxr831bwsys")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit v1.2.3 From 6ec08e19b3a0b39ee8744c1b099b713df9c266f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:49 +0200 Subject: gnu: r-mlr3learners: Update to 0.4.5. * gnu/packages/cran.scm (r-mlr3learners): Update to 0.4.5. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a151d9651a..04d827b86c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26960,13 +26960,13 @@ computational operations, add-on packages provide additional functionality.") (define-public r-mlr3learners (package (name "r-mlr3learners") - (version "0.4.3") + (version "0.4.5") (source (origin (method url-fetch) (uri (cran-uri "mlr3learners" version)) (sha256 (base32 - "1wxlpzz3hpkn77n4ag1v868dmp140j1pmrhynsv5xfgk9fg0w7ri")))) + "02v4y32yn1m0akkqzhfg65ib21rgy9iz8db4kdcrvi949clkxnfk")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) -- cgit v1.2.3 From 2224e027790d2ab44c7e3d5f3f23f2a261458cb2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:49 +0200 Subject: gnu: r-bbotk: Update to 0.3.2. * gnu/packages/cran.scm (r-bbotk): Update to 0.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 04d827b86c..234f8d55ce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26986,14 +26986,14 @@ vector machines, and gradient boosting.") (define-public r-bbotk (package (name "r-bbotk") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "bbotk" version)) (sha256 (base32 - "1f29wxnxr73c4yp5afk05jqggpm7k1z8wiak8xsyw68h7xflq550")))) + "0bd9nxfgsj4ixpgky1mj6knb8l8nivvxpqpyw8vgpkj0za7gp4gr")))) (properties `((upstream-name . "bbotk"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ded15998293bd1ea43dd92c2fadfab8f733d6619 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:49 +0200 Subject: gnu: r-textshaping: Update to 0.3.3. * gnu/packages/cran.scm (r-textshaping): Update to 0.3.3. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 234f8d55ce..315e7127ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27315,14 +27315,14 @@ clusterings as resolution increases.") (define-public r-textshaping (package (name "r-textshaping") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "textshaping" version)) (sha256 (base32 - "0fqh4z505b2qriqcj70g2hhdgiawd3w2rs9rqxdwizz5vk8jjygx")))) + "0yl3cv6r8k27h4lzbrsikjydhz94skdjmxx4zqzihvb7h3jfnlpn")))) (properties `((upstream-name . "textshaping"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 5a2602032f62898c830299c3541bd28edee0b68f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-ragg: Update to 1.1.2. * gnu/packages/cran.scm (r-ragg): Update to 1.1.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 315e7127ab..1310f1aa04 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27348,14 +27348,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "0nh1xxrxgdbq9anzkc6k3n519czp9hqyiizakm3m2gl4l4w0vp0q")))) + "0q28bwjdxpxm1wlkd8sxdf1m1q8wp4mmzp83d3m09nyy90ydkd8w")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 0ec1b08a525b765282f83b5d9a098084aa2fe771 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-lwgeom: Update to 0.2-6. * gnu/packages/cran.scm (r-lwgeom): Update to 0.2-6. [inputs]: Add zlib. --- gnu/packages/cran.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1310f1aa04..114ea7ab16 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28016,28 +28016,30 @@ and formatted text files with additional meta-data, such including @code{.csv}, (define-public r-lwgeom (package (name "r-lwgeom") - (version "0.2-5") + (version "0.2-6") (source - (origin - (method url-fetch) - (uri (cran-uri "lwgeom" version)) - (sha256 - (base32 - "0byhjqa2acns8mznl1ngnfygxxxyszvnq66qfg0smhhhdkwr67aa")))) + (origin + (method url-fetch) + (uri (cran-uri "lwgeom" version)) + (sha256 + (base32 + "1733iwinn426bcmgjxp4j0scvbz35rvqkanmw7g7f47l6j7w14vn")))) (properties `((upstream-name . "lwgeom"))) (build-system r-build-system) - (inputs `(("geos" ,geos) ("proj" ,proj) ("sqlite" ,sqlite))) + (inputs + `(("geos" ,geos) + ("proj" ,proj) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) (propagated-inputs - `(("r-rcpp" ,r-rcpp) - ("r-sf" ,r-sf) - ("r-units" ,r-units))) + `(("r-rcpp" ,r-rcpp) + ("r-sf" ,r-sf) + ("r-units" ,r-units))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page - "https://github.com/r-spatial/lwgeom/") - (synopsis - "Bindings to Selected 'liblwgeom' Functions for Simple Features") + (home-page "https://github.com/r-spatial/lwgeom/") + (synopsis "Bindings to Selected 'liblwgeom' Functions for Simple Features") (description - "Access to selected functions found in + "Access to selected functions found in @url{https://github.com/postgis/postgis/tree/master/liblwgeom,liblwgeom}, the light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") (license license:gpl2))) -- cgit v1.2.3 From 971a997f75fac23dd804f26c94e3c16b127dc571 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-stars: Update to 0.5-2. * gnu/packages/cran.scm (r-stars): Update to 0.5-2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 114ea7ab16..61de48e08e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28047,14 +28047,14 @@ light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") (define-public r-stars (package (name "r-stars") - (version "0.5-1") + (version "0.5-2") (source (origin (method url-fetch) (uri (cran-uri "stars" version)) (sha256 (base32 - "0ybk899rc0rpf2cv5kwk78fvis5xnr255hfcy5khdxsxdqgl0m9j")))) + "0w2svw02ywvclq0nsnjns1n0rfr54q7x30y64y14n7zfr969ly1n")))) (properties `((upstream-name . "stars"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 55378aa21d24599d8f9e1a9454c8608eb290268c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-survival: Update to 3.2-10. * gnu/packages/statistics.scm (r-survival): Update to 3.2-10. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 27f3bfa8ef..f63f66ac10 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -710,14 +710,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.2-9") + (version "3.2-10") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "1dkpdci2lvx141193wd69445y65w8k2pa89lc3l83i5jaj56svdn")))) + "19fg7mrrr6chbixq10kwwl5clry2y57v6zl24jlmxx2ylis0vjzd")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit v1.2.3 From 63c5888c43258a638184c74f337ce6d16aa5da52 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-dbplyr: Update to 2.1.1. * gnu/packages/statistics.scm (r-dbplyr): Update to 2.1.1. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f63f66ac10..a7c2111530 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1733,14 +1733,14 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "1sm0fixfr3bkq18p804mfbfz9z5z801dhzkrpq0spr25jkhpf26l")))) + "025wqpmxdhzblb0pf58m3qh5h6bf5x8qvkf47vyl1cjsp13wz95b")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From e2851d10db3731088b5cb3a627efd2c424454edc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-catools: Update to 1.18.2. * gnu/packages/statistics.scm (r-catools): Update to 1.18.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a7c2111530..06ebeca597 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2681,13 +2681,13 @@ vectors.") (define-public r-catools (package (name "r-catools") - (version "1.18.1") + (version "1.18.2") (source (origin (method url-fetch) (uri (cran-uri "caTools" version)) (sha256 (base32 - "1yf98x2gaf84y9m32xrg84g384zlfwsdw7wvywdljpgdpvzs9szz")))) + "14q2ry8gaszjl0m97qg62dxv5bpj6k02qwyi7q2lnxgcmwai3mkm")))) (properties `((upstream-name . "caTools"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d6fd6908c269c1c97d7cb740443fcb52148e4b3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-rsqlite: Update to 2.2.5. * gnu/packages/statistics.scm (r-rsqlite): Update to 2.2.5. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 06ebeca597..ee0d873d1c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2842,13 +2842,13 @@ a column in data frame.") (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.2.4") + (version "2.2.5") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "050s7gv42v43d15yqj2sdrh82iikfpm32idfnw4nbjjjnlcg7wxf")))) + "14cxqh8j5v2rqs6yiargy1miycvx7xj47lppvpnnchi5plimlvyy")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From d98cecdd07464a31091778d7313e91c4feb1853b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:51 +0200 Subject: gnu: r-xml: Update to 3.99-0.6. * gnu/packages/statistics.scm (r-xml): Update to 3.99-0.6. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ee0d873d1c..a127a336e1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2916,13 +2916,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.99-0.5") + (version "3.99-0.6") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "19jkpnbjx2ij0h7rxi13sqnjnwsap6wywmd4gnhfnqpic1rrnlk0")))) + "0qibvacbfm7gl41ylway3vdyi1qbpa211d48rg3k5i30d48rbf58")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) -- cgit v1.2.3 From 9493b3e9a717ad559a4b067e93f7f07316668219 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:51 +0200 Subject: gnu: r-e1071: Update to 1.7-6. * gnu/packages/statistics.scm (r-e1071): Update to 1.7-6. [propagated-inputs]: Add r-proxy. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a127a336e1..06a5566452 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3402,17 +3402,18 @@ Stochastic Neighbor Embedding using a Barnes-Hut implementation.") (define-public r-e1071 (package (name "r-e1071") - (version "1.7-4") + (version "1.7-6") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "02935xcscjhb0jmnvh44hxlpjcgladrcr0gpz1jxq07m0qdqgaz6")))) + "0blfnv3m5k5xm9bfx1v5awvagqlhqaqpabrvzplf4244c3j259qa")))) (build-system r-build-system) (propagated-inputs - `(("r-class" ,r-class))) + `(("r-class" ,r-class) + ("r-proxy" ,r-proxy))) (home-page "https://cran.r-project.org/web/packages/e1071") (synopsis "Miscellaneous functions for probability theory") (description -- cgit v1.2.3 From 2e36f4a1c45ce8041ead5549b8a6313c686b21fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:51 +0200 Subject: gnu: r-sfsmisc: Update to 1.1-10. * gnu/packages/statistics.scm (r-sfsmisc): Update to 1.1-10. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 06a5566452..cc6e3233c3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4143,14 +4143,14 @@ existing packages provide.") (define-public r-sfsmisc (package (name "r-sfsmisc") - (version "1.1-8") + (version "1.1-10") (source (origin (method url-fetch) (uri (cran-uri "sfsmisc" version)) (sha256 (base32 - "198zpkz1gvw954ym8669svrk81yb49j6fyk5i6a7dw07z3snlmdn")))) + "1skxahq5jgqdsllpsavzrcpz8l0yj3mfzcf70as8d33jxbiaa4s4")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sfsmisc") (synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich") -- cgit v1.2.3 From e1a38cbad89c79a7bc324b96c74752f6785efedd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:51 +0200 Subject: gnu: r-sn: Update to 2.0.0. * gnu/packages/statistics.scm (r-sn): Update to 2.0.0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cc6e3233c3..fb14526f98 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5378,14 +5378,14 @@ first and second order derivatives.") (define-public r-sn (package (name "r-sn") - (version "1.6-2") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "sn" version)) (sha256 (base32 - "179xb7yb8br99aa5awm2yxsy0v5w1kdhv6a7ifaliz2y64677m1g")))) + "0sl8qzy9isy5fq8qxh1fg5285jzgy895nbgz8gdq5d0r6zdwrmmb")))) (build-system r-build-system) (propagated-inputs `(("r-mnormt" ,r-mnormt) -- cgit v1.2.3 From 5c9954490c81ad824900909c679900ca8ce188af Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 7 Apr 2021 15:09:46 -0400 Subject: gnu: gcc-arm-none-eabi: Fix C++ header location. Previously the C++ headers where installed in the include folder, overwriting some C headers. * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9) [native-search-paths]: Add C++ header locations. (gcc-arm-none-eabi-7-2018-q2-update)[native-search-paths]: Add C++ header locations. (make-libstdc++-arm-none-eabi)[arguments]: Change C++ header install location to include/c++. Signed-off-by: Efraim Flashner --- gnu/packages/embedded.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 413760ab72..a3f1d85580 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -147,7 +147,9 @@ (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include"))) + (files '("arm-none-eabi/include" + "arm-none-eabi/include/c++" + "arm-none-eabi/include/c++/arm-none-eabi"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -317,7 +319,9 @@ usable on embedded products.") (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include"))) + (files '("arm-none-eabi/include" + "arm-none-eabi/include/c++" + "arm-none-eabi/include/c++/arm-none-eabi"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -380,7 +384,7 @@ usable on embedded products.") "--with-newlib" ,(string-append "--with-gxx-include-dir=" (assoc-ref %outputs "out") - "/arm-none-eabi/include"))))) + "/arm-none-eabi/include/c++"))))) (native-inputs `(("newlib" ,newlib) ("xgcc" ,xgcc) -- cgit v1.2.3 From bb4f47a7f614eea78a8c8a0d3e5fc55bf4e52646 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 7 Apr 2021 14:14:56 -0400 Subject: gnu: axoloti-runtime: Simplify build. * gnu/packages/axoloti.scm (axoloti-runtime)[arguments]: Remove unnecessary environment variable assignments in custom 'build phase. Signed-off-by: Efraim Flashner --- gnu/packages/axoloti.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 3049051486..0b12e4fe29 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -147,18 +147,7 @@ (delete 'configure) (replace 'build ;; Build Axoloti firmware with cross-compiler - (lambda* (#:key inputs #:allow-other-keys) - (let* ((toolchain (assoc-ref inputs "cross-toolchain")) - (headers (string-append - toolchain - "/arm-none-eabi/include:" - toolchain - "/arm-none-eabi/include/arm-none-eabi/armv7e-m"))) - (setenv "CROSS_CPATH" headers) - (setenv "CROSS_CPLUS_INCLUDE_PATH" headers) - (setenv "CROSS_LIBRARY_PATH" - (string-append toolchain - "/arm-none-eabi/lib"))) + (lambda _ (with-directory-excursion "platform_linux" (invoke "sh" "compile_firmware.sh")))) (replace 'install -- cgit v1.2.3 From 71ca8fd40b05cd0da14fad2e4b67f8d480abe600 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 8 Apr 2021 11:13:11 +0100 Subject: gnu: Add texlive-mweights. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c8bac7eea7..df84cbd571 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7928,3 +7928,23 @@ particular, it splits the shape axis into a primary and a secondary shape axis and it adds three new axes to deal with the different figure versions offered by many professional fonts.") (license license:lppl1.3+))) + +(define-public texlive-mweights + (package + (inherit (simple-texlive-package + "texlive-mweights" + (list "/doc/latex/mweights/" + "/tex/latex/mweights/") + (base32 + "1k2xclk54q3xgn48hji23q52nivkzgwf0s30bmm6k83f7v57qv8h") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/mweights") + (synopsis "Support for multiple-weight font packages") + (description "Many font families available for use with LaTeX are +available at multiple weights. Many Type 1-oriented support packages +for such fonts re-define the standard @code{\\mddefault} or +@code{\\bfdefault} macros. This can create difficulties if the weight +desired for one font family is not available for another font family, +or if it differs from the weight desired for another font family. The +@code{mweights} package provides a solution to these difficulties.") + (license license:lppl))) -- cgit v1.2.3 From fb73d7d10d95246b2cca3cf3fa75d4e37b8b8157 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:27:56 +0200 Subject: gnu: r-delayedarray: Update to 0.16.3. * gnu/packages/bioconductor.scm (r-delayedarray): Update to 0.16.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ccf468e420..69a9c936bd 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1236,13 +1236,13 @@ used visualizations.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.16.2") + (version "0.16.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) + "0w1wppy6m2iv41852dscg3y19sq84ahdx3m7c2p2pxjcznmv6hys")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit v1.2.3 From 9d2ca982132524fc0177663b2bb36e8192624db2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:27:59 +0200 Subject: gnu: r-genomeinfodb: Update to 1.26.6. * gnu/packages/bioconductor.scm (r-genomeinfodb): Update to 1.26.6. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 69a9c936bd..4a2a796f27 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2022,13 +2022,13 @@ high-throughput sequencing experiments.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.26.4") + (version "1.26.6") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "1sbhdpgabqbi749ixih8nlmq5id7sg8y6kkfj46r00642rc293ys")))) + "1wy4dwiv0pgim975var802z565py4a0nakx6zdvbhry4c0dfczd1")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit v1.2.3 From 55185f9b3f25ac87d09a7afd6aefddb53707c8a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:27:59 +0200 Subject: gnu: r-diffbind: Update to 3.0.15. * gnu/packages/bioconductor.scm (r-diffbind): Update to 3.0.15. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4a2a796f27..e3418e5a21 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2705,14 +2705,14 @@ signal in the input, that lead to spurious peaks during peak calling.") (define-public r-diffbind (package (name "r-diffbind") - (version "3.0.14") + (version "3.0.15") (source (origin (method url-fetch) (uri (bioconductor-uri "DiffBind" version)) (sha256 (base32 - "1siabhjd0w7bb6v2gfhsm9j7c7c86z8m6lfsyl8p84h0zhjs2vrw")))) + "06f613s8d9z51njyf839g22gwybx9zs5n6xghwr5j1ad2n4m6qwi")))) (properties `((upstream-name . "DiffBind"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 215b0ced02c766095d11a9e8a401f2a1b312fda5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-chippeakanno: Update to 3.24.2. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.24.2. [propagated-inputs]: Add r-dplyr. --- gnu/packages/bioconductor.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e3418e5a21..7bc5fa2a89 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2919,14 +2919,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "0qdkwjv8s46d1kmgg2chijv7yzy9sv49kiks18w8x2z89prn15gj")))) + "0l417aygs89wf1j9fjpfjhahzskbpbgcrm8xpx3qm4s0307vfzkw")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs @@ -2935,6 +2935,7 @@ determining dependencies between variables, code improvement suggestions.") ("r-biomart" ,r-biomart) ("r-biostrings" ,r-biostrings) ("r-dbi" ,r-dbi) + ("r-dplyr" ,r-dplyr) ("r-ensembldb" ,r-ensembldb) ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicalignments" ,r-genomicalignments) -- cgit v1.2.3 From 8a7933f37e1491534656968483358a02881570d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-rsubread: Update to 2.4.3. * gnu/packages/bioconductor.scm (r-rsubread): Update to 2.4.3. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7bc5fa2a89..aab46afc82 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6909,14 +6909,14 @@ annotations.") (define-public r-rsubread (package (name "r-rsubread") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "1wczrw5jb69x45hd3rdqqs9vkysdqwlxn9h3kjzn57r4x5q7jrra")))) + "0c4akc89p5467n5rzq9bi7h0h15rbpqpvh7fw42qcj7g2vc41wba")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From 14a4c30828172c47c2a0dd348577b7fceabb101e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-universalmotif: Update to 1.8.4. * gnu/packages/bioconductor.scm (r-universalmotif): Update to 1.8.4. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index aab46afc82..85d24fcea5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8375,14 +8375,14 @@ data.") (define-public r-universalmotif (package (name "r-universalmotif") - (version "1.8.3") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "universalmotif" version)) (sha256 (base32 - "1ys2kbayc1rzv8nzi60208yfslm4kzynndfg7vw2n0c30dvzycrc")))) + "0pmi5mp5v0srr482vlkfmkp28bywq969fvv9g5kjl5rxki963zmr")))) (properties `((upstream-name . "universalmotif"))) (build-system r-build-system) -- cgit v1.2.3 From e0147aa46fde621f4567d690268aaabef0986932 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-gviz: Update to 1.34.1. * gnu/packages/bioconductor.scm (r-gviz): Update to 1.34.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 85d24fcea5..88dca552e0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10803,14 +10803,14 @@ family of feature/genome hypotheses.") (define-public r-gviz (package (name "r-gviz") - (version "1.34.0") + (version "1.34.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "0v7bz46b91dnrr55ah42ljj1i2xs3090s4w0lw8098pag00p4vh2")))) + "0bmlfz9ri1gkwyl605a2hqi5b8jdpvynrxwghwmrsd657ip6c7n1")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 5f0c3535aa8394a675edcba11a8aff330cd49a61 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-genomicfeatures: Update to 1.42.3. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.42.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9e7423637c..908916ebf3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7811,13 +7811,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.42.2") + (version "1.42.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "17ns5hvx5q8mrmkgb6linspwml62mi34i6al5bxlib5xi9d9f04s")))) + "168cf261vmcqffbzassavkjyz9a2af0l6zbv9cagkx6b1qrk3siz")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 14ada96451812d1ccb7d42e3f0ec2a9248273f0e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 8 Apr 2021 14:03:50 +0200 Subject: ci: Remove the job period argument. Cuirass now deals with periodicity directly on specifications. * gnu/ci.scm (derivation->job): Remove the period argument. (image-jobs, system-test-jobs, tarball-jobs): Adapt them. --- gnu/ci.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index 32b7a611fb..4095d4e513 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -79,12 +79,9 @@ (define* (derivation->job name drv #:key - period (max-silent-time 3600) (timeout 3600)) - "Return a Cuirass job called NAME and describing DRV. PERIOD is the minimal -duration that must separate two evaluations of the same job. If PERIOD is -false, then the job will be evaluated as soon as possible. + "Return a Cuirass job called NAME and describing DRV. MAX-SILENT-TIME and TIMEOUT are build options passed to the daemon when building the derivation." @@ -98,7 +95,6 @@ building the derivation." (derivation->output-paths drv))) (#:nix-name . ,(derivation-name drv)) (#:system . ,(derivation-system drv)) - (#:period . ,period) (#:max-silent-time . ,max-silent-time) (#:timeout . ,timeout))) @@ -237,14 +233,11 @@ SYSTEM." (* 3600 hours)) (define (image-jobs store system) - "Return a list of jobs that build images for SYSTEM. Those jobs are -expensive in storage and I/O operations, hence their periodicity is limited by -passing the PERIOD argument." + "Return a list of jobs that build images for SYSTEM." (define (->job name drv) (let ((name (string-append name "." system))) (parameterize ((%graft? #f)) - (derivation->job name drv - #:period (hours 48))))) + (derivation->job name drv)))) (define (build-image image) (run-with-store store @@ -335,11 +328,7 @@ passing the PERIOD argument." (set-guile-for-build (default-guile)) (system-test-value test))))) - ;; Those tests are extremely expensive in I/O operations and storage - ;; size, use the "period" attribute to run them with a period of at - ;; least 48 hours. - (derivation->job name drv - #:period (hours 24))))) + (derivation->job name drv)))) (if (member system %guix-system-supported-systems) ;; Override the value of 'current-guix' used by system tests. Using a @@ -354,8 +343,7 @@ passing the PERIOD argument." (define (->job name drv) (let ((name (string-append name "." system))) (parameterize ((%graft? #f)) - (derivation->job name drv - #:period (hours 24))))) + (derivation->job name drv)))) ;; XXX: Add a job for the stable Guix? (list -- cgit v1.2.3 From 2afc79b51d0956e5834e81a70692a35cd83e4e87 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 8 Apr 2021 14:08:54 +0200 Subject: ci: Introduce new subsets. Introduce 'images, 'system-tests and 'tarball subsets. * gnu/ci.scm (cuirass-jobs): Break the 'all subset into smaller subsets. --- gnu/ci.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index 4095d4e513..ff76ffde57 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -483,11 +483,6 @@ valid." (package->job store package system)))) (append (filter-map job all) - (image-jobs store system) - (system-test-jobs store system - #:source source - #:commit commit) - (tarball-jobs store system) (cross-jobs store system)))) ('core ;; Build core packages only. @@ -507,6 +502,17 @@ valid." (let ((hello (specification->package "hello"))) (list (package-job store (job-name hello) hello system)))) + ('images + ;; Build Guix System images only. + (image-jobs store system)) + ('system-tests + ;; Build Guix System tests only. + (system-test-jobs store system + #:source source + #:commit commit)) + ('tarball + ;; Build Guix tarball only. + (tarball-jobs store system)) (('channels . channels) ;; Build only the packages from CHANNELS. (let ((all (all-packages))) -- cgit v1.2.3 From bdc96f6e0e7fbf502f368d3381297ec0b75216d7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 6 Apr 2021 17:37:33 -0400 Subject: system: vm: Set a larger value for the msize option of the 9p file system. Fixes . * gnu/system/vm.scm (%default-msize-value): New variable. (%linux-vm-file-systems): Use it as the value of the msize option. (mapping->file-system): Likewise. Reported-by: Leo Famulari --- gnu/system/vm.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3d0935b3af..1efae7ff06 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -88,6 +88,13 @@ ;;; ;;; Code: +;; By default, the msize value is 8 KiB, which according to QEMU is +;; insufficient and would degrade performance. The msize value should roughly +;; match the bandwidth of the system's IO (see: +;; https://wiki.qemu.org/Documentation/9psetup#msize). Use 100 MiB as a +;; conservative default. +(define %default-msize-value (* 100 (expt 2 20))) ;100 MiB + (define %linux-vm-file-systems ;; File systems mounted for 'derivation-in-linux-vm'. These are shared with ;; the host over 9p. @@ -103,21 +110,23 @@ (type "9p") (needed-for-boot? #t) (flags '(read-only)) - (options "trans=virtio,cache=loose") + (options (format #f "trans=virtio,cache=loose,msize=~a" + %default-msize-value)) (check? #f)) (file-system (mount-point "/xchg") (device "xchg") (type "9p") (needed-for-boot? #t) - (options "trans=virtio") + (options (format #f "trans=virtio,msize=~a" %default-msize-value)) (check? #f)) (file-system (mount-point "/tmp") (device "tmp") (type "9p") (needed-for-boot? #t) - (options "trans=virtio,cache=loose") + (options (format #f "trans=virtio,cache=loose,msize=~a" + %default-msize-value)) (check? #f)))) (define not-config? @@ -581,7 +590,8 @@ the operating system." (type "9p") (flags (if writable? '() '(read-only))) (options (string-append "trans=virtio" - (if writable? "" ",cache=loose"))) + (if writable? "" ",cache=loose") + ",msize=" (number->string %default-msize-value))) (check? #f) (create-mount-point? #t))))) -- cgit v1.2.3 From adb4c05aa64552e34aa9ef1c0733b3bb7d2b9c8c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 7 Apr 2021 13:33:59 -0400 Subject: gnu: linux-libre: Update to 5.11.12. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.12. (linux-libre-5.11-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5e08331652..edc71b4bd6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.11") +(define-public linux-libre-5.11-version "5.11.12") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "1fc3yl4srzla3cbihgnry0pqmgcc17zv0zlkk9zpx99371hpay0a"))) + (hash (base32 "0z8fpskygs569f15c37x7c1sd46h06bfjmphql3xidj86hbnz8n0"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit v1.2.3 From 1cdf95c14fe77aab2b279edacf1acc15efe3aa54 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 7 Apr 2021 13:34:19 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.28. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.28. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index edc71b4bd6..9275f57d7c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.27") +(define-public linux-libre-5.10-version "5.10.28") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr"))) + (hash (base32 "0m63g9700c0yfazj6j4s5b5x36kp9ffjwsdqj0zfcmlmf7m3mz2d"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From c44dd82a6654aae8faea9a3a35370200d0337c07 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 7 Apr 2021 13:34:34 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.110. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.110. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9275f57d7c..e44b54308f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.109") +(define-public linux-libre-5.4-version "5.4.110") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc"))) + (hash (base32 "0a5jv46znqf1pg6y9fa1fmk87jjbfrd40iqqrdkb59788229gxnh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From eef44c8732deccac519c448ce3aba8a119e2410e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 7 Apr 2021 13:34:53 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.185. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.185. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e44b54308f..0fa8b9955e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.184") +(define-public linux-libre-4.19-version "4.19.185") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0z5pgal8775rf7pvpxq47dnghr42al2k9py0s9jl3js2wamgdyix"))) + (hash (base32 "15w5a2lfar3qdzv4lljdjy7dh49dhjy3gw2bn92awzcr2a1dg28n"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From e60c7acf5aa1c713da3f8742a4de287c24002fbc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 7 Apr 2021 13:35:17 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.229. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.229. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0fa8b9955e..28d32e82d5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.228") +(define-public linux-libre-4.14-version "4.14.229") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0nw1jf6x5a990n69aw2da4s4lc1c7mnwiwcda40bl2rkmd24s1qm"))) + (hash (base32 "0b1nmcl3vdi37nxi7kjnfjmigmffigx9vkay2lldg9nyrlwyi6xj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 8a7ef6dc1f17534714a8a3d1b1cf27110448b9b7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 7 Apr 2021 13:35:52 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.265. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.265. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 28d32e82d5..8ae2e9c7b8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.264") +(define-public linux-libre-4.9-version "4.9.265") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1df2dv26c9z6zsdlqzbcc60f2pszh0hx1n94v65jswlb72a2mipc"))) + (hash (base32 "0485kyqn1fgvw3kgbnc6rmjzdgjvwcl6jaqnv1qyhjdhd4ak0iji"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 5bb5b4a7f33aaa9f9e96ef0964f580a015110180 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 7 Apr 2021 13:36:06 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.265. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.265. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8ae2e9c7b8..d50d29034c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.264") +(define-public linux-libre-4.4-version "4.4.265") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1b0d735qnk0bcqn9gdsjqxhk8pkb3597ya9f34lv1vjfaqkkxk7l"))) + (hash (base32 "1531x9f6dwfj1vmy9z8kw8lhg753chkzk4yi2m9h7r89jbikfriv"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 97744de9702a156d63105ad694416d3cb1d1d61b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 8 Apr 2021 20:49:56 +0100 Subject: gnu: guix-build-coordinator: Update to 0-22.44d0006. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-22.44d0006. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a6469e133d..a616ec6304 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1049,8 +1049,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "6e7e63f356cb88e3e5fe1a55a0390a1366205c9c") - (revision "21")) + (let ((commit "44d00065cfbd0f24d2fac631608a5aeaace648a7") + (revision "22")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1061,7 +1061,7 @@ environments.") (commit commit))) (sha256 (base32 - "01l4f0h9r864dbq4fg38fr2pdm5c7q2dysxcv8bx1clxilm58kd5")) + "1gyrdb6gmz066d591593qvmk72qanc1psmk2l0r7smigh2bkzjka")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 91fe9dd08ec3469710fa843ff6a8b90a330082e6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 8 Apr 2021 22:16:05 +0200 Subject: gnu: emacs-emms: Update to 7.0. * gnu/packages/emacs-xyz.scm (emacs-emms): Update to 7.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8e80ccbb56..ca1daaeb82 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1783,14 +1783,14 @@ incrementally confined in Isearch manner.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "6.3") + (version "7.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "12cfq503li0gcqmm5bmqz8yjvfdif5xvz0l9vx3g5jl6ljygwgmf")))) + (base32 "1hryagy2mkx9zgc33mb773ckp5p9bisnny0r78l0h2vc43wanmhz")))) (build-system gnu-build-system) (arguments `(#:make-flags '("emms-print-metadata") -- cgit v1.2.3 From 43c55856c876c76200cdccc1211868b92352c4ae Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Wed, 31 Mar 2021 12:38:50 +0200 Subject: gnu: Add galera. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/databases.scm (galera): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/databases.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ce7afa82d0..8c657e4113 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Greg Hogan +;;; Copyright © 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1002,6 +1003,31 @@ as a drop-in replacement of MySQL.") developed in C/C++ to MariaDB and MySQL databases.") (license license:lgpl2.1+))) +(define-public galera + (package + (name "galera") + (version "26.4.7") + (source (origin + (method git-fetch) + (uri (git-reference + (commit "bac8171266cb982fe013ce496d78085438c6f23e") + (url "https://github.com/codership/galera") + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil")))) + (build-system cmake-build-system) + (inputs + `(("check" ,check) + ("boost" ,boost) + ("openssl" ,openssl))) + (home-page "https://github.com/codership/galera/") + (synopsis "Extension to the MariaDB database server") + (description + "Galera is a wsrep-provider that is used with MariaDB for load-balancing +and high-availability (HA).") + (license license:gpl2))) ;'COPYING' says "version 2" only + ;; Don't forget to update the other postgresql packages when upgrading this one. (define-public postgresql-13 (package -- cgit v1.2.3 From 29a6c361492b18bcb0f6d2517d010a1b48441521 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 9 Apr 2021 01:44:10 -0400 Subject: gnu: rust-rav1e-0.4.0: Fix build. Fixes . * gnu/packages/crates-graphics.scm (rust-rav1e-0.4)[arguments]: Add rust-assert-cmd-1, rust-criterion-0.3, and rust-pretty-assertions-0.6 to #:cargo-inputs. --- gnu/packages/crates-graphics.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 3485e53938..cd1712dc13 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1934,6 +1934,7 @@ interactive applications.") ("rust-arbitrary" ,rust-arbitrary-0.4) ("rust-arg-enum-proc-macro" ,rust-arg-enum-proc-macro-0.3) ("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-assert-cmd" ,rust-assert-cmd-1) ("rust-av-metrics" ,rust-av-metrics-0.6) ("rust-backtrace" ,rust-backtrace-0.3) ("rust-bitstream-io" ,rust-bitstream-io-1) @@ -1942,6 +1943,7 @@ interactive applications.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-clap" ,rust-clap-2) ("rust-console" ,rust-console-0.14) + ("rust-criterion" ,rust-criterion-0.3) ("rust-crossbeam" ,rust-crossbeam-0.8) ("rust-dav1d-sys" ,rust-dav1d-sys-0.3) ("rust-fern" ,rust-fern-0.6) @@ -1957,6 +1959,7 @@ interactive applications.") ("rust-num-derive" ,rust-num-derive-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-paste" ,rust-paste-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) ("rust-rand" ,rust-rand-0.8) ("rust-rand-chacha" ,rust-rand-chacha-0.3) ("rust-rayon" ,rust-rayon-1) -- cgit v1.2.3 From 15d668eda40130eae23dad2a54d0c523abebcbb6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 9 Apr 2021 09:46:10 +0200 Subject: gnu: cuirass: Update to 1.0.0-8.7542d62. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-8.7542d62. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index eaf32d9739..4b2b5cd3c5 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "1b35a7785627f3e8c5b6d8f37bf11eb4a470b4c4") - (revision "7")) + (let ((commit "7542d626dc476c7e00fc8e756e97f498fb272f45") + (revision "8")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1hy8inhwpi9i92yg5alvmqgp1vjnrhinckywkv9kgyjlskzshib3")))) + "0w7isma75w0m65v6mkjkg5ysd0qn9bz51rnps4g845qra2jc1h7s")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From acd953bd64b72cf7185f1d97f33cb6770ff8bfaf Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Mon, 5 Apr 2021 15:53:12 +0100 Subject: gnu: libwebsockets: Update to 4.1.6. * gnu/packages/web.scm (libwebsockets): Update to 4.1.6. --- gnu/packages/web.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fc4abfdf81..d759ad676d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Petter -;;; Copyright © 2017 Pierre Langlois +;;; Copyright © 2017, 2021 Pierre Langlois ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017, 2019, 2020 Christopher Baines ;;; Copyright © 2018, 2019 Julien Lepiller @@ -1331,18 +1331,17 @@ parser written in ANSI C and a small validating JSON generator.") (define-public libwebsockets (package (name "libwebsockets") - (version "1.3") + (version "4.1.6") (source (origin ;; The project does not publish tarballs, so we have to take ;; things from Git. (method git-fetch) (uri (git-reference (url "https://github.com/warmcat/libwebsockets") - (commit (string-append "v" version - "-chrome37-firefox30")))) + (commit (string-append "v" version)))) (sha256 (base32 - "12fqh2d2098mgf0ls19p9lzibpsqhv7mc5rn1yvrbfnazmcr40g4")) + "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg")) (file-name (string-append name "-" version)))) (build-system cmake-build-system) -- cgit v1.2.3 From 7fc922fdafc8ff96fa2240aa94312830f6514c49 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Mon, 5 Apr 2021 15:55:24 +0100 Subject: gnu: ardour: Update to 6.6. * gnu/packages/audio.scm (ardour): Update to 6.6. [origin]: Use git protocol, https isn't available anymore. Adapt snippet. [arguments]: Add "--optimize" flags. Switch to python3. [inputs]: Add dbus, libwebsockets, openssl, pulseaudio and soundtouch. --- gnu/packages/audio.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index eff45af80f..6e064f7175 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Brendan Tildesley -;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019, 2021 Pierre Langlois ;;; Copyright © 2019, 2021 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Arun Isaac @@ -567,11 +567,11 @@ streams from live audio.") (define-public ardour (package (name "ardour") - (version "5.12") + (version "6.6") (source (origin (method git-fetch) (uri (git-reference - (url "https://git.ardour.org/ardour/ardour.git") + (url "git://git.ardour.org/ardour/ardour.git") (commit version))) (snippet ;; Ardour expects this file to exist at build time. The revision @@ -581,15 +581,16 @@ streams from live audio.") "libs/ardour/revision.cc" (lambda (port) (format port ,(string-append "#include \"ardour/revision.h\" -namespace ARDOUR { const char* revision = \"" version "\" ; }")) +namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }")) #t))) (sha256 (base32 - "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr")) + "0k5rxh8b3d8si3lj01gfqj0pmd448d8sj4asnb205mwhwbfgn0cp")) (file-name (string-append name "-" version)))) (build-system waf-build-system) (arguments `(#:configure-flags '("--cxx11" ; required by gtkmm + "--optimize" "--no-phone-home" ; don't contact ardour.org "--freedesktop" ; build .desktop file "--test") ; build unit tests @@ -619,8 +620,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) ver ".appdata.xml") (string-append share "/appdata/"))) #t))) - #:test-target "test" - #:python ,python-2)) + #:test-target "test")) (inputs `(("alsa-lib" ,alsa-lib) ("atkmm" ,atkmm) @@ -628,6 +628,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) ("boost" ,boost) ("cairomm" ,cairomm) ("curl" ,curl) + ("dbus" ,dbus) ("eudev" ,eudev) ("fftw" ,fftw) ("fftwf" ,fftwf) @@ -644,17 +645,21 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }")) ("libsndfile" ,libsndfile) ("libusb" ,libusb) ("libvorbis" ,libvorbis) + ("libwebsockets" ,libwebsockets) ("libxml2" ,libxml2) ("lilv" ,lilv) ("lrdf" ,lrdf) ("lv2" ,lv2) + ("openssl" ,openssl) ; Required by libwebsockets. ("pangomm" ,pangomm) ("python-rdflib" ,python-rdflib) + ("pulseaudio" ,pulseaudio) ("readline" ,readline) ("redland" ,redland) ("rubberband" ,rubberband) ("serd" ,serd) ("sord" ,sord) + ("soundtouch" ,soundtouch) ("sratom" ,sratom) ("suil" ,suil) ("taglib" ,taglib) -- cgit v1.2.3 From f37d91adc466adfe9e83db2d1deeff7d8994a1fc Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 9 Apr 2021 10:08:57 +0100 Subject: gnu: guix-build-coordinator: Update to 0-23.44d0006. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-23.44d0006. [arguments]: Fix missing guile-fibers when not building for the hurd. --- gnu/packages/package-management.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a616ec6304..d7824faeea 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1050,7 +1050,7 @@ environments.") (define-public guix-build-coordinator (let ((commit "44d00065cfbd0f24d2fac631608a5aeaace648a7") - (revision "22")) + (revision "23")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1088,14 +1088,18 @@ environments.") (for-each (lambda (file) (simple-format (current-error-port) "wrapping: ~A\n" file) - (let ((guile-inputs `("guile-json" - "guile-gcrypt" - "guix" - "guile-prometheus" - "guile-lib" - "guile-lzlib" - "guile-zlib" - "gnutls"))) + (let ((guile-inputs (list + "guile-json" + "guile-gcrypt" + "guix" + "guile-prometheus" + "guile-lib" + "guile-lzlib" + "guile-zlib" + "gnutls" + ,@(if (hurd-target?) + '() + '("guile-fibers"))))) (wrap-program file `("PATH" ":" prefix (,bin -- cgit v1.2.3 From b12fd63ffd63686bccfde86437e200db39c910b2 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 9 Apr 2021 11:30:08 +0100 Subject: gnu: guix-data-service: Update to 0.0.1-27.df2a0a7. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-27.df2a0a7. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d759ad676d..8585de364d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4708,8 +4708,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "410f58cb43f083623885a430700c6818a187cadc") - (revision "26")) + (let ((commit "df2a0a73f1f35ea53ba6c07a6ad4c5347ba12b8f") + (revision "27")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4721,7 +4721,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "1jvxn3w6gwlvm52raf6zkjwg7bvfvbznsb9ch8ha0fcc6ccx7r60")))) + "1ss1prr98zdjkm97w24rd04lfnnvcw6xs0gwxqgd40briqisaa5g")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From a9f4001df9471a453fe8c1130110934db017b53c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 9 Apr 2021 11:32:40 +0100 Subject: gnu: guix-build-coordinator: Update to 0-24.6fb5eaf. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-24.6fb5eaf. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d7824faeea..ddfb2cd4e5 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1049,8 +1049,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "44d00065cfbd0f24d2fac631608a5aeaace648a7") - (revision "23")) + (let ((commit "6fb5eafc33efa109b220efe71594cfcdb2efe133") + (revision "24")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1061,7 +1061,7 @@ environments.") (commit commit))) (sha256 (base32 - "1gyrdb6gmz066d591593qvmk72qanc1psmk2l0r7smigh2bkzjka")) + "1lf7jry18kwglvyakfkmi8bif8ppsdinl0xjgmkgkp4mvmymh2gj")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 2b469e60239fd3261294d9f3faf7435c9af679bf Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 10 Nov 2018 10:03:35 +0000 Subject: gnu: Add laminar. * gnu/packages/ci.scm (laminar): New variable. --- gnu/packages/ci.scm | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 4b2b5cd3c5..3399508a0f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -25,26 +25,33 @@ #:use-module ((guix licenses) #:prefix l:) #:use-module (gnu packages) #:use-module (guix packages) + #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix download) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages docbook) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages gnupg) + #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages mail) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) (define-public cuirass @@ -177,3 +184,118 @@ intended as a replacement for Hydra.") (home-page "https://guix.gnu.org/cuirass/") (license l:gpl3+)))) + +(define-public laminar + (package + (name "laminar") + (version "1.0") + (source + (origin (method url-fetch) + (uri (string-append "https://github.com/ohwgiles/laminar/archive/" + version + ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11m6h3rdmj2rsmsryy7r40gqccj4gg1cnqwy6blscs87gx4s423g")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; TODO Can't build tests + #:configure-flags + (list "-DCMAKE_CXX_STANDARD=17" + ;; "-DBUILD_TESTS=true" TODO: objcopy: js/stPskyUS: can't add + ;; section '.note.GNU-stack': file format not recognized + (string-append "-DLAMINAR_VERSION=" ,version)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-CMakeLists.txt + (lambda _ + (substitute* "CMakeLists.txt" + (("file\\(DOWNLOAD.*\n$") + "# file download removed by Guix --") + (("install\\(FILES etc/laminar.service DESTINATION \\$\\{SYSTEMD\\_UNITDIR\\}\\)") + "") + (("install\\(FILES \\$\\{CMAKE\\_CURRENT\\_BINARY\\_DIR\\}\\/laminar\\.service DESTINATION \\$\\{SYSTEMD\\_UNITDIR\\}\\)") + "") + (("install\\(FILES etc/laminar\\.conf DESTINATION \\/etc\\)") "") + (("\\/usr\\/") "")) + #t)) + (add-after 'configure 'copy-in-javascript-and-css + (lambda* (#:key inputs outputs #:allow-other-keys) + (use-modules (ice-9 popen)) + + (mkdir-p "../build/js") + (for-each (lambda (name) + (let* ((file + (assoc-ref inputs (string-append name ".js"))) + (port + (open-pipe* OPEN_READ "uglify-js" file)) + (destination + (string-append + "../build/js/" name ".min.js"))) + + (call-with-output-file destination + (lambda (output-port) + (dump-port port output-port))) + + (let ((exit (close-pipe port))) + (unless (zero? exit) + (error "uglify-js failed" exit))))) + + '("vue" + "vue-router" + "Chart")) + + ;; ansi_up.js isn't minified + (copy-file (assoc-ref inputs "ansi_up.js") + "../build/js/ansi_up.js") + + #t))))) + (inputs + `(("capnproto" ,capnproto) + ("rapidjson" ,rapidjson) + ("sqlite" ,sqlite) + ("boost" ,boost) + ("zlib" ,zlib))) + (native-inputs + `(("googletest" ,googletest) + ("uglify-js" ,uglify-js) + + ("vue.js" + ,(origin (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/" + "vuejs/vue/v2.6.12/dist/vue.js")) + (sha256 + (base32 + "1mq2dn6yqbmzar77xf4x2bvvanf9xc9nwfq06sksl5zmr300m7qm")))) + ("vue-router.js" + ,(origin (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/" + "vuejs/vue-router/v3.4.8/dist/vue-router.js")) + (sha256 + (base32 + "1hkrbgzhpnrsb4zdafslqagy1vkac6bkdj7kh49js2lhkp9z4nj5")))) + ("ansi_up.js" + ,(origin (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/" + "drudru/ansi_up/v1.3.0/ansi_up.js")) + (sha256 + (base32 + "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r")))) + ("Chart.js" + ,(origin (method url-fetch) + (uri (string-append "https://github.com/chartjs/Chart.js/" + "releases/download/v2.7.2/Chart.js")) + (sha256 + (base32 + "05m3gk6hqjx92j20drnk7q075qpjraywqaf25lnglmsgsgpiqsr7")))))) + (synopsis "Lightweight continuous integration service") + (description + "Laminar is a lightweight and modular continuous integration service. It +doesn't have a configuration web UI instead uses version-controllable +configuration files and scripts. + +Laminar encourages the use of existing tools such as bash and cron instead of +reinventing them.") + (home-page "https://laminar.ohwg.net/") + (license l:gpl3+))) -- cgit v1.2.3 From eda4bb4f16f74436b0caf1c584888c89b3c4c69b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 10 Nov 2018 10:04:00 +0000 Subject: services: Add Laminar. * gnu/services/ci.scm: New file. * gnu/tests/ci.scm: New file. * doc/guix.texi (Laminar): Document the Laminar service. --- doc/guix.texi | 64 ++++++++++++++++++++++++-- gnu/services/ci.scm | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++ gnu/tests/ci.scm | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 316 insertions(+), 3 deletions(-) create mode 100644 gnu/services/ci.scm create mode 100644 gnu/tests/ci.scm (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index d1a15cb28b..edd91d8dd0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -38,7 +38,7 @@ Copyright @copyright{} 2016, 2017 Nikita Gillmann@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* -Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* +Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Christopher Baines@* Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@* Copyright @copyright{} 2017, 2018, 2020, 2021 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* @@ -342,7 +342,7 @@ Services * DNS Services:: DNS daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. -* Continuous Integration:: The Cuirass service. +* Continuous Integration:: Cuirass and Laminar services. * Power Management Services:: Extending battery life. * Audio Services:: The MPD. * Virtualization Services:: Virtualization services. @@ -14820,7 +14820,7 @@ declaration. * DNS Services:: DNS daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. -* Continuous Integration:: The Cuirass service. +* Continuous Integration:: Cuirass and Laminar services. * Power Management Services:: Extending battery life. * Audio Services:: The MPD. * Virtualization Services:: Virtualization services. @@ -27329,6 +27329,64 @@ the store items being published. @end table @end deftp +@subsubheading Laminar + +@uref{https://laminar.ohwg.net/, Laminar} is a lightweight and modular +Continuous Integration service. It doesn't have a configuration web UI +instead uses version-controllable configuration files and scripts. + +Laminar encourages the use of existing tools such as bash and cron +instead of reinventing them. + +@defvr {Scheme Procedure} laminar-service-type +The type of the Laminar service. Its value must be a +@code{laminar-configuration} object, as described below. + +All configuration values have defaults, a minimal configuration to get +Laminar running is shown below. By default, the web interface is +available on port 8080. + +@lisp +(service laminar-service-type) +@end lisp +@end defvr + +@deftp {Data Type} laminar-configuration +Data type representing the configuration of Laminar. + +@table @asis +@item @code{laminar} (default: @code{laminar}) +The Laminar package to use. + +@item @code{home-directory} (default: @code{"/var/lib/laminar"}) +The directory for job configurations and run directories. + +@item @code{bind-http} (default: @code{"*:8080"}) +The interface/port or unix socket on which laminard should listen for +incoming connections to the web frontend. + +@item @code{bind-rpc} (default: @code{"unix-abstract:laminar"}) +The interface/port or unix socket on which laminard should listen for +incoming commands such as build triggers. + +@item @code{title} (default: @code{"Laminar"}) +The page title to show in the web frontend. + +@item @code{keep-rundirs} (default: @code{0}) +Set to an integer defining how many rundirs to keep per job. The +lowest-numbered ones will be deleted. The default is 0, meaning all run +dirs will be immediately deleted. + +@item @code{archive-url} (default: @code{#f}) +The web frontend served by laminard will use this URL to form links to +artefacts archived jobs. + +@item @code{base-url} (default: @code{#f}) +Base URL to use for links to laminar itself. + +@end table +@end deftp + @node Power Management Services @subsection Power Management Services diff --git a/gnu/services/ci.scm b/gnu/services/ci.scm new file mode 100644 index 0000000000..0b18521e76 --- /dev/null +++ b/gnu/services/ci.scm @@ -0,0 +1,127 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018, 2019, 2020, 2021 Christopher Baines +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services ci) + #:use-module (guix gexp) + #:use-module (guix records) + #:use-module (gnu packages admin) + #:use-module (gnu packages ci) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu services shepherd) + #:use-module (gnu services admin) + #:use-module (gnu system shadow) + #:use-module (ice-9 match) + #:export (laminar-configuration + laminar-configuration? + laminar-configuration-home-directory + laminar-configuration-bind-http + laminar-configuration-bind-rpc + laminar-configuration-title + laminar-configuration-keep-rundirs + laminar-configuration-archive-url + laminar-configuration-base-url + + laminar-service-type)) + +;;;; Commentary: +;;; +;;; This module implements a service that to run instances of Laminar, a +;;; continuous integration tool. +;;; +;;;; Code: + +(define-record-type* + laminar-configuration make-laminar-configuration + laminar-configuration? + (laminar laminars-configuration-laminar + (default laminar)) + (home-directory laminar-configuration-home-directory + (default "/var/lib/laminar")) + (bind-http laminar-configuration-bind-http + (default "*:8080")) + (bind-rpc laminar-configuration-bind-rpc + (default "unix-abstract:laminar")) + (title laminar-configuration-title + (default "Laminar")) + (keep-rundirs laminar-keep-rundirs + (default 0)) + (archive-url laminar-archive-url + (default #f)) + (base-url laminar-base-url + (default #f))) + +(define laminar-shepherd-service + (match-lambda + (($ laminar home-directory + bind-http bind-rpc + title keep-rundirs archive-url + base-url) + (list (shepherd-service + (documentation "Run Laminar.") + (provision '(laminar)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append laminar "/sbin/laminard")) + #:environment-variables + `(,(string-append "LAMINAR_HOME=" + #$home-directory) + ,(string-append "LAMINAR_BIND_HTTP=" + #$bind-http) + ,(string-append "LAMINAR_TITLE=" + #$title) + ,(string-append "LAMINAR_KEEP_RUNDIRS=" + #$(number->string + keep-rundirs)) + ,@(if #$archive-url + (list + (string-append "LAMINAR_ARCHIVE_URL=" + #$archive-url)) + '()) + ,@(if #$base-url + (list + (string-append "LAMINAR_BASE_URL=" + #$base-url)) + '())) + #:user "laminar" + #:group "laminar")) + (stop #~(make-kill-destructor))))))) + +(define (laminar-account config) + "Return the user accounts and user groups for CONFIG." + (list (user-group + (name "laminar") + (system? #t)) + (user-account + (name "laminar") + (group "laminar") + (system? #t) + (comment "Laminar privilege separation user") + (home-directory (laminar-configuration-home-directory config)) + (shell #~(string-append #$shadow "/sbin/nologin"))))) + +(define laminar-service-type + (service-type + (name 'laminar) + (extensions + (list + (service-extension shepherd-root-service-type laminar-shepherd-service) + (service-extension account-service-type laminar-account))) + (default-value (laminar-configuration)) + (description + "Run the Laminar continuous integration service."))) diff --git a/gnu/tests/ci.scm b/gnu/tests/ci.scm new file mode 100644 index 0000000000..a8b39fcd01 --- /dev/null +++ b/gnu/tests/ci.scm @@ -0,0 +1,128 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Christopher Baines +;;; Copyright © 2017, 2018 Clément Lassieur +;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Marius Bakke +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu tests ci) + #:use-module (gnu tests) + #:use-module (gnu system) + #:use-module (gnu system file-systems) + #:use-module (gnu system shadow) + #:use-module (gnu system vm) + #:use-module (gnu services) + #:use-module (gnu services ci) + #:use-module (gnu services web) + #:use-module (gnu services networking) + #:use-module (guix gexp) + #:use-module (guix store) + #:export (%test-laminar)) + + +(define %laminar-os + ;; Operating system under test. + (simple-operating-system + (service dhcp-client-service-type) + (service laminar-service-type))) + +(define* (run-laminar-test #:optional (http-port 8080)) + "Run tests in %LAMINAR-OS, which has laminar running and listening on +HTTP-PORT." + (define os + (marionette-operating-system + %laminar-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((,http-port . 8080))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-11) (srfi srfi-64) + (ice-9 match) + (gnu build marionette) + (web uri) + (web client) + (web response)) + + (define marionette + ;; Forward the guest's HTTP-PORT, where laminar is listening, to + ;; port 8080 in the host. + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "laminar") + + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'laminar)) + marionette)) + + (define* (retry-on-error f #:key times delay) + (let loop ((attempt 1)) + (match (catch + #t + (lambda () + (cons #t + (f))) + (lambda args + (cons #f + args))) + ((#t . return-value) + return-value) + ((#f . error-args) + (if (>= attempt times) + error-args + (begin + (sleep delay) + (loop (+ 1 attempt)))))))) + + (test-equal "http-get" + 200 + (retry-on-error + (lambda () + (let-values (((response text) + (http-get #$(format + #f + "http://localhost:~A/" + http-port) + ;; TODO: Why does decoding fail? + #:decode-body? #f))) + (response-code response))) + #:times 10 + #:delay 5)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "laminar-test" test)) + +(define %test-laminar + (system-test + (name "laminar") + (description "Connect to a running Laminar server.") + (value (run-laminar-test)))) -- cgit v1.2.3 From f4d1abf1f81dc009a26bf67e18afee83c4694626 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 9 Apr 2021 13:39:32 +0200 Subject: gnu: cuirass: Update to 1.0.0-9.d601fe0. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-9.d601fe0. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 3399508a0f..cdd397d167 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -55,8 +55,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "7542d626dc476c7e00fc8e756e97f498fb272f45") - (revision "8")) + (let ((commit "d601fe0e4c85ab7b37f0571e898448c9fadde715") + (revision "9")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -69,7 +69,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0w7isma75w0m65v6mkjkg5ysd0qn9bz51rnps4g845qra2jc1h7s")))) + "09d05bqy7wqz9175b4nv3sqasibx4175kmiz75id05ipr0vn0j12")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From a365777ebd6296e548422da57de0c2884114fd8d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 9 Apr 2021 15:06:35 +0300 Subject: gnu: gcc-10: Update to 10.3.0. * gnu/packages/gcc.scm (gcc-10): Update to 10.3.0. --- gnu/packages/gcc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5f84d28551..a412c93c29 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -583,14 +583,14 @@ It also includes runtime support libraries for these languages."))) (define-public gcc-10 (package (inherit gcc-8) - (version "10.2.0") + (version "10.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "130xdkhmz1bc2kzx061s3sfwk36xah1fw5w332c0nzwwpdl47pdq")) + "0i6378ig6h397zkhd7m4ccwjx5alvzrf2hm27p1pzwjhlv0h9x34")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")))))) -- cgit v1.2.3 From 931572d230cf7c6d638cf59532a750dc7c0586a4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 9 Apr 2021 14:25:50 +0200 Subject: gnu: cuirass: Disable tests on aarch64. * gnu/packages/ci.scm (cuirass)[arguments]: Disable tests on aarch64. --- gnu/packages/ci.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index cdd397d167..030fc73ef9 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -77,6 +77,11 @@ (ice-9 rdelim) (ice-9 popen)) #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass + ;; XXX: HTTP tests fail on aarch64 due to Fibers errors, disable them + ;; on that architecture for now. + #:tests? ,(let ((s (or (%current-target-system) + (%current-system)))) + (not (string-prefix? "aarch64" s))) #:parallel-tests? #f #:phases (modify-phases %standard-phases -- cgit v1.2.3 From c3c338e0b56bfe936f29adc3af89ffea35e72ced Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Fri, 9 Apr 2021 14:33:09 +0100 Subject: gnu: Add texlive-cabin. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index df84cbd571..dfc92c3174 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7948,3 +7948,33 @@ desired for one font family is not available for another font family, or if it differs from the weight desired for another font family. The @code{mweights} package provides a solution to these difficulties.") (license license:lppl))) + +(define-public texlive-cabin + (package + (inherit (simple-texlive-package + "texlive-cabin" + (list "/doc/fonts/cabin/" + "/fonts/enc/dvips/cabin/" + "/fonts/map/dvips/cabin/" + "/fonts/opentype/impallari/cabin/" + "/fonts/tfm/impallari/cabin/" + "/fonts/type1/impallari/cabin/" + "/fonts/vf/impallari/cabin/" + "/tex/latex/cabin/") + (base32 + "0dfq9gqch80iyvp58spmpmqfc9h61sjvnddm81ba0af1p8ag8sfg") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/cabin") + (synopsis "Humanist Sans Serif font with LaTeX support") + (description "Cabin is a humanist sans with four weights, true +italics and small capitals. According to its designer, Pablo +Impallari, Cabin was inspired by the typefaces of Edward Johnston and +Eric Gill. Cabin incorporates modern proportions, optical adjustments +and some elements of the geometric sans. @code{cabin.sty} supports +use of the font under LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX. It uses +the @code{mweights} package to manage the user's view of all those +font weights. An @code{sfdefault} option is provided to enable Cabin +as the default text font. The @code{fontaxes} package is required for +use with [pdf]LaTeX.") + (license (list license:silofl1.1 ;for Cabin + license:lppl)))) ;for support files -- cgit v1.2.3 From c8d809f9a49c2b4ec5500c2685e96168dcd9afa9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 17:17:55 +0200 Subject: gnu: dnsmasq: Update to 2.85 [fixes CVE-2021-3448]. * gnu/packages/dns.scm (dnsmasq): Update to 2.85. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index c940657ce9..3cf88febae 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -278,7 +278,7 @@ prompt the user with the option to go with insecure DNS only.") (define-public dnsmasq (package (name "dnsmasq") - (version "2.84") + (version "2.85") (source (origin (method url-fetch) (uri (string-append @@ -286,7 +286,7 @@ prompt the user with the option to go with insecure DNS only.") version ".tar.xz")) (sha256 (base32 - "0305a0c3snwqcv77sipyynr55xip1fp2843yn04pc4vk9g39acb0")))) + "1yhjwgz8g5qrqvxh6bbmg3443zi8qqjks3q872wyb1zn7n0d765d")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 28c09381d4892b75fef453094ba7be220968afc8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 17:37:44 +0200 Subject: gnu: xsimd: Update to 7.4.10. * gnu/packages/cpp.scm (xsimd): Update to 7.4.10. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2a00d3838a..58345e7c33 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -273,7 +273,7 @@ combination of these streams.") (define-public xsimd (package (name "xsimd") - (version "7.4.9") + (version "7.4.10") (source (origin (method git-fetch) @@ -281,7 +281,7 @@ combination of these streams.") (url "https://github.com/QuantStack/xsimd") (commit version))) (sha256 - (base32 "11by8gbshm4vv6flqp0ihff8c6nmbaqq7ms93b38rrq68bigcply")) + (base32 "097yvxrxdldi5s5m4nsxv8f4gwv9xj42mqig98a1z3hkjj1j2gn5")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From ececdfc878d3d371e7e90d47a7c671dc6743fb28 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 17:38:29 +0200 Subject: gnu: clamav: Update to 0.103.2. * gnu/packages/antivirus.scm (clamav): Update to 0.103.2. --- gnu/packages/antivirus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/antivirus.scm b/gnu/packages/antivirus.scm index 29763f3452..9bcfe52126 100644 --- a/gnu/packages/antivirus.scm +++ b/gnu/packages/antivirus.scm @@ -44,14 +44,14 @@ (define-public clamav (package (name "clamav") - (version "0.103.1") + (version "0.103.2") (source (origin (method url-fetch) (uri (string-append "https://www.clamav.net/downloads/production/" "clamav-" version ".tar.gz")) (sha256 (base32 - "0mz2aq8dh4i7mh59r71scczgyjbsj8l0a51nkwxsys5ji5xw823k")) + "1lhv4xw89sszi519agvc9mi6jz5aiivm9yr6lciy8qk2csnd1dfl")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 24f69e797daac388a0d19e83e95ddde652bf87f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 17:38:58 +0200 Subject: gnu: speedtest-cli: Update to 2.1.3. * gnu/packages/networking.scm (speedtest-cli): Update to 2.1.3. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 133f525cb9..baaa9c5707 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2494,7 +2494,7 @@ networks.") (define-public speedtest-cli (package (name "speedtest-cli") - (version "2.1.2") + (version "2.1.3") (source (origin (method git-fetch) @@ -2503,7 +2503,7 @@ networks.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1456yly6iym2c9bl6pi4sz8xbw34bm2dxm1vzpydsd6jazwpmy26")))) + (base32 "10fazl4kwf41mk7pnwpfms16n0ii0kg9pf8r3mz9xwnl9y04mv9x")))) (build-system python-build-system) (home-page "https://github.com/sivel/speedtest-cli") (synopsis "Internet bandwidth tester") -- cgit v1.2.3 From 4b83f820dded9ef15bb341fd7c3ecfc2a2a38933 Mon Sep 17 00:00:00 2001 From: Masaya Tojo Date: Fri, 9 Apr 2021 02:25:26 +0900 Subject: gnu: guile-cv: Use guile2.2 version of guile-lib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-cv)[propagated-inputs]: Change from guile-lib to guile2.2-lib. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e2ee5454a0..75256e0f11 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Julien Lepiler ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020 Masaya Tojo +;;; Copyright © 2020, 2021 Masaya Tojo ;;; Copyright © 2020 Jesse Gibbons ;;; Copyright © 2020 Mike Rosset ;;; Copyright © 2020 Leo Prikler @@ -3519,7 +3519,7 @@ feature-set, fully programmable in Guile Scheme.") texlive-fonts-iwona))) ("pkg-config" ,pkg-config))) (propagated-inputs - `(("guile-lib" ,guile-lib))) + `(("guile-lib" ,guile2.2-lib))) (home-page "https://www.gnu.org/software/guile-cv/") (synopsis "Computer vision library for Guile") (description "Guile-CV is a Computer Vision functional programming library -- cgit v1.2.3 From ccff3380867b588f0c68e9daedd5728392a91a3f Mon Sep 17 00:00:00 2001 From: Franck Pérignon Date: Thu, 8 Apr 2021 13:42:27 +0000 Subject: gnu: Add boost-mpi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/boost.scm (boost-mpi): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/boost.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 1323e28278..a59bb01f3d 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019, 2020 Giacomo Leidi ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier +;;; Copyright © 2021 Franck Pérignon ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages shells) + #:use-module (gnu packages mpi) #:use-module (srfi srfi-1)) (define (version-with-underscores version) @@ -347,6 +349,30 @@ Boost.Thread.") signals and slots system.") (license (license:x11-style "https://www.boost.org/LICENSE_1_0.txt")))) + +(define-public boost-mpi + (package + (inherit boost) + (name "boost-mpi") + (native-inputs + `(("perl" ,perl) + ,@(if (%current-target-system) + '() + `(("python" ,python-wrapper))) + ("openmpi" , openmpi))) + (arguments + (substitute-keyword-arguments (package-arguments boost) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'update-jam + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((output-port (open-file "project-config.jam" "a"))) + (display "using mpi ;" output-port) + (newline output-port) + (close output-port)))))))) + (home-page "https://www.boost.org") + (synopsis "Message Passing Interface (MPI) library for C++"))) + (define-public mdds (package (name "mdds") -- cgit v1.2.3 From ec8d09ee672e0d357bb5bb597464c8b168f14bfb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 9 Apr 2021 18:09:07 +0200 Subject: gnu: guix: Update to 2d73086. * gnu/packages/package-management.scm (guix): Update to 2d73086. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ddfb2cd4e5..6df46aa35f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "8f9052d5434a3a11e7b4ff14d6b0090256e08aa4") - (revision 19)) + (commit "2d73086262e1fb33cd0f0f16f74a495fe06b38aa") + (revision 20)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0jqxabl9sqn7dd1l9q62zm9f7w274q44dya24akina8wwfi5yc4k")) + "070frsjcbrdqh68rhrck6w3cprbq1hjpd24z44qd017zaicix1f0")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From dd55d64338021634d4091eecb73ba4de0d5c2622 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 17:48:36 +0200 Subject: gnu: python-yamllint: Update to 1.26.1. * gnu/packages/python-xyz.scm (python-yamllint): Update to 1.26.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2a876670ff..e72d124e28 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18381,13 +18381,13 @@ user's @file{~/Trash} directory.") (define-public python-yamllint (package (name "python-yamllint") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) (uri (pypi-uri "yamllint" version)) (sha256 - (base32 "11qhs1jk9pwvyk5k3q5blh9sq42dh1ywdf1f3i2zixf7hncwir5h")))) + (base32 "090krlxj7az0d9yl8i20vjrqi66dfxx7y5xakjhxzsfp7qmldnc7")))) (build-system python-build-system) (propagated-inputs `(("python-pathspec" ,python-pathspec) -- cgit v1.2.3 From f6a62f68fa2bcc7a0d1d7226b47ccacf01e0069f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 18:09:32 +0200 Subject: gnu: libmwaw: Update to 0.3.18. * gnu/packages/libreoffice.scm (libmwaw): Update to 0.3.18. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a8c2ac5c4b..39867a1994 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -714,14 +714,14 @@ text documents, vector drawings, presentations and spreadsheets.") (define-public libmwaw (package (name "libmwaw") - (version "0.3.17") + (version "0.3.18") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmwaw/libmwaw/libmwaw-" version "/libmwaw-" version ".tar.xz")) (sha256 - (base32 "074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf")))) + (base32 "03qyxp8hkcc7jcwyq0v0y2diqsvib060pg7y9zk0n07qh0b0apgw")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From dcfa85ac1fccadb6dce847085cf16135a4c94ad3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 18:12:09 +0200 Subject: gnu: ruby-rexml: Update to 3.2.5. * gnu/packages/ruby.scm (ruby-rexml): Update to 3.2.5. --- gnu/packages/ruby.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 806c6cf873..300726764e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7159,7 +7159,7 @@ by RuboCop to deal with Ruby's Abstract Syntax Tree (AST), in particular: (define-public ruby-rexml (package (name "ruby-rexml") - (version "3.2.4") + (version "3.2.5") (source (origin (method git-fetch) ;no tests in distributed gem @@ -7168,8 +7168,7 @@ by RuboCop to deal with Ruby's Abstract Syntax Tree (AST), in particular: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0rhjjbkaq2f2cs8hyr2i4yjqpcyl8m0wmr2cypa401m3fvz4221i")))) + (base32 "13n6vaa80drqic2wri4q6k22qzvsn683vp5s8c9dllil6x04kn0x")))) (build-system ruby-build-system) (synopsis "XML toolkit for Ruby") (description "Inspired by Electric XML library for Java, REXML aims to be -- cgit v1.2.3 From ba1030be409d31e3509c8943c5f897376e73bb27 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 18:12:37 +0200 Subject: gnu: stellarium: Update to 0.21.0. * gnu/packages/astronomy.scm (stellarium): Update to 0.21.0. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 6105ef2590..6cbd5f1bf6 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -399,7 +399,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") (define-public stellarium (package (name "stellarium") - (version "0.20.4") + (version "0.21.0") (source (origin (method url-fetch) @@ -407,7 +407,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") "/releases/download/v" version "/stellarium-" version ".tar.gz")) (sha256 - (base32 "1253zlr0mi4kdbj119spxk7spg4rkahb4rlpd0hz1d81mnv3n0v3")))) + (base32 "04vg2asj9gygwnrs32scqc8192ln2lyqa9v7cjqk8zd4frkwszwp")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) -- cgit v1.2.3 From 8615e21a8cfb01882b4785c950ccb89edc9c4bcc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 18:23:50 +0200 Subject: gnu: pidgin: Update to 2.14.3. * gnu/packages/messaging.scm (pidgin): Update to 2.14.3. [arguments]: Add an 'eat-leftovers phase. --- gnu/packages/messaging.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e8b67c03bc..64aada69f5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -788,7 +788,7 @@ authentication.") (define-public pidgin (package (name "pidgin") - (version "2.14.2") + (version "2.14.3") (source (origin (method url-fetch) @@ -796,7 +796,7 @@ authentication.") (string-append "mirror://sourceforge/pidgin/Pidgin/" version "/pidgin-" version ".tar.gz")) (sha256 - (base32 "19r297ynxizdj357ihmy0sgpgfikdzblkszlwlqnsr3lvbjhhsg1")) + (base32 "0vdfnm96m1kh4gm6xn6i7s9c5zjh1p18jg4595k4p5bplvd6fmm8")) (patches (search-patches "pidgin-add-search-path.patch")) (modules '((guix build utils))) @@ -875,7 +875,16 @@ authentication.") "/lib") (string-append "--with-tkconfig=" (assoc-ref %build-inputs "tk") - "/lib")))) + "/lib")) + #:phases + (modify-phases %standard-phases + (add-before 'check 'eat-leftovers + ;; XXX Remove when updating beyond 2.14.3. Equivalent to + ;; . + (lambda _ + ;; Remove a lingering [broken] oscar reference. + (substitute* "libpurple/tests/check_libpurple.c" + ((".*oscar_util_suite.*") ""))))))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 018b6b46f1adcc2f2d7ce2b15ca66e998a9f2f44 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 9 Apr 2021 13:36:58 -0400 Subject: gnu: freeciv: Update to 2.6.4. * gnu/packages/games.scm (freeciv): Update to 2.6.4. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 048784ab2c..74cf9260df 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5849,7 +5849,7 @@ for Un*x systems with X11.") (define-public freeciv (package (name "freeciv") - (version "2.6.3") + (version "2.6.4") (source (origin (method url-fetch) @@ -5861,7 +5861,7 @@ for Un*x systems with X11.") (version-major+minor version) "/" version "/freeciv-" version ".tar.bz2"))) (sha256 - (base32 "1lgq7wcbhwpy2yqdw4biwfmp5q8fh7lhlwxcgm0fpaapfl12whvp")))) + (base32 "1kn122f57wn5a8ryxaz73dlbd5m93mqx3bqmmz2lkgdccrvrbns0")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From c990604cb044dacf9c52fa33ec63b660329d4cb6 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Mon, 22 Feb 2021 21:15:21 +1100 Subject: gnu: python-sip: Update to 5.5.0. Add python-sip-4 * gnu/packages/qt.scm (python-sip): Update to 5.5.0. (python-sip-4): New variable. Rename the old python-sip to python-sip-4. (python2-sip): Inherit from python-sip-4. * gnu/packages/maths.scm (veusz)[native-inputs]: Use python-sip-4. * gnu/packages/pdf.scm (python-poppler-qt5): Use python-sip-4. * gnu/packages/geo.scm (qgis)[arguments]: Fix build for python-sip@5. --- gnu/packages/geo.scm | 16 ++++++++++++++- gnu/packages/maths.scm | 3 ++- gnu/packages/pdf.scm | 2 +- gnu/packages/qt.scm | 54 +++++++++++++++++++++++++++++++++++++------------- 4 files changed, 58 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index bc5e6820f3..c4bdb6aca0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2082,7 +2082,21 @@ growing set of geoscientific methods.") (("sip_dir = cfg.default_sip_dir") (string-append "sip_dir = \"" (assoc-ref inputs "python-pyqt+qscintilla") - "/share/sip\""))) + "/share/sip\"")) + ;; Fix building with python-sip@5. + ;; + ;; The reason for this is that python-sip@5 introduces some + ;; changes such as a new build system 'sip-build' as well as the + ;; use of the path "/lib/pythonX.X/site-packages/*/bindings/" + ;; instead of "/share/sip/" for .sip files. However, we do not + ;; actually use that those yet. QGIS detects SIP5 and assumes we + ;; are, messing up the build. The long term solution is to fully + ;; upgrade SIP, use sip-build and fix all failing packages, but + ;; for now I just want to get the build working. + ((".pyqt_sip_dir...os.path.join.*,") + (string-append "'pyqt_sip_dir': \"" + (assoc-ref inputs "python-pyqt+qscintilla") + "/share/sip" "\","))) (substitute* (list "scripts/prepare_commit.sh" "scripts/qstringfixup.sh" "scripts/release.pl" diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ff1b46f095..c1c29bc1d3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2290,7 +2290,8 @@ ASCII text files using Gmsh's own scripting language.") (native-inputs `(("pkg-config" ,pkg-config) ;;("python-astropy" ,python-astropy) ;; FIXME: Package this. - ("qttools" ,qttools))) + ("qttools" ,qttools) + ("python-sip" ,python-sip-4))) (inputs `(("ghostscript" ,ghostscript) ;optional, for EPS/PS output ("python-dbus" ,python-dbus) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index cbbdf68f5b..689d03afc8 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -339,7 +339,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python-sip" ,python-sip) + `(("python-sip" ,python-sip-4) ("python-pyqt" ,python-pyqt) ("poppler-qt5" ,poppler-qt5) ("qtbase" ,qtbase))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 21ccf15dc3..83501b82ca 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) @@ -1806,6 +1808,42 @@ and binaries removed, and adds modular support for using system libraries.") (define-public python-sip (package + (name "python-sip") + (version "5.5.0") + (source + (origin + (method url-fetch) + (uri (list (pypi-uri "sip" version) + (string-append "https://www.riverbankcomputing.com/static/" + "Downloads/sip/" version + "/sip-" version ".tar.gz"))) + (sha256 + (base32 + "1idaivamp1jvbbai9yzv471c62xbqxhaawccvskaizihkd0lq0jx")))) + (build-system python-build-system) + (native-inputs + `(("python" ,python-wrapper))) + (propagated-inputs + `(("python-toml" ,python-toml) + ("python-packaging" ,python-packaging))) + (home-page "https://www.riverbankcomputing.com/software/sip/intro") + (synopsis "Python binding creator for C and C++ libraries") + (description + "SIP is a tool to create Python bindings for C and C++ libraries. It +was originally developed to create PyQt, the Python bindings for the Qt +toolkit, but can be used to create bindings for any C or C++ library. + +SIP comprises a code generator and a Python module. The code generator +processes a set of specification files and generates C or C++ code, which +is then compiled to create the bindings extension module. The SIP Python +module provides support functions to the automatically generated code.") + ;; There is a choice between a python like license, gpl2 and gpl3. + ;; For compatibility with pyqt, we need gpl3. + (license license:gpl3))) + +(define-public python-sip-4 + (package + (inherit python-sip) (name "python-sip") (version "4.19.24") (source @@ -1821,6 +1859,7 @@ and binaries removed, and adds modular support for using system libraries.") (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper))) + (propagated-inputs `()) (arguments `(#:tests? #f ; no check target #:imported-modules ((guix build python-build-system) @@ -1843,23 +1882,10 @@ and binaries removed, and adds modular support for using system libraries.") "--bindir" bin "--destdir" lib "--incdir" include))))))) - (home-page "https://www.riverbankcomputing.com/software/sip/intro") - (synopsis "Python binding creator for C and C++ libraries") - (description - "SIP is a tool to create Python bindings for C and C++ libraries. It -was originally developed to create PyQt, the Python bindings for the Qt -toolkit, but can be used to create bindings for any C or C++ library. - -SIP comprises a code generator and a Python module. The code generator -processes a set of specification files and generates C or C++ code, which -is then compiled to create the bindings extension module. The SIP Python -module provides support functions to the automatically generated code.") - ;; There is a choice between a python like license, gpl2 and gpl3. - ;; For compatibility with pyqt, we need gpl3. (license license:gpl3))) (define-public python2-sip - (package/inherit python-sip + (package/inherit python-sip-4 (name "python2-sip") (native-inputs `(("python" ,python-2))))) -- cgit v1.2.3 From 9360706294f69faf445016e206d5e8a4d595d430 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Mon, 22 Feb 2021 22:10:56 +1100 Subject: gnu: Add python-pyqt-builder. * gnu/packages/qt.scm (python-pyqt-builder): New variable. --- gnu/packages/qt.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 83501b82ca..f9123ed08f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2108,6 +2108,29 @@ itself.") ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))))) +(define-public python-pyqt-builder + (package + (name "python-pyqt-builder") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyQt-builder" version)) + (sha256 + (base32 + "0nh0054c54ji3sm6d268fccf0y5f613spswwgwqd3rnn816hnljl")))) + (build-system python-build-system) + (inputs + `(("python-sip" ,python-sip))) + (home-page "https://www.riverbankcomputing.com/static/Docs/PyQt-builder/") + (synopsis "PEP 517 compliant PyQt build system") + (description "PyQt-builder is a tool for generating Python bindings for C++ +libraries that use the Qt application framework. The bindings are built on +top of the PyQt bindings for Qt. PyQt-builder is used to build PyQt itself.") + ;; Either version 2 or 3, but no other version. See the file + ;; 'pyqtbuild/builder.py' in the source distribution for more information. + (license (list license:gpl2 license:gpl3)))) + (define-public python-qtpy (package (name "python-qtpy") -- cgit v1.2.3 From 8effa05378977a2dc7ee86dd719fa1f4754658bf Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 27 Feb 2021 14:53:55 +1100 Subject: gnu: Add python-pyqt5-sip. * gnu/packages/qt.scm (python-pyqt5-sip): New variable. --- gnu/packages/qt.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f9123ed08f..d604a9ccb3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1982,6 +1982,25 @@ framework. The bindings are implemented as a set of Python modules and contain over 620 classes.") (license license:gpl3))) +(define-public python-pyqt5-sip + (package + (name "python-pyqt5-sip") + (version "12.8.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyQt5_sip" version)) + (sha256 + (base32 + "1gg032ys4pccwkdzmdryadc9a4lq85nr05pag9swrsdykbdl9s9h")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;; No test code. + (home-page "https://www.riverbankcomputing.com/software/sip/") + (synopsis "Sip module support for PyQt5") + (description "Sip module support for PyQt5") + (license license:lgpl2.1+))) + (define-public python-pyqtwebengine (package (name "python-pyqtwebengine") -- cgit v1.2.3 From 586f017d9800a23c71b347c74aee5017a168b35b Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Mon, 22 Feb 2021 22:20:40 +1100 Subject: gnu: python-pyqt: Fix build for new python-sip. * gnu/packages/qt.scm (python-pyqt) [source]: Remove pyqt-public-sip.patch. [propagated-inputs]: Add python-pyqt5-sip. * gnu/packages/patches/pyqt-public-sip.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/pyqt-public-sip.patch | 55 ------------------------------ gnu/packages/qt.scm | 8 ++--- 3 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/pyqt-public-sip.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 075504e302..8365e19b02 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1559,7 +1559,6 @@ dist_patch_DATA = \ %D%/packages/patches/pybugz-stty.patch \ %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ %D%/packages/patches/pyqt-configure.patch \ - %D%/packages/patches/pyqt-public-sip.patch \ %D%/packages/patches/python-2-deterministic-build-info.patch \ %D%/packages/patches/python-2.7-adjust-tests.patch \ %D%/packages/patches/python-2.7-search-paths.patch \ diff --git a/gnu/packages/patches/pyqt-public-sip.patch b/gnu/packages/patches/pyqt-public-sip.patch deleted file mode 100644 index 44cdcb6371..0000000000 --- a/gnu/packages/patches/pyqt-public-sip.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://sources.debian.org/data/main/p/pyqt5/5.11.3+dfsg-1/debian/patches/public_sip.diff - -From: Dmitry Shachnev -Date: Tue, 3 Jul 2018 09:46:42 +0300 -Subject: Use the public version of sip module - -Per https://www.debian.org/doc/debian-policy/#convenience-copies-of-code. ---- - configure.py | 2 +- - designer/pluginloader.cpp | 2 +- - qmlscene/pluginloader.cpp | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.py b/configure.py -index 32d03a0..3c43a14 100644 ---- a/configure.py -+++ b/configure.py -@@ -2440,7 +2440,7 @@ def get_sip_flags(target_config): - the target configuration. - """ - -- sip_flags = ['-n', 'PyQt5.sip'] -+ sip_flags = ['-n', 'sip'] - - # If we don't check for signed interpreters, we exclude the 'VendorID' - # feature -diff --git a/designer/pluginloader.cpp b/designer/pluginloader.cpp -index f41d391..3ca8b11 100644 ---- a/designer/pluginloader.cpp -+++ b/designer/pluginloader.cpp -@@ -167,7 +167,7 @@ bool PyCustomWidgets::importPlugins(const QString &dir, const QStringList &plugi - // Make sure we have sip.unwrapinstance. - if (!sip_unwrapinstance) - { -- sip_unwrapinstance = getModuleAttr("PyQt5.sip", "unwrapinstance"); -+ sip_unwrapinstance = getModuleAttr("sip", "unwrapinstance"); - - if (!sip_unwrapinstance) - return true; -diff --git a/qmlscene/pluginloader.cpp b/qmlscene/pluginloader.cpp -index e14b946..140e80c 100644 ---- a/qmlscene/pluginloader.cpp -+++ b/qmlscene/pluginloader.cpp -@@ -412,9 +412,9 @@ PyObject *PyQt5QmlPlugin::getModuleAttr(const char *module, const char *attr) - void PyQt5QmlPlugin::getSipAPI() - { - #if defined(SIP_USE_PYCAPSULE) -- sip = (const sipAPIDef *)PyCapsule_Import("PyQt5.sip._C_API", 0); -+ sip = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0); - #else -- PyObject *c_api = getModuleAttr("PyQt5.sip", "_C_API"); -+ PyObject *c_api = getModuleAttr("sip", "_C_API"); - - if (c_api) - { diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d604a9ccb3..530fcf1039 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1903,17 +1903,17 @@ module provides support functions to the automatically generated code.") (string-append "https://www.riverbankcomputing.com/static/" "Downloads/PyQt5/" version "/PyQt5-" version ".tar.gz"))) - (file-name (string-append "PyQt5-"version ".tar.gz")) + (file-name (string-append "PyQt5-" version ".tar.gz")) (sha256 (base32 "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp")) - (patches (search-patches "pyqt-configure.patch" - "pyqt-public-sip.patch")))) + (patches (search-patches "pyqt-configure.patch")))) (build-system gnu-build-system) (native-inputs `(("qtbase" ,qtbase))) ; for qmake (propagated-inputs - `(("python-sip" ,python-sip))) + `(("python-sip" ,python-sip) + ("python-pyqt5-sip" ,python-pyqt5-sip))) (inputs `(("python" ,python-wrapper) ("qtbase" ,qtbase) -- cgit v1.2.3 From 944640f3ee07f88a08d8318e72df5fb2bd6328a2 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 25 Feb 2021 12:46:42 +1100 Subject: gnu: Add python-ifaddr. * gnu/packages/python-xyz.scm (python-ifaddr): New variable. --- gnu/packages/python-xyz.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e72d124e28..c52c70ec89 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -43,7 +43,7 @@ ;;; Copyright © 2017, 2018, 2019 Kei Kebreau ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki -;;; Copyright © 2017, 2019 Brendan Tildesley +;;; Copyright © 2017, 2019, 2021 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones ;;; Copyright © 2018 Vijayalakshmi Vedantham @@ -20988,6 +20988,31 @@ by Igor Pavlov.") (define-public python2-pylzma (package-with-python2 python-pylzma)) +(define-public python-ifaddr + (package + (name "python-ifaddr") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ifaddr" version)) + (sha256 + (base32 + "150sxdlicwrphmhnv03ykxplyd2jdrxz0mikgnivavgilrn8m7hz")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "nosetests")))))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/pydron/ifaddr") + (synopsis "Network interface and IP address enumeration library") + (description "This package provides a network interface and IP address +enumeration library in Python.") + (license license:expat))) + (define-public python2-zeroconf (package (name "python2-zeroconf") -- cgit v1.2.3 From 506b3299f3824d09c75855cbaf32d540ef706224 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 25 Feb 2021 13:05:20 +1100 Subject: gnu: Add python-zeroconf. * gnu/packages/python-xyz.scm (python-zeroconf): New variable. --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c52c70ec89..721171a4fb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21013,6 +21013,39 @@ by Igor Pavlov.") enumeration library in Python.") (license license:expat))) +(define-public python-zeroconf + (package + (name "python-zeroconf") + (version "0.28.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "zeroconf" version)) + (sha256 + (base32 + "0narq8haa3b375vfblbyil77n8bw0wxqnanl91pl0wwwm884mqjb")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(("python-ifaddr" ,python-ifaddr))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ ;; Networking isn't available for these tests. + (invoke "nosetests" "-v" + "--exclude" "test_integration_with_listener_ipv6" + "--exclude" "test_launch_and_close_v6_only" + "--exclude" "test_launch_and_close_v4_v6" + "--exclude" "test_launch_and_close")))))) + (home-page "https://github.com/jstasiak/python-zeroconf") + (synopsis "Pure Python mDNS service discovery") + (description + "Pure Python multicast DNS (mDNS) service discovery library (Bonjour/Avahi +compatible).") + (license license:lgpl2.1+))) + (define-public python2-zeroconf (package (name "python2-zeroconf") -- cgit v1.2.3 From ed2c89f25d256155fbd2663236294fa9210b93a1 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 10 Mar 2021 19:30:33 +1100 Subject: gnu: Add python-pyannotate. * gnu/packages/python-check.scm (python-pyannotate): New variable. --- gnu/packages/python-check.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 7f27966796..961d245630 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1183,6 +1184,28 @@ any Python VM with basically no runtime overhead.") ;; mypyc/lib-rt/getargs.c (license (list license:expat license:psfl)))) +(define-public python-pyannotate + (package + (name "python-pyannotate") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyannotate" version)) + (sha256 + (base32 + "16bm0mf7wxvy0lgmcs1p8n1ji8pnvj1jvj8zk3am70dkp825iv84")))) + (build-system python-build-system) + (propagated-inputs + `(("python-mypy-extensions" ,python-mypy-extensions) + ("python-six" ,python-six))) + (home-page + "https://github.com/dropbox/pyannotate") + (synopsis "Auto-generate PEP-484 annotations") + (description "This package, PyAnnotate, is used to auto-generate PEP-484 +annotations.") + (license license:asl2.0))) + (define-public python-eradicate (package (name "python-eradicate") -- cgit v1.2.3 From f9d8d438b33fd751338317903e88fe932c73d6a9 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 25 Feb 2021 13:30:02 +1100 Subject: gnu: Add python-multivolumefile. * gnu/packages/python-compression.scm (python-multivolumefile): New variable. --- gnu/packages/python-compression.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 2065e6e38f..298fc382e7 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,9 +36,38 @@ #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx)) +(define-public python-multivolumefile + (package + (name "python-multivolumefile") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "multivolumefile" version)) + (sha256 + (base32 + "0j46wab4b09s3favjzp3zs1cn2sn8pr7qyngs5wn31hpqqxbbz76")))) + (build-system python-build-system) + (native-inputs + `(("python-pep517" ,python-pep517) + ("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm/next) + ("python-coverage" ,python-coverage) + ("python-coveralls" ,python-coveralls) + ("python-pyannotate" ,python-pyannotate) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://github.com/miurahr/multivolume") + (synopsis "Treat multiple files as one") + (description "MultiVolumefile is a Python library that provides a +file-object abstraction, making it possible to use multiple files as if they +were a single file.") + (license license:lgpl2.1+))) + (define-public python-lzo (package (name "python-lzo") -- cgit v1.2.3 From 8cc985a00bdefd6dcff697cfcf7253b6e4c90a61 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 25 Feb 2021 13:49:40 +1100 Subject: gnu: Add python-ppmd-cffi. * gnu/packages/python-compression.scm (python-ppmd-cffi): New variable. --- gnu/packages/python-compression.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 298fc382e7..884f55e213 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -31,6 +31,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages libffi) #:use-module (gnu packages compression) #:use-module (gnu packages check) #:use-module (gnu packages maths) @@ -68,6 +69,34 @@ file-object abstraction, making it possible to use multiple files as if they were a single file.") (license license:lgpl2.1+))) +(define-public python-ppmd-cffi + (package + (name "python-ppmd-cffi") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ppmd-cffi" version)) + (sha256 + (base32 + "01wcd9l6pp6hivdmd275qh9dhcwficjqfl67hxix5n07vvq7jzz0")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cffi" ,python-cffi))) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm/next) + ("python-pep517" ,python-pep517) + ("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://github.com/miurahr/ppmd") + (synopsis "Prediction by Partial Matching compression library") + (description "PPMd is a compression algorithm library using the Prediction +by Partial Matching statistical technique. It is used in RAR and 7-Zip as one of +several possible methods.") + (license license:lgpl2.1+))) + (define-public python-lzo (package (name "python-lzo") -- cgit v1.2.3 From 852f9324857c616da7d74a9aede83016e9082fc0 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 10 Mar 2021 18:33:12 +1100 Subject: gnu: python-zstandard: Update to 0.15.2. * gnu/packages/python-compression.scm (python-zstandard): Update to 0.15.2. --- gnu/packages/python-compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 884f55e213..f87eacc853 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -347,13 +347,13 @@ wrapper. It provides a backport of the @code{Path} object.") (define-public python-zstandard (package (name "python-zstandard") - (version "0.13.0") + (version "0.15.2") (source (origin (method url-fetch) (uri (pypi-uri "zstandard" version)) (sha256 - (base32 "0q9msi00s93iqm8vzd839r7yc51gz54z90h5bckqyjdxa6vxijz5")))) + (base32 "0by9z7nxnkzhmza075q6q91rs8lnpf91129k8ppv7kymbwshipjj")))) (build-system python-build-system) (native-inputs `(("python-hypothesis" ,python-hypothesis))) -- cgit v1.2.3 From dde1c7655d697a12ef18792ae732f51cdd9de32a Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 10 Mar 2021 18:32:25 +1100 Subject: gnu: Add python-pyzstd * gnu/packages/python-compression.scm (python-pyzstd): New variable. --- gnu/packages/python-compression.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index f87eacc853..ab2eca2743 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -363,3 +363,21 @@ wrapper. It provides a backport of the @code{Path} object.") the Zstandard compression library. A C extension and CFFI interface are provided.") (license license:bsd-3))) + +(define-public python-pyzstd + (package + (name "python-pyzstd") + (version "0.14.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyzstd" version)) + (sha256 + (base32 + "1d3mngs45w2p490vrq5ymd2wz4lp15phmks1ilcx4k7amgibml3d")))) + (build-system python-build-system) + (home-page "https://github.com/animalize/pyzstd") + (synopsis "Zstandard bindings for Python") + (description "This package provides Python bindings to the Zstandard (zstd) +compression library. The API is similar to Python's bz2/lzma/zlib module.") + (license license:bsd-3))) -- cgit v1.2.3 From eacfed8b0806e857396e6095825cceedb7c3d5ba Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 10 Mar 2021 18:30:54 +1100 Subject: gnu: Add python-bcj-cffi. * gnu/packages/python-compression.scm (python-bcj-cffi): New variable. --- gnu/packages/python-compression.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index ab2eca2743..bed965f48e 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx)) @@ -69,6 +70,33 @@ file-object abstraction, making it possible to use multiple files as if they were a single file.") (license license:lgpl2.1+))) +(define-public python-bcj-cffi + (package + (name "python-bcj-cffi") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bcj-cffi" version)) + (sha256 + (base32 + "1jcczrb8zgg6w7v76w1wpz3nw75fghk3xwxkn09ll7kck7sdf68d")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cffi" ,python-cffi) + ("python-toml" ,python-toml) + ("python-setuptools-scm" ,python-setuptools-scm/next))) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://github.com/miurahr/bcj-cffi") + (synopsis "Branch / Call /Jump CFFI library in Python") + (description "This package provides an implementation of the Branch / Call / +Jump conversion filter by CFFI for Python.") + (license license:lgpl2.1+))) + (define-public python-ppmd-cffi (package (name "python-ppmd-cffi") -- cgit v1.2.3 From 875c2ece92536812e827a3ed51fe0aa49c7577f4 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 25 Feb 2021 14:02:23 +1100 Subject: gnu: Add python-py7zr. * gnu/packages/python-compression.scm (python-py7zr): New variable. --- gnu/packages/python-compression.scm | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index bed965f48e..30062f43c5 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx)) @@ -125,6 +126,46 @@ by Partial Matching statistical technique. It is used in RAR and 7-Zip as one o several possible methods.") (license license:lgpl2.1+))) +(define-public python-py7zr + (package + (name "python-py7zr") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "py7zr" version)) + (sha256 + (base32 + "1zmgp7yax328fj8yj8pj4l7yh78hp727j6wk12vfi6nmi82wl32i")))) + (build-system python-build-system) + (propagated-inputs + `(("python-bcj-cffi" ,python-bcj-cffi) + ("python-multivolumefile" ,python-multivolumefile) + ("python-ppmd-cffi" ,python-ppmd-cffi) + ("python-pycryptodome" ,python-pycryptodome) + ("python-pyzstd" ,python-pyzstd) + ("python-texttable" ,python-texttable) + ("python-zstandard" ,python-zstandard))) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm/next) + ("python-coverage" ,python-coverage) + ("python-coveralls" ,python-coveralls) + ("python-libarchive-c" ,python-libarchive-c) + ("python-py-cpuinfo" ,python-py-cpuinfo) + ("python-pyannotate" ,python-pyannotate) + ("python-pytest" ,python-pytest) + ("python-pytest-benchmark" ,python-pytest-benchmark) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-remotedata" ,python-pytest-remotedata) + ("python-pytest-timeout" ,python-pytest-timeout))) + (home-page "https://github.com/miurahr/py7zr") + (synopsis "7-zip in Python") + (description "This package provides py7zr, which implements 7-zip +archive compression, decompression, encryption and decryption in +Python.") + (license license:lgpl2.1+))) + (define-public python-lzo (package (name "python-lzo") -- cgit v1.2.3 From ac50f6d20d0901d34f00e5898c107b631bf952a0 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 25 Feb 2021 17:44:14 +1100 Subject: gnu: python-markdown: Update to 3.3.4. * gnu/packages/python-xyz.scm (python-markdown): Update to 3.3.4. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 721171a4fb..6cc469c163 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8971,14 +8971,14 @@ Python.") (define-public python-markdown (package (name "python-markdown") - (version "3.2.1") + (version "3.3.4") (source (origin (method url-fetch) (uri (pypi-uri "Markdown" version)) (sha256 (base32 - "00k91gwhxnm8jdnm2v5xjz9irj6dbi7afywz2hpakqdbxs1ydzlh")))) + "0jbs73nincha8fkfxx267sfxac6pl0ckszjbqbb8gk4dhs8v9d9i")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) -- cgit v1.2.3 From 506eb97de7041f6bcb6e841201c01e88bedfc9d9 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 25 Feb 2021 20:47:02 +1100 Subject: gnu: python-feedparser: Update to 6.0.2. * gnu/packages/web.scm (python-feedparser): Update to 6.0.2. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8585de364d..fe024228f3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4684,14 +4684,14 @@ their web site.") (define-public python-feedparser (package (name "python-feedparser") - (version "5.2.1") + (version "6.0.2") (source (origin (method url-fetch) - (uri (pypi-uri "feedparser" version ".tar.bz2")) + (uri (pypi-uri "feedparser" version ".tar.gz")) (sha256 (base32 - "00hb4qg2am06g81mygfi1jsbx8830024jm45g6qp9g8fr6am91yf")))) + "0x0hm9brh3j71645pydvlkrwxaaca9dnwd7xahwjyjaz882s200v")))) (build-system python-build-system) (arguments '(#:tests? #f)) -- cgit v1.2.3 From 9042a304165b3b045ffe8e5f4b7e0bd4f311457d Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 27 Feb 2021 14:50:51 +1100 Subject: gnu: Add python-pychm. * gnu/packages/ebook.scm (python-pychm): New variable. --- gnu/packages/ebook.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index dfc3d9f2e6..5853ad0652 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -88,6 +88,26 @@ (description "CHMLIB is a library for dealing with ITSS/CHM format files.") (license license:lgpl2.1+))) +(define-public python-pychm + (package + (name "python-pychm") + (version "0.8.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pychm" version)) + (sha256 + (base32 + "0wpn9ijlsmrpyiwg3drmgz4dms1i1i347adgqw37bkrh3vn6yq16")))) + (build-system python-build-system) + (inputs + `(("chmlib" ,chmlib))) + (home-page "https://github.com/dottedmag/pychm") + (synopsis "Handle CHM files") + (description "This package provides a Python module for interacting +with Microsoft Compiled HTML (CHM) files") + (license license:gpl2+))) + (define-public calibre (package (name "calibre") -- cgit v1.2.3 From 141e74a83078e1c27ed9b1b7f24783aabf846bca Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 27 Feb 2021 19:49:20 +1100 Subject: gnu: Add python-cchardet. * gnu/packages/freedesktop.scm (python-cchardet): New variable. --- gnu/packages/freedesktop.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a9e96c9928..40d41350ac 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Anders Thuné ;;; Copyright © 2020 Raghav Gururajan +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1920,6 +1921,26 @@ encoding names are iconv-compatible.") ;; combination is GPL 2.0+. (license license:gpl2+))) +(define-public python-cchardet + (package + (name "python-cchardet") + (version "2.1.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cchardet" version)) + (sha256 + (base32 + "1bqfz85cd51sw0bvhvdq9ikccxi2ld7g5jpni4jkq1a5clrvca64")))) + (build-system python-build-system) + (inputs + `(("uchardet" ,uchardet))) + (home-page "https://github.com/PyYoshi/cChardet") + (synopsis "High-performance character encoding detection for Python") + (description "cChardet is a character encoding detector, written in +Python, that binds to the C library @code{uchardet} to increase performance.") + (license license:gpl2+))) + (define-public udiskie (package (name "udiskie") -- cgit v1.2.3 From 065f2cceb7090e209a7f2c88a4f5385048dbdccf Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 27 Feb 2021 23:06:09 +1100 Subject: gnu: python-html5lib: Depend on python-chardet. * gnu/packages/python-web.scm (python-html5lib)[propagated-inputs]: Add python-chardet. --- gnu/packages/python-web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c7dd18ad19..c79fa1bfc4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1102,7 +1102,9 @@ storage.") (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) - ("python-webencodings" ,python-webencodings))) + ("python-webencodings" ,python-webencodings) + ;; Required by Calibre 5. + ("python-chardet" ,python-chardet))) (arguments `(#:test-target "check")) (home-page -- cgit v1.2.3 From 5d53eec337fb410d1d1c0b89ce3dd29a8edf9e49 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 27 Feb 2021 23:04:01 +1100 Subject: gnu: calibre: Update to 5.14.0. * gnu/packages/ebook.scm (calibre): Update to 5.14.0. [source]: Adjust the snippet to preserve some files used by the HTML reader. [native-inputs]: Add python-pyqt-builder. Replace python2-flake8 with python-flake8. [inputs]: Remove chmlib, js-mathjax, python-chardet, and python-sip. Add python-cchardet, python-speechd, python-zeroconf, python-py7zr, python-pychm, python-pycryptodome, libjpeg, and libjxr. Replace all Python 2 dependencies with their Python 3 equivalents. [arguments]: Build with the default Python and adjust custom phases accordingly. Adjust the 'configure' phase to changes in how Calibre uses SIP, and patch lookup paths for libjpeg and libjxr. Rename the 'build-extra' phase to 'install-rapydscript', and run it after the 'install' phase. Adjust it for Calibre 5.14.0. * gnu/packages/patches/calibre-no-updates-dialog.patch, gnu/packages/patches/calibre-remove-test-sqlite.patch, gnu/packages/patches/calibre-remove-test-unrar.patch: Adjust patches for Calibre 5.14.0. --- gnu/packages/ebook.scm | 117 +++++++++++---------- .../patches/calibre-no-updates-dialog.patch | 22 ++-- .../patches/calibre-remove-test-sqlite.patch | 21 ++-- .../patches/calibre-remove-test-unrar.patch | 24 ++--- 4 files changed, 100 insertions(+), 84 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 5853ad0652..504171ca8b 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin -;;; Copyright © 2017, 2019, 2020 Brendan Tildesley +;;; Copyright © 2017, 2019, 2020, 2021 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke @@ -58,10 +58,14 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-compression) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) + #:use-module (gnu packages speech) #:use-module (gnu packages sqlite) #:use-module (gnu packages time) #:use-module (gnu packages tls) @@ -111,7 +115,7 @@ with Microsoft Compiled HTML (CHM) files") (define-public calibre (package (name "calibre") - (version "4.18.0") + (version "5.14.0") (source (origin (method url-fetch) @@ -120,7 +124,7 @@ with Microsoft Compiled HTML (CHM) files") version ".tar.xz")) (sha256 (base32 - "0w9pcfvskjh4v00vjw3i6hzrafy863pgsmmqdx4lffip3p856brw")) + "0w8j9r9qa56r8gm9b10dwh8zrzqlv79s2br82jqg02lrnrbwwv0q")) (modules '((guix build utils))) (snippet '(begin @@ -132,8 +136,6 @@ with Microsoft Compiled HTML (CHM) files") "")) ;; Remove unneeded resources. - (delete-file "resources/viewer.js") - (delete-file "resources/viewer.html") (delete-file "resources/mozilla-ca-certs.pem") (delete-file "resources/calibre-portable.bat") (delete-file "resources/calibre-portable.sh") @@ -145,57 +147,60 @@ with Microsoft Compiled HTML (CHM) files") (native-inputs `(("pkg-config" ,pkg-config) ("qtbase" ,qtbase) ; for qmake - ("python2-flake8" ,python2-flake8) + ("python-flake8" ,python-flake8) + ("python-pyqt-builder" ,python-pyqt-builder) ("xdg-utils" ,xdg-utils))) (inputs - `(("chmlib" ,chmlib) - ("fontconfig" ,fontconfig) + `(("fontconfig" ,fontconfig) ("font-liberation" ,font-liberation) ("glib" ,glib) ("hunspell" ,hunspell) ("hyphen" ,hyphen) ("icu4c" ,icu4c) - ("js-mathjax" ,js-mathjax) ("libmtp" ,libmtp) ("libpng" ,libpng) + ("libjpeg" ,libjpeg-turbo) + ("libjxr" ,libjxr) ("libusb" ,libusb) ("openssl" ,openssl) ("optipng" ,optipng) ("podofo" ,podofo) ("poppler" ,poppler) - ("python" ,python-2) - ("python2-apsw" ,python2-apsw) - ("python2-beautifulsoup4" ,python2-beautifulsoup4) - ("python2-chardet" ,python2-chardet) - ("python2-cssselect" ,python2-cssselect) - ("python2-css-parser" ,python2-css-parser) - ("python2-dateutil" ,python2-dateutil) - ("python2-dbus" ,python2-dbus) - ("python2-dnspython" ,python2-dnspython-1.16) - ("python2-dukpy" ,python2-dukpy) - ("python2-feedparser" ,python2-feedparser) - ("python2-html2text" ,python2-html2text) - ("python2-html5-parser" ,python2-html5-parser) - ("python2-html5lib" ,python2-html5lib) - ("python2-lxml" ,python2-lxml) - ("python2-markdown" ,python2-markdown) - ("python2-mechanize" ,python2-mechanize) - ;; python2-msgpack is needed for the network content server to work. - ("python2-msgpack" ,python2-msgpack) - ("python2-netifaces" ,python2-netifaces) - ("python2-odfpy" ,python2-odfpy) - ("python2-pillow" ,python2-pillow) - ("python2-psutil" ,python2-psutil) - ("python2-pygments" ,python2-pygments) - ("python2-pyqtwebengine" ,python2-pyqtwebengine) - ("python2-pyqt" ,python2-pyqt) - ("python2-sip" ,python2-sip) - ("python2-regex" ,python2-regex) + ("python-apsw" ,python-apsw) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-cchardet" ,python-cchardet) + ("python-css-parser" ,python-css-parser) + ("python-cssselect" ,python-cssselect) + ("python-dateutil" ,python-dateutil) + ("python-dbus" ,python-dbus) + ("python-dnspython" ,python-dnspython-1.16) + ("python-dukpy" ,python-dukpy) + ("python-feedparser" ,python-feedparser) + ("python-html2text" ,python-html2text) + ("python-html5-parser" ,python-html5-parser) + ("python-html5lib" ,python-html5lib) + ("python-lxml" ,python-lxml) + ("python-markdown" ,python-markdown) + ("python-mechanize" ,python-mechanize) + ;; python-msgpack is needed for the network content server to work. + ("python-msgpack" ,python-msgpack) + ("python-netifaces" ,python-netifaces) + ("python-odfpy" ,python-odfpy) + ("python-pillow" ,python-pillow) + ("python-psutil" ,python-psutil) + ("python-py7zr" ,python-py7zr) + ("python-pychm" ,python-pychm) + ("python-pycryptodome" ,python-pycryptodome) + ("python-pygments" ,python-pygments) + ("python-pyqt" ,python-pyqt) + ("python-pyqtwebengine" ,python-pyqtwebengine) + ("python-regex" ,python-regex) + ("python-speechd" ,speech-dispatcher) + ("python-zeroconf" ,python-zeroconf) ("qtwebengine" ,qtwebengine) ("sqlite" ,sqlite))) (arguments - `(#:python ,python-2 - ;; Calibre is using setuptools by itself, but the setup.py is not + `(;; Calibre is using setuptools by itself, but the setup.py is not ;; compatible with the shim wrapper (taken from pip) we are using. #:use-setuptools? #f #:phases @@ -227,18 +232,27 @@ with Microsoft Compiled HTML (CHM) files") (add-before 'build 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((podofo (assoc-ref inputs "podofo")) - (pyqt (assoc-ref inputs "python2-pyqt")) - (python-sip (assoc-ref inputs "python2-sip")) + (pyqt (assoc-ref inputs "python-pyqt")) + (python-sip (assoc-ref inputs "python-sip")) (out (assoc-ref outputs "out"))) - (substitute* "setup/build_environment.py" - (("= get_sip_dir\\(\\)") - (string-append "= '" pyqt "/share/sip'"))) - + (substitute* "setup/build.py" + (("\\[tool.sip.bindings.pictureflow\\]") + "[tool.sip.bindings.pictureflow] +tags = [\"WS_X11\"]") + (("\\[tool.sip.project\\]") + (string-append "[tool.sip.project] +sip-include-dirs = [\"" pyqt "/share/sip" "\"]"))) (substitute* "src/calibre/ebooks/pdf/pdftohtml.py" (("PDFTOHTML = 'pdftohtml'") (string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler") "/bin/pdftohtml\""))) - + ;; get_exe_path looks in poppler's output for these binaries. Make + ;; it not do that. + (substitute* "src/calibre/utils/img.py" + (("get_exe_path..jpegtran..") (string-append "'" (which "jpegtran") "'")) + (("get_exe_path..cjpeg..") (string-append "'" (which "cjpeg") "'")) + (("get_exe_path..optipng..") (string-append "'" (which "optipng") "'")) + (("get_exe_path..JxrDecApp..") (string-append "'" (which "JxrDecApp") "'"))) ;; Calibre thinks we are installing desktop files into a home ;; directory, but here we butcher the script in to installing ;; to calibres /share directory. @@ -257,7 +271,6 @@ with Microsoft Compiled HTML (CHM) files") "/share/fonts") "/tmp/.fonts") - (setenv "SIP_BIN" (string-append python-sip "/bin/sip")) (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) ;; This informs the tests we are a continuous integration @@ -268,13 +281,11 @@ with Microsoft Compiled HTML (CHM) files") ;; fix it, so I'm not sure how to fix it. TODO: Fix test and remove this. (setenv "SKIP_QT_BUILD_TEST" "true") #t))) - (add-after 'build 'build-extra + (add-after 'install 'install-rapydscript (lambda* (#:key inputs #:allow-other-keys) - (invoke "python2" "setup.py" "mathjax""--system-mathjax" - "--path-to-mathjax" (string-append - (assoc-ref inputs "js-mathjax") - "/share/javascript/mathjax")) - (invoke "python2" "setup.py" "rapydscript") + ;; Unset so QtWebengine doesn't dump temporary files here. + (unsetenv "XDG_DATA_HOME") + (invoke "python" "setup.py" "rapydscript") #t)) (add-after 'install 'install-man-pages (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/patches/calibre-no-updates-dialog.patch b/gnu/packages/patches/calibre-no-updates-dialog.patch index 1d8d79660e..66ac913cb5 100644 --- a/gnu/packages/patches/calibre-no-updates-dialog.patch +++ b/gnu/packages/patches/calibre-no-updates-dialog.patch @@ -1,11 +1,17 @@ -Taken from debian. +From 19e8d7701c302b0eca4c638705a6db625352caa3 Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley +Date: Thu, 25 Feb 2021 12:17:30 +1100 +Subject: [PATCH] Don't check for updates. -# Description: Disable update check by default. -Index: calibre/src/calibre/gui2/main.py -=================================================================== ---- calibre.orig/src/calibre/gui2/main.py 2014-02-02 10:41:28.470954623 +0100 -+++ calibre/src/calibre/gui2/main.py 2014-02-02 10:41:56.546954247 +0100 -@@ -37,8 +37,8 @@ +--- + src/calibre/gui2/main.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py +index 776f8bebfb..4302716d7e 100644 +--- a/src/calibre/gui2/main.py ++++ b/src/calibre/gui2/main.py +@@ -59,8 +59,8 @@ def option_parser(): help=_('Start minimized to system tray.')) parser.add_option('-v', '--verbose', default=0, action='count', help=_('Ignored, do not use. Present only for legacy reasons')) @@ -16,3 +22,5 @@ Index: calibre/src/calibre/gui2/main.py parser.add_option('--ignore-plugins', default=False, action='store_true', help=_('Ignore custom plugins, useful if you installed a plugin' ' that is preventing calibre from starting')) +-- +2.30.1 diff --git a/gnu/packages/patches/calibre-remove-test-sqlite.patch b/gnu/packages/patches/calibre-remove-test-sqlite.patch index 7bdd90874d..fc2b237ef2 100644 --- a/gnu/packages/patches/calibre-remove-test-sqlite.patch +++ b/gnu/packages/patches/calibre-remove-test-sqlite.patch @@ -1,20 +1,20 @@ -From a92e26359bd07743ab105819ed0b619e27e14017 Mon Sep 17 00:00:00 2001 +From d8225e83c3b73f0e0da73874910f50ca652f48cf Mon Sep 17 00:00:00 2001 From: Brendan Tildesley -Date: Sat, 27 Apr 2019 03:30:53 +1000 -Subject: [PATCH] Disable test_sqlite. +Date: Thu, 25 Feb 2021 00:48:00 +1100 +Subject: [PATCH] Remove test_sqlite --- src/calibre/test_build.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py -index 07bdffd3e5..740588c95b 100644 +index 0ab7aa0646..87fdfabd9a 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py -@@ -162,12 +162,6 @@ class BuildTest(unittest.TestCase): - au(x, 'strftime') - self.assertEqual(unicode_type(time.strftime(fmt.replace('%e', '%#d'), t)), x) - +@@ -273,12 +273,6 @@ def read_changes(): + m.close() + self.assertEqual(winutil.parse_cmdline('"c:\\test exe.exe" "some arg" 2'), ('c:\\test exe.exe', 'some arg', '2')) + - def test_sqlite(self): - import sqlite3 - conn = sqlite3.connect(':memory:') @@ -24,6 +24,5 @@ index 07bdffd3e5..740588c95b 100644 def test_apsw(self): import apsw conn = apsw.Connection(':memory:') --- -2.21.0 - +-- +2.30.1 diff --git a/gnu/packages/patches/calibre-remove-test-unrar.patch b/gnu/packages/patches/calibre-remove-test-unrar.patch index 4e5572d1a6..961cc3eba7 100644 --- a/gnu/packages/patches/calibre-remove-test-unrar.patch +++ b/gnu/packages/patches/calibre-remove-test-unrar.patch @@ -1,28 +1,26 @@ -Unrar contains security vulnerabilities and has thus been removed from Guix. -From a16f97b02bd8afd0ec05c471e156f631f2cc6eec Mon Sep 17 00:00:00 2001 +From 9edf67191cc3655480b6fd418247709ade930b1a Mon Sep 17 00:00:00 2001 From: Brendan Tildesley -Date: Tue, 26 Mar 2019 22:17:03 +1100 -Subject: [PATCH] Remove test_unrar. +Date: Thu, 25 Feb 2021 00:33:10 +1100 +Subject: [PATCH] Remove test_unrar --- src/calibre/test_build.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py -index d67afd20a6..709132ef17 100644 +index b37fb1bcfb..0ab7aa0646 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py -@@ -220,10 +220,6 @@ class BuildTest(unittest.TestCase): +@@ -369,10 +369,6 @@ def test_file_dialog_helper(self): from calibre.gui2.win_file_dialogs import test test() - + - def test_unrar(self): - from calibre.utils.unrar import test_basic - test_basic() - - @unittest.skipUnless(iswindows, 'WPD is windows only') - def test_wpd(self): - wpd = plugins['wpd'][0] --- -2.21.0 - + def test_7z(self): + from calibre.utils.seven_zip import test_basic + test_basic() +-- +2.30.1 -- cgit v1.2.3 From 701c0a79048defa6ab57fc9dadbc2c59567e9aae Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 10 Mar 2021 19:20:23 +1100 Subject: gnu: Remove python2-pyqtwebengine. * gnu/packages/qt.scm (python2-pyqtwebengine): Remove variable. --- gnu/packages/qt.scm | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 530fcf1039..b05bb698d4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2108,25 +2108,6 @@ itself.") ("python2-enum34" ,python2-enum34) ,@(alist-delete "python" (package-inputs python-pyqt)))))) -(define-public python2-pyqtwebengine - (package/inherit - python-pyqtwebengine - (name "python2-pyqtwebengine") - (native-inputs - `(("python" ,python-2) - ("python-sip" ,python2-sip) - ;; qtbase is required for qmake - ("qtbase" ,qtbase))) - (inputs - `(("python" ,python-2) - ("python-sip" ,python2-sip) - ("python-pyqt" ,python2-pyqt) - ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg) - ("qtdeclarative" ,qtdeclarative) - ("qtwebchannel" ,qtwebchannel) - ("qtwebengine" ,qtwebengine))))) - (define-public python-pyqt-builder (package (name "python-pyqt-builder") -- cgit v1.2.3 From c94792059014e6193ab532cca3044bfa033f9955 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 10 Mar 2021 19:21:39 +1100 Subject: gnu: Remove python2-pyqt. * gnu/packages/qt.scm (python2-pyqt): Remove variable. --- gnu/packages/qt.scm | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b05bb698d4..21cd8773c6 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2094,20 +2094,6 @@ itself.") (inputs (alist-delete "qtwebkit" (package-inputs python-pyqt))))) -(define-public python2-pyqt - (package/inherit python-pyqt - (name "python2-pyqt") - (propagated-inputs - `(("python-enum34" ,python2-enum34) - ("python-sip" ,python2-sip))) - (native-inputs - `(("python-sip" ,python2-sip) - ("qtbase" ,qtbase))) - (inputs - `(("python" ,python-2) - ("python2-enum34" ,python2-enum34) - ,@(alist-delete "python" (package-inputs python-pyqt)))))) - (define-public python-pyqt-builder (package (name "python-pyqt-builder") -- cgit v1.2.3 From f68bcc1bc3aa0a8d1829e2eb5d9ef256c817c17c Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 8 Apr 2021 21:12:24 +1000 Subject: gnu: python2-sip: Remove package. * gnu/packages/qt.scm (python2-sip): Delete variable. --- gnu/packages/qt.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 21cd8773c6..fb1a3b598e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1884,12 +1884,6 @@ module provides support functions to the automatically generated code.") "--incdir" include))))))) (license license:gpl3))) -(define-public python2-sip - (package/inherit python-sip-4 - (name "python2-sip") - (native-inputs - `(("python" ,python-2))))) - (define-public python-pyqt (package (name "python-pyqt") -- cgit v1.2.3 From fba9e5fb54b7eaff8d8cdc1163dac4ea7d0f8e89 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Apr 2021 00:33:06 -0400 Subject: gnu: Fix build of python2-feedparser. This is a followup to commit 506eb97de7041f6bcb6e841201c01e88bedfc9d9. Feedparser dropped support for Python 2 in version 6.0.0. The latest release that works with Python 2 is 5.2.1. * gnu/packages/web.scm (python2-feedparser): Revert back to version 5.2.1. --- gnu/packages/web.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fe024228f3..bb5196b9f2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4705,7 +4705,28 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") license:freebsd-doc)))) ; documentation (define-public python2-feedparser - (package-with-python2 python-feedparser)) + (package + (name "python2-feedparser") + (version "5.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "feedparser" version ".tar.bz2")) + (sha256 + (base32 + "00hb4qg2am06g81mygfi1jsbx8830024jm45g6qp9g8fr6am91yf")))) + (build-system python-build-system) + (arguments + `(#:tests? #f + #:python ,python-2)) + (home-page + "https://github.com/kurtmckee/feedparser") + (synopsis "Parse feeds in Python") + (description + "Universal feed parser which handles RSS 0.9x, RSS 1.0, RSS 2.0, +CDF, Atom 0.3, and Atom 1.0 feeds.") + (license (list license:bsd-2 ; source code + license:freebsd-doc)))) ; documentation (define-public guix-data-service (let ((commit "df2a0a73f1f35ea53ba6c07a6ad4c5347ba12b8f") -- cgit v1.2.3 From 59134f1e02dbde6d82e6204b51ca49347b8037d9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 9 Apr 2021 23:20:18 -0400 Subject: gnu: jami-qt: Remove the custom wrap phase. Commit 06eb21856f made it necessary, since it is now handled by the Qt build system itself. * gnu/packages/jami.scm (jami-qt)[phases]{wrap}: Remove phase. --- gnu/packages/jami.scm | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 42b15cee9b..0adc3ed81e 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -585,25 +585,13 @@ decentralized calling using P2P-DHT.") (outputs '("out" "debug")) (arguments `(#:tests? #f ;no test suite - #:phases - (modify-phases %standard-phases - ;; TODO: Uncomment after switching back to the tarball source. - ;; (add-after 'unpack 'change-directory - ;; (lambda _ - ;; (chdir "client-qt"))) - (add-after 'install 'wrap - ;; The program fails to find the QtWebEngineProcess program, so we - ;; set QTWEBENGINEPROCESS_PATH to help it. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin")) - (qtwebengineprocess (string-append - (assoc-ref inputs "qtwebengine") - "/lib/qt5/libexec/QtWebEngineProcess"))) - (for-each (lambda (program) - (wrap-program program - `("QTWEBENGINEPROCESS_PATH" = - (,qtwebengineprocess)))) - (find-files bin ".*")))))))) + ;; TODO: Uncomment after switching back to the tarball source. + ;; #:phases + ;; (modify-phases %standard-phases + ;; (add-after 'unpack 'change-directory + ;; (lambda _ + ;; (chdir "client-qt")))) + )) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools) -- cgit v1.2.3 From 5b49626bc2ec39316dd4a0ff2aff5b9158294fa0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 10 Apr 2021 11:46:12 +0200 Subject: gnu: Add airspyhf. * gnu/packages/radio.scm (airspyhf): New variable. --- gnu/packages/radio.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index afe93081b3..4c1ecbfe66 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -172,6 +172,46 @@ To install the rtl-sdr udev rules, you must extend 'udev-service-type' with this package. E.g.: @code{(udev-rules-service 'rtl-sdr rtl-sdr)}") (license license:gpl2+))) +(define-public airspyhf + (package + (name "airspyhf") + (version "1.6.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/airspy/airspyhf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0n699i5a9fzzhf80fcjlqq6p2a013rzlwmwv4nmwfafy6c8cr924")))) + (build-system cmake-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libusb" ,libusb))) + (arguments + '(#:configure-flags '("-DINSTALL_UDEV_RULES=ON") + #:tests? #f ; No tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "tools/CMakeLists.txt" + (("DESTINATION \"/etc/udev/") + (string-append "DESTINATION \"" + (assoc-ref outputs "out") + "/lib/udev/")))))))) + (home-page "https://github.com/airspy/airspyhf") + (synopsis "Software defined radio driver for Airspy HF+") + (description + "This package provides the driver and utilities for controlling the Airspy +HF+ Software Defined Radio (SDR) over USB. + +To install the airspyhf udev rules, you must extend @code{udev-service-type} +with this package. E.g.: @code{(udev-rules-service 'airspyhf airspyhf)}") + (license license:bsd-3))) + (define-public chirp (package (name "chirp") -- cgit v1.2.3 From 1d568a459832a02995c4ba7be32107949b3b6fc0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 10 Apr 2021 11:50:54 +0200 Subject: gnu: gnuradio-osmosdr: Add Airspy HF+ support. * gnu/packages/radio.scm (gnuradio-osmosdr)[inputs]: Add airspyhf. --- gnu/packages/radio.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 4c1ecbfe66..0e67bf2658 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -506,7 +506,8 @@ environment.") ("python-mako" ,python-mako) ("python-six" ,python-six))) (inputs - `(("boost" ,boost) + `(("airspyhf" ,airspyhf) + ("boost" ,boost) ("fftwf" ,fftwf) ("gmp" ,gmp) ("gnuradio" ,gnuradio) -- cgit v1.2.3 From 5eded9b52dc4e92c652364cf359d022812817505 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 10 Apr 2021 13:33:53 +0200 Subject: gnu: airspyhf: Fix udev rules. * gnu/packages/radio.scm (airspyhf)[arguments]: Add 'fix-udev-rules' phase. --- gnu/packages/radio.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 0e67bf2658..e6d5ef0203 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -201,7 +201,14 @@ this package. E.g.: @code{(udev-rules-service 'rtl-sdr rtl-sdr)}") (("DESTINATION \"/etc/udev/") (string-append "DESTINATION \"" (assoc-ref outputs "out") - "/lib/udev/")))))))) + "/lib/udev/"))))) + (add-after 'fix-paths 'fix-udev-rules + (lambda _ + (substitute* "tools/52-airspyhf.rules" + ;; The plugdev group does not exist; use dialout as in + ;; the hackrf package. + (("GROUP=\"plugdev\"") + "GROUP=\"dialout\""))))))) (home-page "https://github.com/airspy/airspyhf") (synopsis "Software defined radio driver for Airspy HF+") (description -- cgit v1.2.3 From fef8bc470cf4f6b20baf12f2697e0d8d726cb559 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:31:24 +0200 Subject: gnu: erfa: Update to 1.7.3. * gnu/packages/astronomy.scm (erfa): Update to 1.7.3. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 6cbd5f1bf6..c9ef6643a1 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -118,7 +118,7 @@ for reading and writing.") (define-public erfa (package (name "erfa") - (version "1.7.2") + (version "1.7.3") (source (origin (method git-fetch) @@ -127,7 +127,7 @@ for reading and writing.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vsqwvzlk7r8q7nwyb7i710blcfdl5kwcm2va9km07a820nsp84a")))) + (base32 "0nh12dr7gk4ki55lz95pkm4fpf7kazirra3zax9pab6v4qql4hlw")))) (build-system gnu-build-system) (native-inputs `(("automake" ,automake) -- cgit v1.2.3 From 4869a509d1fde60562e00d568f33a6a40fcffa13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:31:56 +0200 Subject: gnu: erfa: Mark up description. * gnu/packages/astronomy.scm (erfa)[description]: Add all the @acronym{}s. --- gnu/packages/astronomy.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c9ef6643a1..9efb12dc01 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -137,8 +137,10 @@ for reading and writing.") (home-page "https://github.com/liberfa/erfa") (synopsis "Essential Routines for Fundamental Astronomy") (description - "ERFA is a C library containing key algorithms for astronomy, and is based -on the SOFA library published by the International Astronomical Union (IAU).") + "The @acronym{ERFA, Essential Routines for Fundamental Astronomy} C library +contains key algorithms for astronomy, and is based on the @acronym{SOFA, +Standards of Fundamental Astronomy} library published by the @acronym{IAU, +International Astronomical Union}.") (license license:bsd-3))) (define-public eye -- cgit v1.2.3 From a7e5d956974b6e4c65c46e728524deba7c6192b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:46:51 +0200 Subject: gnu: davfs2: Fix typo in description. * gnu/packages/file-systems.scm (davfs2)[description]: Fix typo. --- gnu/packages/file-systems.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index d7c34cd188..3296ca6e38 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -251,9 +251,9 @@ another location, similar to @command{mount --bind}. It can be used for: (description "The @acronym{WebDAV, Web Distributed Authoring and Versioning} extension to the HTTP protocol defines a standard way to author resources on a remote Web -server. Davfs2 exposes such resources as a typical filesystem which can be used -by standard applications with no built-in support for WebDAV, such as the GNU -coreutils (@command{cp}, @command{mv}, etc.) or a graphical word processor. +server. Davfs2 exposes such resources as a typical file system which can be +used by standard applications with no built-in support for WebDAV, such as the +GNU coreutils (@command{cp}, @command{mv}, etc.) or a graphical word processor. Davfs2 works with most WebDAV servers with no or little configuration. It supports TLS (HTTPS), HTTP proxies, HTTP basic and digest authentication, and -- cgit v1.2.3 From d2f2c09d273a25e99437305537f254a048281464 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:47:14 +0200 Subject: services: git-daemon: Fix typo in docstring. * gnu/services/version-control.scm (git-daemon-service): Fix docstring typo. --- gnu/services/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index f3df0b979f..8cb5633165 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -163,7 +163,7 @@ protocol.") (define* (git-daemon-service #:key (config (git-daemon-configuration))) "Return a service that runs @command{git daemon}, a simple TCP server to -expose repositories over the Git protocol for annoymous access. +expose repositories over the Git protocol for anonymous access. The optional @var{config} argument should be a @code{} object, by default it allows read-only -- cgit v1.2.3 From 173a631da0324d8a837ef4355a5e1a9673def837 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:47:28 +0200 Subject: tests: nfs: Fix typo in description. * gnu/tests/nfs.scm (%test-nfs-root-fs)[description]: Fix typo. --- gnu/tests/nfs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 5d04af38fb..9b2b785176 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -410,5 +410,5 @@ directories can be mounted.") (system-test (name "nfs-root-fs") (description "Test that an NFS server can be started and the exported -directory can be used as root filesystem.") +directory can be used as root file system.") (value (run-nfs-root-fs-test)))) -- cgit v1.2.3 From dd4027e84c0b0165ac5fdc3c8191b8b302958a45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:47:41 +0200 Subject: gnu: tmsu: Fix typo in synopsis & description. * gnu/packages/file-systems.scm (tmsu)[synopsis, description]: Fix typo. --- gnu/packages/file-systems.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 3296ca6e38..0e27cdd2fd 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1195,10 +1195,10 @@ local file system using FUSE.") `(("go-github-com-mattn-go-sqlite3" ,go-github-com-mattn-go-sqlite3) ("go-github-com-hanwen-fuse" ,go-github-com-hanwen-fuse))) (home-page "https://github.com/oniony/TMSU") - (synopsis "Tag files and access them through a virtual filesystem") + (synopsis "Tag files and access them through a virtual file system") (description "TMSU is a tool for tagging your files. It provides a simple -command-line utility for applying tags and a virtual filesystem to give you a +command-line utility for applying tags and a virtual file system to give you a tag-based view of your files from any other program. TMSU does not alter your files in any way: they remain unchanged on disk, or on the network, wherever your put them. TMSU maintains its own database and you simply gain an -- cgit v1.2.3 From e5852655b86c1a3689a34fb9f20e9374d661b768 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:47:55 +0200 Subject: gnu: sortmerna: Mark up description. * gnu/packages/bioinformatics.scm (sortmerna)[description]: Use @acronym{}. --- gnu/packages/bioinformatics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 908916ebf3..475aa019d0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6799,9 +6799,9 @@ of these reads to align data quickly through a hash-based indexing scheme.") (synopsis "Biological sequence analysis tool for NGS reads") (description "SortMeRNA is a biological sequence analysis tool for filtering, mapping -and operational taxonomic unit (OTU) picking of next generation -sequencing (NGS) reads. The core algorithm is based on approximate seeds and -allows for fast and sensitive analyses of nucleotide sequences. The main +and @acronym{OTU, operational taxonomic unit} picking of @acronym{NGS, next +generation sequencing} reads. The core algorithm is based on approximate seeds +and allows for fast and sensitive analyses of nucleotide sequences. The main application of SortMeRNA is filtering rRNA from metatranscriptomic data.") ;; The source includes x86 specific code (supported-systems '("x86_64-linux" "i686-linux")) -- cgit v1.2.3 From 871012000c3027aa4f163ae989eb71a83399892f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:48:10 +0200 Subject: gnu: camlboot: Fix typo in synopsis. * gnu/packages/ocaml.scm (camlboot)[synopsis]: Fix typo. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0948377d08..44ca0c67e2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -159,7 +159,7 @@ (properties `((max-silent-time . 14400))) ; 4 hours, expected even on x86_64 (home-page "https://github.com/Ekdohibs/camlboot") - (synopsis "OCaml souce bootstrap") + (synopsis "OCaml source bootstrap") (description "OCaml is written in OCaml. Its sources contain a pre-compiled bytecode version of @command{ocamlc} and @command{ocamllex} that are used to build the next version of the compiler. Camlboot implements a bootstrap for -- cgit v1.2.3 From a46174b69cf5d8d6ec82e71fdbe7ce3ccd58d355 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:48:21 +0200 Subject: gnu: rust-filesize: Fix typo in description. * gnu/packages/crates-io.scm (rust-filesize-0.2)[description]: Fix typo. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d2ccc0731..54b208320c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13969,7 +13969,7 @@ supported in purely NFA-based implementations.") (synopsis "Find the physical space used by a file") (description "@code{filesize} abstracts platform-specific methods of determining the -real space used by files, taking into account filesystem compression and +real space used by files, taking into account file system compression and sparse files.") (license license:expat))) -- cgit v1.2.3 From 80a63aefc2f39fd63b9624c0d1cb579c99cdf518 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:48:43 +0200 Subject: gnu: popt: Fix typo in description. * gnu/packages/popt.scm (popt)[description]: Fix typo. --- gnu/packages/popt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index 11d2b1827d..1c325e0c3d 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -91,7 +91,7 @@ similar to getopt(3), it contains a number of enhancements, including: - popt allows users to alias command line arguments; - - popt provides convience functions for parsing strings into argv[] style + - popt provides convenience functions for parsing strings into argv[] style arrays.") (license x11))) -- cgit v1.2.3 From 427401477153ce907b027f9f7f20c55dd00c0729 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:49:01 +0200 Subject: gnu: python-dpath: Fix typo in synopsis & description. * gnu/packages/python-xyz.scm (python-dpath) [synopsis, description]: Fix typo. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6cc469c163..ec8c78b1de 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23582,12 +23582,12 @@ dates in almost any string formats commonly found on web pages.") ;; This invokation is taken from tox.ini. (invoke "nosetests" "-d" "-v" "tests/")))))) (home-page "https://github.com/akesterson/dpath-python") - (synopsis "Filesystem-like pathing and searching for dictionaries") + (synopsis "File-system-like pathing and searching for dictionaries") (description "@code{python-dpath} is a library for accessing and searching dictionaries via /slashed/paths ala xpath. -Basically it lets you glob over a dictionary as if it were a filesystem. It +Basically it lets you glob over a dictionary as if it were a file system. It allows you to specify globs (ala the bash eglob syntax, through some advanced fnmatch.fnmatch magic) to access dictionary elements, and provides some facility for filtering those results.") -- cgit v1.2.3 From 8ab5fa53ae04cc73770d008e662a952ddf380df3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:49:11 +0200 Subject: gnu: libime: Fix typo in description. * gnu/packages/fcitx5.scm (libime)[description]: Fix typo. --- gnu/packages/fcitx5.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index cae8a74289..5b83844a41 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -190,7 +190,7 @@ client.") ("python" ,python))) ;needed to run test (home-page "https://github.com/fcitx/libime") (synopsis "Library for implementing generic input method") - (description "Libime is a library for implmenting various input methods + (description "Libime is a library for implementing various input methods editors.") (license license:lgpl2.1+))) -- cgit v1.2.3 From 48a2887a8feb3949d666f7e4f99da2cf78776b52 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:49:30 +0200 Subject: gnu: guile-eris: Fix typo in description. * gnu/packages/guile-xyz.scm (guile-eris)[description]: Fix typo. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 75256e0f11..fe4b021bfa 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4449,7 +4449,7 @@ tools.") (synopsis "Guile implementation of the Encoding for Robust Immutable Storage (ERIS)") (description "Guile-ERIS is the reference implementation of the Encoding for Robust -Immutable Storage (ERIS). ERIS allows arbirtary content to be encoded into +Immutable Storage (ERIS). ERIS allows arbitary content to be encoded into uniformly sized, encrypted blocks that can be reassembled using a short read-capability.") (home-page "https://inqlab.net/git/eris.git") -- cgit v1.2.3 From 3a2e1fa715eb3570ffce28944976803f2384b048 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:49:44 +0200 Subject: gnu: sbcl-claw-utils: Fix typo in description. * gnu/packages/lisp-xyz.scm (sbcl-claw-utils)[description]: Fix typo. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8d527005e9..35fbdc7605 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13315,7 +13315,7 @@ and lean bindings to C libraries.") (home-page "https://github.com/borodust/claw-utils") (synopsis "Utilities for easier autowrapping") (description - "This Common Lisp library contains various handy utilties to help + "This Common Lisp library contains various handy utilities to help autowrapping with @code{claw}.") (license license:expat)))) -- cgit v1.2.3 From 3fb6d439fe75210aeb2b28e3bccef7276aedb4f6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:49:56 +0200 Subject: gnu: nimf: Fix typo in description. * gnu/packages/language.scm (nimf)[description]: Fix typo. --- gnu/packages/language.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 5325445a24..55a1b72d74 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -197,7 +197,7 @@ (synopsis "Lightweight input method framework") (description "Nimf is a lightweight, fast and extensible input method framework. This package provides a fork of the original nimf project, that -focusses especially on Korean input (Hangul, Hanja, ...).") +focuses especially on Korean input (Hangul, Hanja, ...).") (home-page "https://github.com/hamonikr/nimf/") (license license:lgpl3+))) -- cgit v1.2.3 From 1b2dbcf0c80231ab643d7c573f04192d4f93d919 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:50:18 +0200 Subject: gnu: go-github-com-charmbracelet-glamour: Fix typo in description. * gnu/packages/golang.scm (go-github-com-charmbracelet-glamour) [description]: Fix typo. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 278a2efa00..70dc653601 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5827,7 +5827,7 @@ which produce colorized output using github.com/fatih/color.") (synopsis "Write handsome command-line tools with glamour") (description "@code{glamour} lets you render markdown documents and templates on ANSI compatible terminals. You can create your own stylesheet or -use one of our glamourous default themes.") +use one of our glamorous default themes.") (license license:expat))) (define-public go-github-com-coreos-go-semver -- cgit v1.2.3 From a972e272e9a599747a773a51c725a9db90083ea0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:50:37 +0200 Subject: gnu: Fix typo in (gnu packages gtk). * gnu/packages/gtk.scm: Fix typo in copyright header. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fa4241eb31..bffc9e0298 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 David Hashe -;;; Coypright © 2015, 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2020 Efraim Flashner ;;; Copyright © 2016 Fabian Harfert ;;; Copyright © 2016 Kei Kebreau -- cgit v1.2.3 From 0671046e471af6430eda57ce195a0bf1aa71155d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:50:58 +0200 Subject: gnu: r-ggforce: Fix typo in description. * gnu/packages/cran.scm (r-ggforce)[description]: Fix typo. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 61de48e08e..b910677a2f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16376,7 +16376,7 @@ sets of URLs.") (description "The aim of the ggplot2 package is to aid in visual data investigations. This focus has led to a lack of facilities for composing specialized plots. -Thi package aims to be a collection of mainly new statistics and geometries +This package aims to be a collection of mainly new statistics and geometries that fills this gap.") (license license:expat))) -- cgit v1.2.3 From 37d47061669af411e3418aacce5c17d277abee6a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:51:17 +0200 Subject: gnu: r-msmstests: Fix typos in description. * gnu/packages/bioconductor.scm (r-msmstests)[description]: Fix typos. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 88dca552e0..121a06124a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10528,8 +10528,8 @@ experiments, and visualize de influence of the involved factors.") by spectral counts, to discover differentially expressed proteins between two biological conditions. Three tests are available: Poisson GLM regression, quasi-likelihood GLM regression, and the negative binomial of the edgeR -package.The three models admit blocking factors to control for nuissance -variables.To assure a good level of reproducibility a post-test filter is +package. The three models admit blocking factors to control for nuisance +variables. To assure a good level of reproducibility a post-test filter is available, where we may set the minimum effect size considered biologicaly relevant, and the minimum expression of the most abundant condition.") (license license:gpl2))) -- cgit v1.2.3 From f45284f127a7a7fb5bf4cdb5141f13109ea98c6a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:51:32 +0200 Subject: gnu: emacs-webpaste: Fix typo in description. * gnu/packages/emacs-xyz.scm (emacs-webpaste)[description]: Fix typo. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ca1daaeb82..a71b1c4cf7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27479,7 +27479,7 @@ rules about where space should be left to separate words and parentheses.") (description "This mode allows to paste whole buffers or parts of buffers to pastebin-like services. It supports more than one service and will failover if one service fails. More services can easily be added over time -and prefered services can easily be configured.") +and preferred services can easily be configured.") (license license:gpl3+))) (define-public emacs-keystore-mode -- cgit v1.2.3 From eb97517492b6eb35a3e05c6f739ba9b35e8af09b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:51:52 +0200 Subject: gnu: tl-parser: Fix typo in description. * gnu/packages/telegram.scm (tl-parser)[description]: Fix typo. --- gnu/packages/telegram.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 82d1dc463c..e6bfe6c4f2 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -611,8 +611,8 @@ Telegram instant messenger.") #:include-regexp ("\\.h$"))) args)))))) (synopsis "Parse tl scheme to tlo") - (description "TL-Parser is a tl scheme to tlo file parser. It was formely -a part of telegram-cli, but now being maintained separately.") + (description "TL-Parser is a tl scheme to tlo file parser. It was +formerly a part of telegram-cli, but now being maintained separately.") (home-page "https://github.com/vysheng/tl-parser") (license license:gpl2+)))) -- cgit v1.2.3 From 81a5dcfcbad8ba64b94e1f3f4f56e133635360c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:52:11 +0200 Subject: gnu: geda-gaf: Fix typo in description. * gnu/packages/engineering.scm (geda-gaf)[description]: Fix typo. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 57464e1834..b5568b8563 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -266,7 +266,7 @@ plans and designs.") suite grouped together under the gEDA name. gEDA/gaf is a collection of tools which currently includes: gschem, a schematic capture program; gnetlist, a netlist generation program; gsymcheck, a syntax checker for schematic symbols; -gattrib, a spreadsheet programm that manipulates the properties of symbols of +gattrib, a spreadsheet programme that manipulates the properties of symbols of a schematic; libgeda, libraries for gschem gnetlist and gsymcheck; gsch2pcb, a tool to forward annotation from your schematic to layout using PCB; some minor utilities.") -- cgit v1.2.3 From 11e711f8abbe30352d6c520f7ea5a5f248412b05 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:52:33 +0200 Subject: gnu: erofs-utils: Fix typo in synopsis & description. * gnu/packages/linux.scm (erofs-utils)[synopsis, description]: Fix typo. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d50d29034c..3c1d0fddb8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8026,8 +8026,8 @@ kernel side implementation.") ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/") - (synopsis "User-space tools for EROFS filesystem") + (synopsis "User-space tools for EROFS file system") (description "EROFS (Enhanced Read-Only File System) is a compressed, -read-only filesystem optimized for resource-scarce devices. This package -provides user-space tools for creating EROFS filesystems.") +read-only file system optimized for resource-scarce devices. This package +provides user-space tools for creating EROFS file systems.") (license license:gpl2+))) -- cgit v1.2.3 From 4067bf69117ea122faffc1cb97efef9fd6504949 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:52:43 +0200 Subject: gnu: r-physicalactivity: Fix typos in description. * gnu/packages/cran.scm (r-physicalactivity)[description]: Fix typos. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b910677a2f..0917c0bcaf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9538,10 +9538,10 @@ singular or ill-conditioned Jacobian.") `((upstream-name . "PhysicalActivity"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/PhysicalActivity/") - (synopsis "Procesing accelerometer data for physical activity measurement") + (synopsis "Processing accelerometer data for physical activity measurement") (description "This @code{r-physicalactivity} package provides a function @code{wearingMarking} -for classification of monitor wear and nonwear time intervals in accelerometer +for classification of monitored wear and nonwear time intervals in accelerometer data collected to assess physical activity. The package also contains functions for making plots of accelerometer data and obtaining the summary of various information including daily monitor wear time and the mean monitor wear time -- cgit v1.2.3 From 87ff6ea8e27f595bf35b67540b2cf08a60eab4ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:53:14 +0200 Subject: gnu: kmail: Fix typo in description. * gnu/packages/kde-pim.scm (kmail)[description]: Fix typo. --- gnu/packages/kde-pim.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index d790e94c87..74e8bdb8fd 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1112,7 +1112,7 @@ and retrieving certificates from LDAP servers.") (synopsis "Full featured graphical email client") (description "KMail supports multiple accounts, mail filtering and email encryption. The program let you configure your workflow and it has good -integration into KDE (Plasma Desktop) but is also useable with other Desktop +integration into KDE (Plasma Desktop) but is also usable with other Desktop Environments. KMail is the email component of Kontact, the integrated personal information -- cgit v1.2.3 From 7699bbb3a91c1e348d47e73863d9c1aa4e549795 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:53:24 +0200 Subject: gnu: lv2-speech-denoiser: Fix typo in description. * gnu/packages/audio.scm (lv2-speech-denoiser)[description]: Fix typo. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6e064f7175..24175cdab7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4260,7 +4260,7 @@ the following features: (home-page "https://github.com/werman/noise-suppression-for-voice") (synopsis "Speech denoise LV2 plugin based on Xiph's RNNoise library") (description "RNNoise is a library that uses deep learning to apply -noise supression to audio sources with voice presence. This package provides +noise suppression to audio sources with voice presence. This package provides an LV2 audio plugin.") (license license:lgpl3+)))) -- cgit v1.2.3 From 214461edc436503049623c87ab5ca61eff168b92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:53:38 +0200 Subject: gnu: sbcl-cl-slug: Fix typos in synopsis & description. * gnu/packages/lisp-xyz.scm (sbcl-cl-slug) [synopsis, description]: Fix typos. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 35fbdc7605..afdb43620f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7296,10 +7296,10 @@ of C+GObject libraries without the need of writing dedicated bindings.") (inputs `(("ppcre" ,sbcl-cl-ppcre))) (home-page "https://github.com/EuAndreh/cl-slug") - (synopsis "Multi-language slug formater") + (synopsis "Multi-language slug formatter") (description "This is a small Common Lisp library to make slugs, mainly for URIs, -from english and beyond.") +from English and beyond.") (license license:llgpl)))) (define-public ecl-cl-slug -- cgit v1.2.3 From 5bee5ced3455508fbb27a0374a14dfb73405a7ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:53:54 +0200 Subject: gnu: rust-scratch: Fix typo in description. * gnu/packages/crates-io.scm (rust-scratch-1)[description]: Fix typo. --- gnu/packages/crates-io.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 54b208320c..0f358d775d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35802,8 +35802,9 @@ with one of the implemented strategies.") (("rust-fs2" ,rust-fs2-0.4)))) (home-page "https://github.com/dtolnay/scratch") (synopsis "Compile-time temporary directory") - (description "This crate exposes a compile-time temporary directory sharable -by multiple crates in a build graph and erased by @code{cargo clean}.") + (description "This crate exposes a compile-time temporary directory +shareable by multiple crates in a build graph and erased by @code{cargo +clean}.") (license (list license:expat license:asl2.0)))) (define-public rust-scrypt-0.3 -- cgit v1.2.3 From 44a53674afd46ac65d562beb8388cb03b4aa0510 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:54:14 +0200 Subject: gnu: config: Fix typo in synopsis. * gnu/packages/autotools.scm (config)[synopsis]: Fix typo. --- gnu/packages/autotools.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 12a36a4709..33e1905a25 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -537,7 +537,7 @@ complexity of working with shared libraries across platforms.") (native-inputs `(("help2man" ,help2man))) (home-page "https://savannah.gnu.org/projects/config") - (synopsis "Ubiquitious config.guess and config.sub scripts") + (synopsis "Ubiquitous config.guess and config.sub scripts") (description "The `config.guess' script tries to guess a canonical system triple, and `config.sub' validates and canonicalizes. These are used as part of configuration in nearly all GNU packages (and many others).") -- cgit v1.2.3 From f0ca97f56ff565798b53a1187c25e0ae428e59a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:54:29 +0200 Subject: gnu: bsd-games: Fix typo in description. * gnu/packages/games.scm (bsd-games)[description]: Fix typo, and delete stray comma. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 74cf9260df..3e35479aae 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -743,7 +743,7 @@ battlestar (explore the world around, starting from dying spaceship), phantasia (role-play as an rogue), trek (hunt the Klingons, and save the Federation), and wump (hunt the big smelly Wumpus in a dark cave). -Quizes: arithmetic, and quiz.") +Quizzes: arithmetic and quiz.") ;; "Auxiliary and data files, distributed with the games in NetBSD, but ;; not bearing copyright notices, probably fall under the terms of the UCB ;; or NetBSD copyrights and licences. The file "fortune/Notes" contains a -- cgit v1.2.3 From cb22d103fbab719fa76eb1cd4da1bc27fb041a81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:54:52 +0200 Subject: gnu: bluez-alsa: Fix typo in description. * gnu/packages/audio.scm (bluez-alsa)[description]: Fix typo. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 24175cdab7..05c194f525 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4093,7 +4093,7 @@ kbps at 24 bit/96 kHz.") (home-page "https://github.com/Arkq/bluez-alsa") (synopsis "Bluetooth ALSA backend") (description "This project is a rebirth of a direct integration between -Bluez and ALSA. Since Bluez >= 5, the build-in integration has been removed +Bluez and ALSA. Since Bluez >= 5, the built-in integration has been removed in favor of 3rd party audio applications. From now on, Bluez acts as a middleware between an audio application, which implements Bluetooth audio profile, and a Bluetooth audio device. BlueALSA registers all known Bluetooth -- cgit v1.2.3 From 04c49b252844a5e7ff1d23ec412d1223f8bb0d99 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:55:06 +0200 Subject: gnu: ghc-wai-cors: Fix typo in description. * gnu/packages/haskell-web.scm (ghc-wai-cors)[description]: Fix typo. --- gnu/packages/haskell-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0be9890d23..a250bb4262 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -2266,7 +2266,7 @@ server no longer receives pings, it shuts down.") ("ghc-websockets" ,ghc-websockets))) (home-page "https://github.com/larskuhtz/wai-cors") (synopsis "Cross-Origin Resource Sharing (CORS) for WAI") - (description "This package provides an implemenation of Cross-Origin + (description "This package provides an implementation of Cross-Origin Resource Sharing (CORS) for the Web Application Framework (WAI) that aims to be compliant with @url{https://www.w3.org/TR/cors}.") (license license:expat))) -- cgit v1.2.3 From a1d6d8bcd66f1244670a1520cc4c012796054f12 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:55:18 +0200 Subject: gnu: itcl: Fix typo in description. * gnu/packages/tcl.scm (itcl)[description]: Fix typo. --- gnu/packages/tcl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 709b3dd603..55a95792cb 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -143,7 +143,7 @@ (description "[incr Tcl] is a widely used object-oriented system for Tcl. The name is a play on C++, and [incr Tcl] provides a similar object model, including -multiple inheritence and public and private classes and variables.") +multiple inheritance and public and private classes and variables.") (license license:public-domain))) (define-public expect -- cgit v1.2.3 From 95cfad9b2999deb210a9bf532313cfc3d9957f2c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:55:43 +0200 Subject: gnu: nordic-theme: Fix typo in synopsis & description. * gnu/packages/gnome-xyz.scm (nordic-theme) [synopsis, description]: Fix typo. --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index f73001f64b..d8997ac538 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -950,9 +950,9 @@ feature-set for programming Vala effectively.") #:exclude ("README.md" "LICENSE" "Art/" "package.json" "package-lock.json" "Gulpfile.js"))))) (home-page "https://github.com/EliverLara/Nordic") - (synopsis "Dark Gtk3.20+ theme using the Nord color pallete") + (synopsis "Dark Gtk3.20+ theme using the Nord color palette") (description "Nordic is a Gtk3.20+ theme created using the Nord color -pallete.") +palette.") (license license:gpl3)))) (define-public tiramisu -- cgit v1.2.3 From 04a5e7918d18b6ce73f36d939b4c2a44a06b838f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:55:54 +0200 Subject: gnu: r-chromstar: Fix typo in description. * gnu/packages/bioconductor.scm (r-chromstar)[description]: Fix typo. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 121a06124a..5ade0597b0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -11065,7 +11065,7 @@ the earlier snpMatrix package, allowing for uncertainty in genotypes.") (description "This package implements functions for combinatorial and differential analysis of ChIP-seq data. It includes uni- and multivariate peak-calling, -export to genome browser viewable files, and functi ons for enrichment +export to genome browser viewable files, and functions for enrichment analyses.") (license license:artistic2.0))) -- cgit v1.2.3 From 1555d1d80185a14820abf8b0284f26edc72aab5a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:56:06 +0200 Subject: gnu: rust-hmac-sha1: Fix description. * gnu/packages/crates-io.scm (rust-hmac-sha1-0.1) [description]: Fix typo & use @acronym{}. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0f358d775d..9d9781683b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18080,8 +18080,8 @@ Hash-based Message Authentication Code}.") (home-page "https://github.com/pantsman0/rust-hmac-sha1") (synopsis "Minimal implementation of HMAC-SHA1 in Rust") (description - "This package is a pure Rust implementation of the Hash-based Message -Authentication Code Algoritm (HMAC) for SHA1.") + "This package is a pure Rust implementation of the @acronym{HMAC, +Hash-based Message Authentication Code algorithm} for SHA1.") (license license:bsd-3))) (define-public rust-hostname-0.3 -- cgit v1.2.3 From 816a5ecdc8286f3c26abfb1f1e7cab04b6b21803 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:56:31 +0200 Subject: bootloader: grub: Fix typo in docstring. * gnu/bootloader/grub.scm (install-grub-efi-netboot): Fix typo. --- gnu/bootloader/grub.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 13ee695909..ce146aba3c 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -666,7 +666,7 @@ relatively form MOUNT-POINT/TARGET/SUBDIR/grub.cfg to MOUNT-POINT/boot/grub/grub.cfg, and the second symlink points relatively from MOUNT-POINT/TARGET/%store-prefix to MOUNT-POINT/%store-prefix. -It is important to note that these symlinks need to be relativ, as the absolute +It is important to note that these symlinks need to be relative, as the absolute paths on the TFTP server side are unknown. It is also important to note that both symlinks will point outside the TFTP root -- cgit v1.2.3 From 6dbac0d2e4b9b90d5bc3784ee0b6fbf3156350e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:56:43 +0200 Subject: gnu: gpart: Fix typo in description. * gnu/packages/disk.scm (gpart)[description]: Fix my own typo. --- gnu/packages/disk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 6b9a9e4812..bf0897b083 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -351,7 +351,7 @@ to disk. It should be stressed that gpart does a very heuristic job. It can easily be right in its guesswork but it can also be terribly wrong. Never believe its -output without any plausability checks.") +output without any plausibility checks.") (license license:gpl2+)))) (define-public gptfdisk -- cgit v1.2.3 From 3cca373b2eceb0de856336f16c1ac814014eeeaa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:56:57 +0200 Subject: gnu: python-nestedtext: Fix typo in description. * gnu/packages/python-xyz.scm (python-nestedtext) [description]: Fix typo. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ec8c78b1de..3311916c6c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23805,7 +23805,7 @@ cleanly print different types of messages.") "NestedText is a file format for holding data that is to be entered, edited, or viewed by people. It allows data to be organized into a nested collection of dictionaries, lists, and strings. In this way it is similar to JSON and YAML, but -without the complexity and risk of YAML and without the syntatic clutter of JSON. +without the complexity and risk of YAML and without the syntactic clutter of JSON. NestedText is both simple and natural. Only a small number of concepts and rules must be kept in mind when creating it. It is easily created, modified, or viewed with a text editor and easily understood and used by both programmers and non-programmers.") -- cgit v1.2.3 From 6036df88109c81fa2a6565ba0c4ca809fa2cd367 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:57:11 +0200 Subject: gnu: python-scour: Fix typo in description. * gnu/packages/python-xyz.scm (python-scour)[description]: Fix typo. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3311916c6c..120154757c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1985,7 +1985,7 @@ human-friendly syntax.") (build-system python-build-system) (home-page "https://github.com/scour-project/scour") (synopsis "Scour is an SVG optimizer/cleaner written in Python") - (description "The goal of Scour is to output a file that renderes + (description "The goal of Scour is to output a file that renders identically at a fraction of the size by removing a lot of redundant information created by most SVG editors. Optimization options are typically lossless but can be tweaked for more aggressive cleaning.") -- cgit v1.2.3 From 2ecd7d64993580a4365232e46e6bd66d2324f0a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:57:29 +0200 Subject: gnu: go-github-com-go-sql-driver-mysql: Fix typo in description. * gnu/packages/golang.scm (go-github-com-go-sql-driver-mysql) [description]: Fix typo. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 70dc653601..a96f71446b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3965,7 +3965,7 @@ without requiring a real database connection.") (home-page "https://github.com/go-sql-driver/mysql") (synopsis "MySQL driver for golang") (description - "This is a pure Go implementaton of the MySQL API, compatible with + "This is a pure Go implementation of the MySQL API, compatible with golang's database/sql package.") (license license:mpl2.0))) -- cgit v1.2.3 From 8ab76a89001bc65e4f08a41e55c133312c62c4f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:57:40 +0200 Subject: gnu: python-pypeg2: Fix typo in synopsis. * gnu/packages/python-xyz.scm (python-pypeg2)[synopsis]: Fix typo. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 120154757c..30ad6b9435 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15635,7 +15635,7 @@ specified to apply on the key before comparison (e.g. @code{string.lower})).") ;;https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35 '(#:tests? #f)) (home-page "https://fdik.org/pyPEG/") - (synopsis "Parsering Expression Grammars in Python") + (synopsis "Parsing Expression Grammars in Python") (description "PyPEG is an intrinsic parser interpreter framework for Python. It is based on Parsing Expression Grammars, PEG. With pyPEG you can parse many formal languages.") -- cgit v1.2.3 From 9a2d7e0f6331a2222696c4f8b669a8cce3725773 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:57:55 +0200 Subject: gnu: julia-mbedtls: Fix typo in description. * gnu/packages/julia-xyz.scm (julia-mbedtls)[description]: Fix typo. --- gnu/packages/julia-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 85949ec9e8..d79acf0b17 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -844,7 +844,7 @@ that let you do deep transformations of code.") (home-page "https://github.com/JuliaLang/MbedTLS.jl") (synopsis "Apache's mbed TLS library wrapper") (description "@code{MbedTLS.jl} provides a wrapper around the @code{mbed -TLS} and cryptography C libary for Julia.") +TLS} and cryptography C library for Julia.") (license license:expat))) (define-public julia-mbedtls-jll -- cgit v1.2.3 From a036f3ea2d3c926f6cb8afe25d4eb0bbf31d5b89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:58:17 +0200 Subject: gnu: libglvnd: Fix typo in description. * gnu/packages/gl.scm (libglvnd)[description]: Fix typo. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index dec2835ca6..a3839c0519 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -720,7 +720,7 @@ OpenGL graphics API.") (description "libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors. It allows multiple drivers from -different vendors to coexist on the same filesystem, and determines which +different vendors to coexist on the same file system, and determines which vendor to dispatch each API call to at runtime. Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES.") -- cgit v1.2.3 From 48358a25ca14d159d85b9d9ae3e6d20e970941cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:58:38 +0200 Subject: gnu: r-gagedata: Fix typo in synopsis. * gnu/packages/bioconductor.scm (r-gagedata)[synopsis]: Fix typo and add article. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 5ade0597b0..6b5c0a0391 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1087,7 +1087,7 @@ package @code{affy}.") (properties `((upstream-name . "gageData"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/gageData") - (synopsis "Auxillary data for gage package") + (synopsis "Auxiliary data for the gage package") (description "This is a supportive data package for the software package @code{gage}. However, the data supplied here are also useful for gene set or pathway -- cgit v1.2.3 From a979647db43c173adc73927ef6c7fc496783ceb3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:58:57 +0200 Subject: gnu: go-go-uber-org-multierr: Fix typo in synopsis. * gnu/packages/golang.scm (go-go-uber-org-multierr)[synopsis]: Fix typo. --- gnu/packages/golang.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index a96f71446b..6502740220 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6911,7 +6911,7 @@ atomic access.") (propagated-inputs `(("go-go-uber-org-atomic" ,go-go-uber-org-atomic))) (home-page "https://go.uber.org/multierr") - (synopsis "Error combination fo Go") + (synopsis "Error combination for Go") (description "@code{multierr} allows combining one or more Go errors together.") (license license:expat))) -- cgit v1.2.3 From a8cee87747ebd9b13f964478246cc42786153058 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 19:59:13 +0200 Subject: gnu: bindfs: Fix typo in description. * gnu/packages/file-systems.scm (bindfs)[description]: Fix typo. --- gnu/packages/file-systems.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0e27cdd2fd..d970fe7198 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -184,7 +184,7 @@ large and/or frequently changing (network) environment.") (home-page "https://bindfs.org") (synopsis "Bind mount a directory and alter permission bits") (description - "@command{bindfs} is a FUSE filesystem for mounting a directory to + "@command{bindfs} is a FUSE file system for mounting a directory to another location, similar to @command{mount --bind}. It can be used for: @itemize @item Making a directory read-only. -- cgit v1.2.3 From e6eb0216523a01bc7f788cd8487655bda1e57ce1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 22:17:01 +0200 Subject: gnu: guile-eris: Fix typo in description. * gnu/packages/guile-xyz.scm (guile-eris)[description]: Fix typo. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fe4b021bfa..b2cbf3e898 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4449,7 +4449,7 @@ tools.") (synopsis "Guile implementation of the Encoding for Robust Immutable Storage (ERIS)") (description "Guile-ERIS is the reference implementation of the Encoding for Robust -Immutable Storage (ERIS). ERIS allows arbitary content to be encoded into +Immutable Storage (ERIS). ERIS allows arbitrary content to be encoded into uniformly sized, encrypted blocks that can be reassembled using a short read-capability.") (home-page "https://inqlab.net/git/eris.git") -- cgit v1.2.3 From abe686b9fb4e63f36b42b2eb44361e8b31704fcc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 23:04:04 +0200 Subject: gnu: aws-c-common: Update to 0.5.3. * gnu/packages/c.scm (aws-c-common): Update to 0.5.3. --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 429ff94070..36a9366554 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -546,7 +546,7 @@ portability.") (define-public aws-c-common (package (name "aws-c-common") - (version "0.5.2") + (version "0.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -555,7 +555,7 @@ portability.") (file-name (git-file-name name version)) (sha256 (base32 - "0rd2qzaa9mmn5f6f2bl1wgv54f17pqx3vwyy9f8ylh59qfnilpmg")))) + "03fcvh3l1l6fkzkcbaprk10qmy8l77zhmh60h1px2ik09sqd9p72")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit v1.2.3 From 12158b831b9bda91fd01a82fcc9f9b95764f5f04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 9 Apr 2021 23:12:30 +0200 Subject: gnu: faudio: Update to 21.04. * gnu/packages/audio.scm (faudio): Update to 21.04. [arguments]: Replace FFMPEG=ON configure flag with GSTREAMER=ON. [inputs]: Likewise replace ffmpeg with gstreamer & gst-plugins-base. [license]: Update licence list. --- gnu/packages/audio.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 05c194f525..c9a9ebf32d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnunet) ; libmicrohttpd #:use-module (gnu packages gperf) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages icu4c) @@ -4465,7 +4466,7 @@ library.") (define-public faudio (package (name "faudio") - (version "19.11") + (version "21.04") (source (origin (method git-fetch) @@ -4474,19 +4475,24 @@ library.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0ckpr6ffz8ssfh1y850dhip5s5jv0j6n90qz5yx1v9d6gpwf08rp")))) + (base32 "1g3zp7igh4ns31sqnxddxqhgibijngkbcqqsj23i9d1lah6k4747")))) (arguments '(#:tests? #f ; No tests. - #:configure-flags '("-DFFMPEG=ON"))) + #:configure-flags '("-DGSTREAMER=ON"))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("ffmpeg" ,ffmpeg) + (inputs `(("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) ("sdl2" ,sdl2))) (home-page "https://github.com/FNA-XNA/FAudio") (synopsis "XAudio reimplementation") (description "FAudio is an XAudio reimplementation that focuses solely on developing fully accurate DirectX Audio runtime libraries.") - (license license:zlib))) + (license + (list license:zlib + ;; stb & utils/{ui,wav}common are dual-licenced under either of: + license:expat + license:public-domain)))) (define-public gnaural (package -- cgit v1.2.3 From e1f223c5793596e67cc1d7b758db0268513fdb1b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Apr 2021 00:48:13 +0200 Subject: gnu: ddcutil: Update to 1.1.0. * gnu/packages/hardware.scm (ddcutil): Update to 1.1.0. --- gnu/packages/hardware.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 10672f52f3..d5941b6c0f 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 Evgeny Pisemsky @@ -61,14 +61,14 @@ (define-public ddcutil (package (name "ddcutil") - (version "0.9.9") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append "https://www.ddcutil.com/tarballs/" "ddcutil-" version ".tar.gz")) (sha256 - (base32 "0anyxy53k2613hq9glaad16llqlv6iim5p8gz0rs5pnpp8p00dg1")))) + (base32 "19kkwb9ijzn6ya3mvjanggh1c96fcc0lkbk7xnyi2qp6wsr4nhxp")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From f91e1046c4050c0947429b9141c80024c261d7b5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 10 Apr 2021 14:42:03 +0200 Subject: gnu: raptor2: Use HTTPS home page and source URI. * gnu/packages/rdf.scm (raptor2)[home-page]: Use HTTPS URI. [source]: Use HTTPS URI. --- gnu/packages/rdf.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 0841c1fd8d..0baed8fc17 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -61,7 +61,7 @@ (version "2.0.15") (source (origin (method url-fetch) - (uri (string-append "http://download.librdf.org/source/" name + (uri (string-append "https://download.librdf.org/source/" name "-" version ".tar.gz")) (patches (search-patches "raptor2-heap-overflow.patch")) @@ -76,7 +76,7 @@ ("zlib" ,zlib))) (arguments `(#:parallel-tests? #f)) - (home-page "http://librdf.org/raptor/") + (home-page "https://librdf.org/raptor/") (synopsis "RDF syntax library") (description "Raptor is a C library providing a set of parsers and serialisers that generate Resource Description Framework (RDF) triples -- cgit v1.2.3 From ea9b1e3bab1eef6e2a5d6728df816e918c6ea201 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 10 Apr 2021 00:06:38 +0100 Subject: gnu: Add cl-abstract-classes. * gnu/packages/lisp-xyz.scm (sbcl-abstract-classes, cl-abstract-classes, ecl-abstract-classes): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index afdb43620f..b3d90d0fb2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15718,3 +15718,36 @@ shader functions, written with @code{Shadow}.") (define-public cl-umbra (sbcl-package->cl-source-package sbcl-umbra)) + +(define-public sbcl-abstract-classes + (let ((commit "7fa74f1e057f9ba7c1ffecff14f049f979e45267") + (revision "1")) + (package + (name "sbcl-abstract-classes") + (version (git-version "1.7.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://bitbucket.org/eeeickythump/cl-abstract-classes") + (commit commit))) + (file-name (git-file-name "cl-abstract-classes" version)) + (sha256 + (base32 "06lby4i6xbbgs7kgb0f3fqybvyskyg6djhrf967lnysv7hn3zpg9")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("closer-mop" ,sbcl-closer-mop))) + (arguments + `(#:asd-systems '("abstract-classes" "singleton-classes"))) + (home-page "https://bitbucket.org/eeeickythump/cl-abstract-classes") + (synopsis "Abstract, final, and singleton metaclasses for CLOS") + (description + "This package provides Common Lisp extension to the MOP to allow +abstract, final and singleton classes.") + (license license:public-domain)))) + +(define-public ecl-abstract-classes + (sbcl-package->ecl-package sbcl-abstract-classes)) + +(define-public cl-abstract-classes + (sbcl-package->cl-source-package sbcl-abstract-classes)) -- cgit v1.2.3 From b749462ce7968263866e44a72be8741b629236bb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 10 Apr 2021 00:12:14 +0100 Subject: gnu: Add cl-coalton. * gnu/packages/lisp-xyz.scm (sbcl-coalton, cl-coalton, ecl-coalton): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b3d90d0fb2..0f6d0103d5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15751,3 +15751,41 @@ abstract, final and singleton classes.") (define-public cl-abstract-classes (sbcl-package->cl-source-package sbcl-abstract-classes)) + +(define-public sbcl-coalton + (let ((commit "4a42ffb4222fde3abfd1b50d96e455ff2eef9fe8") + (revision "1")) + (package + (name "sbcl-coalton") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stylewarning/coalton") + (commit commit))) + (file-name (git-file-name "coalton" version)) + (sha256 + (base32 "0aidwwam7cnhb3p9212zbv5w2dl6kr5iklzanypzr1a9lqaxwdlk")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiasco" ,sbcl-fiasco))) + (inputs + `(("abstract-classes" ,sbcl-abstract-classes) + ("alexandria" ,sbcl-alexandria) + ("global-vars" ,sbcl-global-vars) + ("optima" ,sbcl-optima) + ("trivial-garbage" ,sbcl-trivial-garbage))) + (home-page "https://github.com/stylewarning/coalton") + (synopsis "Dialect of ML in Common Lisp") + (description + "Coalton is a dialect of ML embedded in Common Lisp. It emphasizes +practicality and interoperability with Lisp, and is intended to be a DSL that +allows one to gradually make their programs safer.") + (license license:expat)))) + +(define-public ecl-coalton + (sbcl-package->ecl-package sbcl-coalton)) + +(define-public cl-coalton + (sbcl-package->cl-source-package sbcl-coalton)) -- cgit v1.2.3 From b7bcd1ecfcbab2fd5d8559e1f6060be51778a5b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 6 Apr 2021 13:16:44 +0200 Subject: gnu: ungoogled-chromium: Update to 89.0.4389.114-1. * gnu/packages/chromium.scm (%ungoogled-revision): Set to 89.0.4389.114-1. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index de7c887061..42a13cdbcd 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -305,7 +305,7 @@ (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %ungoogled-revision "89.0.4389.90-1") +(define %ungoogled-revision "89.0.4389.114-1") (define %debian-revision "debian/84.0.4147.105-1") (define %debian-patches @@ -325,7 +325,7 @@ %ungoogled-revision))) (sha256 (base32 - "0pr756d1b4wc67d61b21yszi7mx1hsjy14i44j0kvcwm05pgnf79")))) + "0cr2i51gxhgl55c8f9w0ra3m5q2dk03sf7p2qn4bqq1l1l72hw6s")))) (define %guix-patches (list (local-file @@ -466,7 +466,7 @@ ".tar.xz")) (sha256 (base32 - "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi")) + "007df9p78bbmk3iyfi8qn57mmn68qqrdhx6z8n2hl8ksd7lspw7j")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit v1.2.3 From 252609bb848685c2a6977ae00812b97302e85309 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 6 Apr 2021 17:22:10 +0200 Subject: gnu: Remove unused module imports. * gnu/packages/chromium.scm: Don't import (guix store) and (guix monads). --- gnu/packages/chromium.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 42a13cdbcd..835e9e2050 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -21,8 +21,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) - #:use-module (guix store) - #:use-module (guix monads) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) -- cgit v1.2.3 From d7e57e2a5bad55415551fc2c53552142c32056d5 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:55:05 +0100 Subject: gnu: Remove clang-runtime-3.6 and clang-3.6. * gnu/packages/llvm.scm (clang-runtime-3.6, clang-3.6): Remove variables. Signed-off-by: Leo Famulari --- gnu/packages/llvm.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 0a1b6c84ce..d35c20e17c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -790,17 +790,6 @@ of programming tools as well as libraries with equivalent functionality.") (base32 "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn")))))) -(define-public clang-runtime-3.6 - (clang-runtime-from-llvm - llvm-3.6 - "11qx8d3pbfqjaj2x207pvlvzihbs1z2xbw4crpz7aid6h1yz6bqg" - '("clang-runtime-asan-build-fixes.patch"))) - -(define-public clang-3.6 - (clang-from-llvm llvm-3.6 clang-runtime-3.6 - "1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df" - #:patches '("clang-3.5-libc-search-path.patch"))) - (define-public llvm-3.5 (package (inherit llvm-3.6) (version "3.5.2") -- cgit v1.2.3 From 96026bdb8fc3ebcdb4b4144246a1ae8105eefb7c Mon Sep 17 00:00:00 2001 From: la snesne Date: Thu, 1 Apr 2021 01:12:15 +0900 Subject: gnu: Add wlogout. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (wlogout): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 4df1af27cb..90896c2b89 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 qblade +;;; Copyright © 2021 lasnesne ;;; ;;; This file is part of GNU Guix. ;;; @@ -2451,3 +2452,39 @@ read and write, and compatible with JSON.") "Hikari is a stacking Wayland compositor with additional tiling capabilities. It is heavily inspired by the Calm Window manager(cwm).") (license license:bsd-2))) + +(define-public wlogout + (package + (name "wlogout") + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ArtsyMacaw/wlogout") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1swhzkqkzli59c89pvrakfvicd00x7ga860c3x2pbb4y3xziqfvi")))) + (build-system meson-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (inputs + `(("gtk-layer-shell" ,gtk-layer-shell) + ("gtk+" ,gtk+))) + (arguments + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source-paths + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "main.c" + (("/usr/share") (string-append out "/share")) + (("/etc") (string-append out "/etc")))) + #t))))) + (home-page "https://github.com/ArtsyMacaw/wlogout") + (synopsis "Logout menu for Wayland") + (description "wlogout is a logout menu for Wayland environments.") + (license license:expat))) -- cgit v1.2.3 From ce9fe5f9a27a1cefb40f91aa8eb4c8b690f3e13f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Apr 2021 20:21:43 +0200 Subject: gnu: gmic: Update to 2.9.7. * gnu/packages/image-processing.scm (gmic): Update to 2.9.7. --- gnu/packages/image-processing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 2795eaf130..ce2242a658 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -622,14 +622,14 @@ due to its architecture which automatically parallelises the image workflows.") (define-public gmic (package (name "gmic") - (version "2.9.6") + (version "2.9.7") (source (origin (method url-fetch) (uri (string-append "https://gmic.eu/files/source/gmic_" version ".tar.gz")) (sha256 - (base32 "06n1dcskky7aqg3a0cp7biwz8agc4xqvr8091l2wsvgib98yhbyj")))) + (base32 "05kzaplsl5qvxs7v6g73q0lq8dii8g6v77ap609188m7gr43f9cl")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;there are no tests -- cgit v1.2.3 From 0f0c9d2b0ff34526eea54456f2bf9ff099e36ea7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Apr 2021 20:46:55 +0200 Subject: gnu: freetds: Update to 1.2.19. * gnu/packages/databases.scm (freetds): Update to 1.2.19. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8c657e4113..5c00e4c7d1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3836,14 +3836,14 @@ PostreSQL, SQLite, ODBC and MySQL.") (define-public freetds (package (name "freetds") - (version "1.2.18") + (version "1.2.19") (source (origin (method url-fetch) (uri (string-append "https://www.freetds.org/files/stable/" "freetds-" version ".tar.gz")) (sha256 - (base32 "1hspvwxwdd1apadsy2b40dpjik8kfwcvdamvhpg3lnm15n02fb50")))) + (base32 "11xf2w8gh2p9cq4i38jfvdiwgig8wqbg098xjc08kx4iii8lxy3m")))) (build-system gnu-build-system) (arguments ;; NOTE: (Sharlatan-20210110213908+0000) some tests require DB connection, -- cgit v1.2.3 From ba42bce19bbfbeca4d8dcd6e41c64427ce0b9a6a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Apr 2021 22:06:00 +0200 Subject: gnu: glfw: Update to 3.3.4. * gnu/packages/gl.scm (glfw): Update to 3.3.4. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a3839c0519..0d2e71cc72 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -775,7 +775,7 @@ OpenGL.") (define-public glfw (package (name "glfw") - (version "3.3.3") + (version "3.3.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -783,7 +783,7 @@ OpenGL.") "/glfw-" version ".zip")) (sha256 (base32 - "0xrrahhbs4sn7sgvdk9sgz5zla4sw3ajq6kxpqrx635l8nnqfc3j")))) + "1kcrpl4d6b6h23ib5j9q670d9w3knd07whgbanbmwwhbcqnc9lmv")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no test target -- cgit v1.2.3 From 05b65e68c8c3464d046ab93abac1f9ed5c1b1a2a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Apr 2021 22:06:10 +0200 Subject: gnu: lldpd: Update to 1.0.10. * gnu/packages/networking.scm (lldpd): Update to 1.0.10. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index baaa9c5707..7f8c68e7dc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3834,14 +3834,14 @@ thousands of connections is clearly realistic with today's hardware.") (define-public lldpd (package (name "lldpd") - (version "1.0.9") + (version "1.0.10") (source (origin (method url-fetch) (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" version ".tar.gz")) (sha256 - (base32 "1xa9953hl2c94zi4ngaxyi2yw3dax1ab16118wriwawm4lqynr3b")) + (base32 "08kppk49f9wmdf2gw29sm8pi027g54gzrqa07p8fpwvy0dv2sns4")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 166aaea33316ec74b91feeeb268fd6a2e7f68e79 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 10 Apr 2021 22:28:42 +0200 Subject: gnu: meson@0.57: Update to 0.57.2. * gnu/packages/build-tools.scm (meson-next): Update to 0.57.2. --- gnu/packages/build-tools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index b5cebf0f9b..87f393cf5c 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -317,7 +317,7 @@ resembles Python.") (define-public meson-next (package (inherit meson) - (version "0.57.1") + (version "0.57.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -325,7 +325,7 @@ resembles Python.") version ".tar.gz")) (sha256 (base32 - "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj")))))) + "1iac7p99zfgkznq4qlnkk7b8xwwlilcrnkf33sczm56yqnqyg0rs")))))) (define-public meson-for-build (package -- cgit v1.2.3 From 280cfe63bdd6eb4dd5460385e7918e0808ffe511 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Apr 2021 06:16:17 +0300 Subject: gnu: xclickroot: Update to 1.3. * gnu/packages/wm.scm (xclickroot): Update to 1.3. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 90896c2b89..6695186c3e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2192,7 +2192,7 @@ support, for easier unicode usage."))))) (define-public xclickroot (package (name "xclickroot") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference @@ -2201,7 +2201,7 @@ support, for easier unicode usage."))))) (file-name (git-file-name name version)) (sha256 (base32 - "1nd5qz0qz5j7gx2jsbcp234giwaa0xmg42vrcjrcf587q9ivakfl")))) + "0wnsfxvh4v02r2jjyh2n6jfkbj2dna2hlm6anl4b36lwji749k2k")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11))) -- cgit v1.2.3 From 69b91b80cfd28b45fac74f0573347e6e63152c4d Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Apr 2021 06:20:28 +0300 Subject: gnu: xnotify: Update to 0.8.1. * gnu/packages/wm.scm (xnotify): Update to 0.8.1. --- gnu/packages/wm.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6695186c3e..f92b8f4d85 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016 Ivan Vilata i Balaguer ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017, 2019, 2020 Marius Bakke -;;; Copyright © 2017, 2020 Oleg Pykhalov +;;; Copyright © 2017, 2020, 2021 Oleg Pykhalov ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018, 2019 Meiyo Peng @@ -2312,16 +2312,16 @@ start-up.") (define-public xnotify (package (name "xnotify") - (version "0.7.3") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/phillbush/xnotify") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "09s29m8z4x3mc3wja2587ik3f6zg16b40adr3nllnpyy1mqnprq5")))) + "1jxms4md2mwfjgm2pgg3vakpp33800jbn9hnl0j4jyfc9f1ckbsv")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From 0c00083399a8606e39dc5b0dca9000065f2d229a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Apr 2021 17:52:13 -0400 Subject: gnu: linux-libre: Update to 5.11.13. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.13. (linux-libre-5.11-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3c1d0fddb8..e8b4adc6b7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.12") +(define-public linux-libre-5.11-version "5.11.13") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "0z8fpskygs569f15c37x7c1sd46h06bfjmphql3xidj86hbnz8n0"))) + (hash (base32 "0yvgkc1fmmd4g06sydn51q4l3g5785q9yaaq04lv3kgj4hyijqgs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit v1.2.3 From b339f8d66760a55d45e6b0e70e39da667eebd618 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Apr 2021 17:52:30 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.29. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.29. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e8b4adc6b7..a45dde20fa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.28") +(define-public linux-libre-5.10-version "5.10.29") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0m63g9700c0yfazj6j4s5b5x36kp9ffjwsdqj0zfcmlmf7m3mz2d"))) + (hash (base32 "1v79wylb2kd9gadiqf7dr7jcgynr970bbga09mdn940sq536g30m"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From e1f0be8e3360b5d3a3b2a434a5e9353d9f0e2376 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Apr 2021 17:52:47 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.111. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.111. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a45dde20fa..213a59d060 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.110") +(define-public linux-libre-5.4-version "5.4.111") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0a5jv46znqf1pg6y9fa1fmk87jjbfrd40iqqrdkb59788229gxnh"))) + (hash (base32 "00qs4y4d9adffwysdh8sly81hxc3rw7bi9vs3fs4rhwdclr62qi1"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 5e870c4591727989bcc066c7e50ee4442d2be555 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Apr 2021 17:53:10 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.186. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.186. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 213a59d060..6dd8f41fbd 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.185") +(define-public linux-libre-4.19-version "4.19.186") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "15w5a2lfar3qdzv4lljdjy7dh49dhjy3gw2bn92awzcr2a1dg28n"))) + (hash (base32 "0cg6ja7plry1l2mg6hx16lsw0gzn4xpj7xdrrs2hwl8l8a2dgifq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 7ccd9af476096d0557a8119ee4b7d7e4addba99f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Apr 2021 17:53:36 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.230. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.230. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6dd8f41fbd..779ad47907 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.229") +(define-public linux-libre-4.14-version "4.14.230") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0b1nmcl3vdi37nxi7kjnfjmigmffigx9vkay2lldg9nyrlwyi6xj"))) + (hash (base32 "1gn5cs1ss4bfsnnv0b2s4g5ibiigpzsx0i3qfswchdbxvdag75cw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 916151153245ab3bf61a43a5601e83461b4b12ec Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Apr 2021 17:53:52 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.266. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.266. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 779ad47907..f2f05a8ec7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.265") +(define-public linux-libre-4.9-version "4.9.266") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0485kyqn1fgvw3kgbnc6rmjzdgjvwcl6jaqnv1qyhjdhd4ak0iji"))) + (hash (base32 "0qzigcslfp714vaswwlw93xj0h2f8laikppw6krrhfnh5wwrp5dr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 2cb575dcc2836a825ea898492ee6c2c42e1410d1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 10 Apr 2021 17:54:09 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.266. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.266. (linux-libre-4.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f2f05a8ec7..bebf92feba 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.265") +(define-public linux-libre-4.4-version "4.4.266") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1531x9f6dwfj1vmy9z8kw8lhg753chkzk4yi2m9h7r89jbikfriv"))) + (hash (base32 "00x2dmjiiv9zpc0vih9xqmf78kynqzj9q9v1chc2q2hcjpqfj31c"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 8a625dd2aeba322004d24d1767215dfe8627ec42 Mon Sep 17 00:00:00 2001 From: Cameron Chaparro Date: Fri, 9 Apr 2021 09:19:26 -0500 Subject: gnu: Add cl-clip. * gnu/packages/lisp-xyz.scm (cl-clip, ecl-clip, sbcl-clip): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0f6d0103d5..1d8e0b42bb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Matthew Kraai ;;; Copyright © 2021 André A. Gomes ;;; Copyright © 2021 Cage +;;; Copyright © 2021 Cameron Chaparro ;;; ;;; This file is part of GNU Guix. ;;; @@ -15789,3 +15790,38 @@ allows one to gradually make their programs safer.") (define-public cl-coalton (sbcl-package->cl-source-package sbcl-coalton)) + +(define-public sbcl-clip + (let ((commit "7afa68702fbb99c47ed115ea0faccd97a29d9b2e") + (revision "1")) + (package + (name "sbcl-clip") + (version (git-version "0.7.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shinmera/clip") + (commit commit))) + (file-name (git-file-name "clip" version)) + (sha256 + (base32 "13kkajkva2shm19fvn4yashsw18l6imv2rmy3hmpcky7g5ay7bv3")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("array-utils" ,sbcl-array-utils) + ("lquery" ,sbcl-lquery))) + (home-page "https://shinmera.github.io/clip/") + (synopsis "Common Lisp HTML templating engine") + (description + "Clip is an attempt at a templating library that allows you to write +templates in a way that is both accessible to direct webdesign and +flexible. The main idea is to incorporate transformation commands into an HTML +file through tags and attributes. Clip is heavily dependant on Plump and +lQuery.") + (license license:zlib)))) + +(define-public ecl-clip + (sbcl-package->ecl-package sbcl-clip)) + +(define-public cl-clip + (sbcl-package->cl-source-package sbcl-clip)) -- cgit v1.2.3 From 98067662f645cab1c22a51d6b9ed6b3140ecaf9e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 10 Apr 2021 22:53:40 -0700 Subject: gnu: u-boot: Update to 2021.04. * gnu/packages/bootloaders (u-boot): Update to 2021.04. [source]: Use https URL. --- gnu/packages/bootloaders.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c9a3d2c217..6093e0d9e6 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -478,15 +478,15 @@ tree binary files. These are board description files used by Linux and BSD.") (define u-boot (package (name "u-boot") - (version "2021.01") + (version "2021.04") (source (origin (method url-fetch) (uri (string-append - "ftp://ftp.denx.de/pub/u-boot/" + "https://ftp.denx.de/pub/u-boot/" "u-boot-" version ".tar.bz2")) (sha256 (base32 - "0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl")))) + "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd")))) (native-inputs `(("bc" ,bc) ("bison" ,bison) -- cgit v1.2.3 From 927cdd89c2601b2a974f6b66de77f8e712629feb Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 10 Apr 2021 15:25:03 +0200 Subject: gnu: Add emacs-vertico. * gnu/packages/emacs-xyz.scm (emacs-vertico): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a71b1c4cf7..f76dcae4fa 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27541,6 +27541,39 @@ and preferred services can easily be configured.") "This package adds a \"C-'\" binding to Ivy minibuffer that uses Avy.") (license license:gpl3+))) +(define-public emacs-vertico + (package + (name "emacs-vertico") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minad/vertico") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1r2p09y3ag14dqd46nyy1pa2j2cvn4gn9pji47mzmwydsm2f8hv1")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'build-doc + (lambda _ + (invoke "makeinfo" "vertico.texi")))))) + (native-inputs + `(("texinfo" ,texinfo))) + (home-page "https://github.com/minad/vertico") + (synopsis "Vertical interactive completion") + (description + "Vertico provides a minimalistic vertical completion UI, which is based +on Emacs' default completion system. By reusing the default system, it +achieves full compatibility with built-in Emacs commands and completion +tables. Vertico is pretty bare-bone and only provides a minimal set of +commands. Additional optional enhancements can be provided externally by +complementary packages.") + (license license:gpl3+))) + (define-public emacs-ivy-hydra (package (name "emacs-ivy-hydra") -- cgit v1.2.3 From 46c6161ed638ecde5e55211903be46deb22b5e93 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Thu, 8 Apr 2021 11:27:53 +0200 Subject: gnu: emacs-repl-toggle: Update to 0.7.1. * gnu/packages/emacs-xyz.scm (emacs-repl-toggle): Update to 0.7.1. [source]: Use Sourcehut repository. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f76dcae4fa..2c43b1a5b2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25435,21 +25435,21 @@ current buffer.") (define-public emacs-repl-toggle (package (name "emacs-repl-toggle") - (version "0.6.1") + (version "0.7.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tomterl/repl-toggle") + (url "https://git.sr.ht/~tomterl/repl-toggle") (commit version))) (sha256 (base32 - "12h3xxja3isnhvrqx7m2g7a5d8h68cc85pbqyhiipfxyafyl1yxd")) + "0nycm8a4wwkkaif958z4m89slayp17k20lp2h7lvddjx8prn6yfp")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs `(("emacs-fullframe" ,emacs-fullframe))) - (home-page "https://github.com/tomterl/repl-toggle") + (home-page "https://git.sr.ht/~tomterl/repl-toggle") (synopsis "Switch to and from current major mode's REPL") (description "This package provides a function to switch to and from a REPL appropriate to the current major mode.") -- cgit v1.2.3 From 735527d8e944099a587e40ecbcb4782309073bb2 Mon Sep 17 00:00:00 2001 From: Eugene Klimov via Guix-patches via Date: Tue, 6 Apr 2021 01:08:07 +0500 Subject: gnu: Add emacs-mode-line-idle. * gnu/packages/emacs-xyz.scm (emacs-mode-line-idle): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2c43b1a5b2..a927aea227 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -96,6 +96,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 Eugene Klimov ;;; ;;; This file is part of GNU Guix. ;;; @@ -4680,6 +4681,32 @@ Also included are keybindings for spec files and Dired buffers, as well as snippets for yasnippet.") (license license:gpl3+)))) +(define-public emacs-mode-line-idle + ;; Package has no release. Version is extracted from "Version:" keyword in + ;; main file. + (let ((commit "02b1da6278e43cc9cc0356110cc6bfbb37eb8241") + (revision "1")) + (package + (name "emacs-mode-line-idle") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://gitlab.com/ideasman42/emacs-mode-line-idle") + (commit commit))) + (sha256 + (base32 "0ky330b2sfbzkbxbfp9b21hdywsjw26bllspglz08hrbni7jmry8")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/ideasman42/emacs-mode-line-idle") + (synopsis "Simple delayed text evaluation for the mode-line") + (description + "Mode Line Idle provides a convenient way to defer text evaluation +which integrates into existing mode-line without requiring a minor mode or +configuration.") + (license license:gpl3+)))) + (define-public emacs-smart-mode-line (package (name "emacs-smart-mode-line") @@ -27597,3 +27624,4 @@ complementary packages.") quasi-prefix map, with many useful bindings. These bindings are shorter than usual, using mostly unprefixed keys.") (license license:gpl3+))) + -- cgit v1.2.3 From 2d0a546508cb63e340220a363898fa9f46f03006 Mon Sep 17 00:00:00 2001 From: nixo Date: Sun, 28 Mar 2021 11:59:16 +0200 Subject: gnu: Add emacs-elfeed-protocol. * gnu/packages/emacs-xyz.scm (emacs-elfeed-protocol): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a927aea227..8111aacba7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -85,7 +85,7 @@ ;;; Copyright © 2020 Adam Kandur ;;; Copyright © 2020 Tim Howes ;;; Copyright © 2020 Noah Landis -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 André A. Gomes ;;; Copyright © 2020 Jonathan Rostran ;;; Copyright © 2020, 2021 Noah Evans @@ -9210,6 +9210,30 @@ duplicated a lot. Org-mode makes the book keeping of tags and feeds much easier.") (license license:gpl3+)))) +(define-public emacs-elfeed-protocol + (package + (name "emacs-elfeed-protocol") + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fasheng/elfeed-protocol") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07r1qlldgd0kfikd0y737y5n42ab3nkw2s5jx7frimj41yandbdp")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-elfeed" ,emacs-elfeed))) + (home-page "https://github.com/fasheng/elfeed-protocol") + (synopsis "Fever/NewsBlur/ownCloud/tt-RSS protocols for Elfeed") + (description + "Elfeed-protocol provides extra protocols to make self-hosting RSS +readers like Fever, NewsBlur, ownCloud News and Tiny TIny RSS work +with Elfeed.") + (license license:gpl3+))) + (define-public emacs-elfeed-score (package (name "emacs-elfeed-score") -- cgit v1.2.3 From 432d801ddee6e4bd03c9d0771d35ee81080e8f20 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Wed, 11 Nov 2020 00:39:58 -0600 Subject: gnu: Add emacs-ghq. * gnu/packages/emacs-xyz.scm (emacs-ghq): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8111aacba7..d87acbe508 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -141,6 +141,7 @@ #:use-module (gnu packages djvu) #:use-module (gnu packages ebook) #:use-module (gnu packages emacs) + #:use-module (gnu packages golang) #:use-module (gnu packages guile) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) @@ -939,6 +940,29 @@ Files with the @file{.graphql} and @file{.gql} extensions are automatically opened with this mode.") (license license:gpl3+)))) +(define-public emacs-ghq + (package + (name "emacs-ghq") + (version "0.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rcoedo/emacs-ghq") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628")))) + (build-system emacs-build-system) + (propagated-inputs + `(("ghq" ,ghq))) + (home-page "https://github.com/rcoedo/emacs-ghq") + (synopsis "Emacs interface for @code{ghq} tool") + (description + "This package provides a set of functions wrapping @code{ghq}, a tool for +organizing remote Go repository clones.") + (license license:gpl3+))) + (define-public emacs-ghub (package (name "emacs-ghub") -- cgit v1.2.3 From 8ec8fe0fcc155e0e3e0cc14a3b04b51c1a7ac10c Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Wed, 31 Mar 2021 01:57:05 +0300 Subject: gnu: Add lagrange. * gnu/packages/web-browsers.scm (lagrange): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/web-browsers.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 24bca093a6..8f0a3a97e0 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2021 Cage ;;; Copyright © 2021 Benoit Joly +;;; Copyright © 2021 Alexander Krotov ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,20 +65,24 @@ #:use-module (gnu packages image) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) + #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages mp3) #:use-module (gnu packages nano) #: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) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages webkit) @@ -717,6 +722,39 @@ key-bindings and is fully configurable and extensible in Common Lisp.") (define-public sbcl-next (deprecated-package "sbcl-next" nyxt)) +(define-public lagrange + (package + (name "lagrange") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" + "download/v" version "/lagrange-" version ".tar.gz")) + (sha256 + (base32 "1i05irmsvgrskhia71nl7vc9rbwmh2ylpbrm4pis85lrs4p7m3r0")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #false)) ;no tests + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libunistring" ,libunistring) + ("mpg123" ,mpg123) + ("openssl" ,openssl) + ("pcre" ,pcre) + ("sdl2" ,sdl2) + ("zlib" ,zlib))) + (home-page "https://gmi.skyjake.fi/lagrange/") + (synopsis "Graphical Gemini client") + (description + "Lagrange is a desktop GUI client for browsing Geminispace. It offers +modern conveniences familiar from web browsers, such as smooth scrolling, +inline image viewing, multiple tabs, visual themes, Unicode fonts, bookmarks, +history, and page outlines.") + (license license:bsd-2))) + (define-public gmni (let ((commit "d8f0870446c471a42612d6a8e853ad9b723a6d39") (revision "0")) -- cgit v1.2.3 From 2a624253bc55e2a94f6581d6e790303575436c96 Mon Sep 17 00:00:00 2001 From: LibreMiami Date: Sun, 11 Apr 2021 11:45:22 +0200 Subject: gnu: Add python-plumbum. * gnu/packages/python-xyz.scm (python-plumbum): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 30ad6b9435..582d1b678e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11614,6 +11614,30 @@ Pytest but stripped of Pytest specific details.") (propagated-inputs `(("python-importlib-metadata" ,python2-importlib-metadata-bootstrap)))))) +(define-public python-plumbum + (package + (name "python-plumbum") + (version "1.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "plumbum" version)) + (sha256 + (base32 "1kidj821k79dw064rlxh84xamb9h79ychg3pgj81jlvm5hs48xri")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;no tests + (native-inputs + ;; XXX: Not actually used since there are no tests but required for + ;; build. + `(("python-pytest" ,python-pytest))) + (home-page "https://plumbum.readthedocs.io") + (synopsis "Python shell combinators library") + (description + "Plumbum is a library of tools for replacing shell scripts with Python +code.") + (license license:expat))) + (define-public python-tox (package (name "python-tox") -- cgit v1.2.3 From 337011c567006c433d61778d13ce8311537fac6f Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 11 Apr 2021 12:13:39 +0200 Subject: gnu: Add abook. * gnu/packages/mail.scm (abook): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/mail.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 56fae3fcba..c8f29b80d6 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020, 2021 Alexey Abramov ;;; Copyright © 2020 Tim Gesthuizen -;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 divoplade @@ -167,6 +167,51 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) +(define-public abook + (package + (name "abook") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://abook.sourceforge.io/devel/abook-" version ".tar.gz")) + (sha256 + (base32 "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Fix "undefined reference to `field_id'" errors. + (add-after 'unpack 'fix-build-with-recent-gcc + (lambda _ + (substitute* '("database.c" "database.h") + (("^inline int" all) (string-append "extern " all))))) + ;; Fix following error during bootstrap: "gettext infrastructure + ;; mismatch: using a Makefile.in.in from gettext version 0.18 but the + ;; autoconf macros are from gettext version 0.20". + (add-before 'bootstrap 'fix-gettext-macro-version + (lambda _ + (substitute* "po/Makefile.in.in" + (("0.18") "0.20")))) + (replace 'bootstrap + (lambda _ + (invoke "aclocal") + (invoke "automake" "--add-missing") + (invoke "autoconf")))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal))) + (inputs + `(("ncurses" ,ncurses) + ("readline" ,readline))) + (home-page "https://abook.sourceforge.io/") + (synopsis "Text-based addressbook") + (description + "Abook is a text-based addressbook program designed to use with Mutt mail +client.") + (license license:gpl2))) + (define-public anubis (package (name "anubis") -- cgit v1.2.3 From 832e0be618e55366a275e9aae9e470039c1a2311 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 11 Apr 2021 14:20:42 +0200 Subject: gnu: emacs-posframe: Update to 1.0.0. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 1.0.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d87acbe508..529060889c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12650,14 +12650,14 @@ shuangpin, wubi and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.9.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "14x63713lbvmp24733j7pqkwvcnhpcgv7pprr8sykan3jnjnnzh3")))) + (base32 "1k06dbh9xqn2vix5qkcapl57v0c21b344r8dx6j5qr4jxirsn2x5")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit v1.2.3 From 098ae2f181d485b426d7f570b3a09a7c3ab784d7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 11 Apr 2021 14:20:48 +0200 Subject: gnu: emacs-ivy-posframe: Update to 0.6.0. * gnu/packages/emacs-xyz.scm (emacs-ivy-posframe): Update to 0.6.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 529060889c..4def3d802f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25629,14 +25629,14 @@ interface.") (define-public emacs-ivy-posframe (package (name "emacs-ivy-posframe") - (version "0.5.5") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "ivy-posframe-" version ".tar")) (sha256 - (base32 "184730grclxmlw6nfs41d4g6fvz9c6xnclvwgqx1ii0xm7p9xy95")))) + (base32 "07dzglrcdl54lkznyphw97xwd9bcwzdcgzkav0vqfk7f5cwh1wkf")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy) -- cgit v1.2.3 From 9d92819dbaa81fe9c93ab2b8ced7f0ba7f3b59fe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 11 Apr 2021 14:42:25 +0200 Subject: gnu: scintilla: Update to 5.0.1. * gnu/packages/text-editors.scm (scintilla): Update to 5.0.1. --- gnu/packages/text-editors.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 3af1aec94b..66d4f6c484 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -861,14 +861,14 @@ Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "4.4.6") + (version "5.0.1") (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 "1p62dq2fgdkvdn2clz1xjdj09acv87rbifl67zhlz7skqip31y9d")))) + (base32 "0w5550fijkhmzvdydd8770qq9dgnbq1sd0a8rn4g6mwyfpcyhbfy")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") @@ -888,7 +888,8 @@ Octave. TeXmacs is completely extensible via Guile.") (find-files "include/" ".")) #t)))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gcc" ,gcc-9) ;Code has C++17 requirements + ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs `(("gtk+" ,gtk+))) -- cgit v1.2.3 From 754a7608cc2f9758dc824361b3a8f66cb5d7178f Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 11 Apr 2021 13:10:15 +0100 Subject: gnu: Add python-pytest-httpserver. * gnu/packages/check.scm (python-pytest-httpserver): New variable. --- gnu/packages/check.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7c95ea6950..025e6df4f6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2020 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019, 2021 Pierre Langlois ;;; Copyright © 2019 Chris Marusich ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Brice Waegeneire @@ -1132,6 +1132,37 @@ supports coverage of subprocesses.") (define-public python2-pytest-cov (package-with-python2 python-pytest-cov)) +(define-public python-pytest-httpserver + (package + (name "python-pytest-httpserver") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest_httpserver" version)) + (sha256 + (base32 + "0vbls0j570l5my83j4jnk5blmnir44i0w511azlh41nl6k8rac5f")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-werkzeug" ,python-werkzeug))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-library-loading + (lambda _ + (setenv "PYTHONPATH" (string-append (getenv "PYTHONPATH") ":.")))) + (replace 'check + (lambda _ + (invoke "pytest" "tests" "-vv") + (invoke "pytest" "tests" "-vv" "--ssl")))))) + (home-page "https://github.com/csernazs/pytest-httpserver") + (synopsis "HTTP server for pytest") + (description "Pytest plugin library to test http clients without +contacting the real http server.") + (license license:expat))) + (define-public python-pytest-runner (package (name "python-pytest-runner") -- cgit v1.2.3 From fca8ef0d765f47faed88100e3c9734cfab3768cd Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 11 Apr 2021 13:24:03 +0100 Subject: gnu: gpodder: Update to 3.10.18. * gnu/packages/gpodder.scm (gpodder): Update to 3.10.18. [native-inputs]: Add python-pytest, python-pytest-cov, python-pytest-httpserver and which. [inputs]: Add python-requests. --- gnu/packages/gpodder.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 44c356e2ff..c4dc50c2f9 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2020 Pierre Langlois +;;; Copyright © 2019, 2020, 2021 Pierre Langlois ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -25,6 +25,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -38,7 +39,7 @@ (define-public gpodder (package (name "gpodder") - (version "3.10.17") + (version "3.10.18") (source (origin (method git-fetch) @@ -46,18 +47,23 @@ (url "https://github.com/gpodder/gpodder") (commit version))) (sha256 - (base32 "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd")) + (base32 "1d73q46sqandzbn74nfw9bzzah99z91wsxq2hcivwdgnsv2g2d8y")) (file-name (git-file-name name version)) (patches (search-patches "gpodder-disable-updater.patch")))) (build-system python-build-system) (native-inputs `(("intltool" ,intltool) ("python-coverage" ,python-coverage) - ("python-minimock" ,python-minimock))) + ("python-minimock" ,python-minimock) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-httpserver" ,python-pytest-httpserver) + ("which" ,which))) (inputs `(("gtk+" ,gtk+) ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) + ("python-requests" ,python-requests) ("python-dbus" ,python-dbus) ("python-html5lib" ,python-html5lib) ("python-mygpoclient" ,python-mygpoclient) -- cgit v1.2.3 From 3281ba6eae1ead32b5146cfe6af4479dbb72593a Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 3 Apr 2021 17:08:10 +0200 Subject: gnu: lksctp-tools: Fix build of include file. * gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch: New file. * gnu/local.mk[patches]: Add it. * gnu/packages/networking.scm(/lksctp-tools)[source]: Use this patch. --- gnu/local.mk | 1 + gnu/packages/networking.scm | 2 ++ .../lksctp-tools-1.0.18-fix-header-file-name.patch | 32 ++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8365e19b02..5c1ce07013 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1266,6 +1266,7 @@ dist_patch_DATA = \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ + %D%/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7f8c68e7dc..5fe9ec26db 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -448,6 +448,8 @@ performance across unpredictable networks, such as the Internet.") (url "https://github.com/sctp/lksctp-tools") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches + (search-patches "lksctp-tools-1.0.18-fix-header-file-name.patch")) (sha256 (base32 "1x4fwzrlzvfa3vcpja97m8w5g9ir2zrh4zs7zksminrnmdrs0dsr")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch b/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch new file mode 100644 index 0000000000..1ebe6c803d --- /dev/null +++ b/gnu/packages/patches/lksctp-tools-1.0.18-fix-header-file-name.patch @@ -0,0 +1,32 @@ +From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001 +From: Xin Long +Date: Fri, 24 Aug 2018 01:13:32 +0800 +Subject: [PATCH] build: fix netinet/sctp.h not to be installed + +After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can +no longer be installed into ${includedir}. + +Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already +added into configure.ac, there's no need to generate sctp.h by +automake. + +So we simply set libcnetinet_HEADERS back to sctp.h. + +Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup") +Signed-off-by: Xin Long +Signed-off-by: Marcelo Ricardo Leitner +--- + src/include/netinet/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am +index ca0aac2..965db8c 100644 +--- a/src/include/netinet/Makefile.am ++++ b/src/include/netinet/Makefile.am +@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet + # API. + include_HEADERS = + +-libcnetinet_HEADERS = sctp.h.in +-BUILT_SOURCES = sctp.h ++libcnetinet_HEADERS = sctp.h -- cgit v1.2.3 From 03e80cf42240f65346713ff414eb2ca628ef0884 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 3 Apr 2021 17:12:45 +0200 Subject: gnu: Add python-pysctp. * gnu/packages/networking.scm(python-pysctp): New variable. --- gnu/packages/networking.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5fe9ec26db..f7557fc331 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 Jesse Dowell ;;; Copyright © 2020 Hamzeh Nasajpour ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -473,6 +474,38 @@ sockets, and also some helper utilities around SCTP.") ;; Others. license:gpl2+)))) +(define-public python-pysctp + (package + (name "python-pysctp") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pysctp" version)) + (sha256 + (base32 "14h2qlmfi24bizhvvqkfqfa78pzm3911ibrzy9k94i97xy1978dy")))) + (build-system python-build-system) + (inputs + `(("lksctp-tools" ,lksctp-tools))) + (arguments + `(#:tests? #f ;; tests require network + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-setup.py + (lambda _ + (substitute* "setup.py" + (("include_dirs\\s*=.*") + (string-append "include_dirs = ['.'] + '" + (getenv "C_INCLUDE_PATH") "'.split(':'),")) + (("library_dirs\\s*=.*") + (string-append "library_dirs = '" + (getenv "LIBRARY_PATH") "'.split(':'),")))))))) + (home-page "https://github.com/p1sec/pysctp") + (synopsis "Python module for the SCTP protocol stack and library") + (description "@code{pysctp} implements the SCTP socket API. You need a +SCTP-aware kernel (most are).") + (license license:lgpl2.1+))) + (define-public knockd (package (name "knockd") -- cgit v1.2.3 From 96feb7515e3c75e7e8e5f51d91a3c6d1bf1c36f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Apr 2021 16:30:10 +0200 Subject: gnu: librsync: Update to 2.3.2. * gnu/packages/rsync.scm (librsync): Update to 2.3.2. --- gnu/packages/rsync.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index f90feaf57f..37b15663b9 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013 Andreas Enge ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2017, 2019 Efraim Flashner -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2020 Vincent Legoll ;;; @@ -71,7 +71,7 @@ files in the destination.") (define-public librsync (package (name "librsync") - (version "2.3.1") + (version "2.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -80,7 +80,7 @@ files in the destination.") (file-name (git-file-name name version)) (sha256 (base32 - "131cd4asmpm4nskidzgiy8xibbnpibvvbq857a0pcky77min5g4z")))) + "0bn29npmbw26akc6y54661irpdh6qcivcs6q48cgp3llklhhxp0q")))) (build-system cmake-build-system) (inputs `(("popt" ,popt))) -- cgit v1.2.3 From 50ad53c71149ce72397e2f2c3709a5f462f79f59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Apr 2021 16:36:24 +0200 Subject: gnu: python-skyfield: Update to 1.38. * gnu/packages/astronomy.scm (python-skyfield): Update to 1.38. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 9efb12dc01..4660e141a4 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1011,13 +1011,13 @@ astronomical images, especially when there is no WCS information available.") (define-public python-skyfield (package (name "python-skyfield") - (version "1.36") + (version "1.38") (source (origin (method url-fetch) (uri (pypi-uri "skyfield" version)) (sha256 - (base32 "1dm1327a4qv3klj9blrvddbhl72v1fqz52ym9km8qjj9vdkpywh6")))) + (base32 "1qi1l8qn6irdv6w41qq30s2yjwak7h6ayywr1pry9gwcm2c25bv5")))) (build-system python-build-system) (arguments ;; NOTE: (Sharlatan-20210207T163305+0000): tests depend on custom test -- cgit v1.2.3 From 4ebf6ccb3ecf2996ce5bb8719c2c851298833f19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Apr 2021 17:18:50 +0200 Subject: gnu: acpica: Update to 20210331. * gnu/packages/admin.scm (acpica): Update to 20210331. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 06fc6baa46..c08f5dad27 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1995,7 +1995,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (define-public acpica (package (name "acpica") - (version "20210105") + (version "20210331") (source (origin (method url-fetch) (uri (string-append @@ -2003,7 +2003,7 @@ module slots, and the list of I/O ports (e.g. serial, parallel, USB).") version ".tar.gz")) (sha256 (base32 - "1gi7qzfywg118g5nlqn5lawxk25pg2sz01gmbz40vvmikks4ri9r")))) + "1h98pvc9iy1c49cid0ppjwk5zsy2m1xbvfqb72pkwkrd4rn35arx")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) ("bison" ,bison))) -- cgit v1.2.3 From d286ea6d5b67aac58fc92acece49da64f2a64113 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Apr 2021 23:39:17 +0200 Subject: gnu: libime: Update to 1.0.6. * gnu/packages/fcitx5.scm (libime): Update to 1.0.6. --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 5b83844a41..a01eacb7cb 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -172,14 +172,14 @@ client.") (define-public libime (package (name "libime") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-" version "_dict.tar.xz")) (sha256 - (base32 "1w3cxk11kbfmz7snivxq948zfav6dy2245j12ghlxcmdxjshrlhq")))) + (base32 "1s8gzpzyn16pg9gm7kw1nhl09drdndi6j4mjam14ymqsrfsdqr1r")))) (build-system cmake-build-system) (inputs `(("fcitx5" ,fcitx5) -- cgit v1.2.3 From 9d7577d5d808b6091ccecf6abb8b37b0dbe828b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Apr 2021 23:46:30 +0200 Subject: gnu: edgar: Update to 1.34. * gnu/packages/games.scm (edgar): Update to 1.34. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3e35479aae..150792bca5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8740,7 +8740,7 @@ where the player draws runes in real time to effect the desired spell.") (define-public edgar (package (name "edgar") - (version "1.33") + (version "1.34") (source (origin (method url-fetch) @@ -8748,7 +8748,7 @@ where the player draws runes in real time to effect the desired spell.") (string-append "https://github.com/riksweeney/edgar/releases/download/" version "/edgar-" version "-1.tar.gz")) (sha256 - (base32 "1mbx7dvizdca4g1blcv3bdh6yxd13k47rkya4rdzg0nvvz24m175")))) + (base32 "1121rq5wk3g8rs413av84s2kcy6qj6maspgy2vsxs36c2jd3yygl")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; there are no tests #:make-flags -- cgit v1.2.3 From 40707f2e0bd3ea78b008f0db22999c7b57b09345 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Apr 2021 23:55:17 +0200 Subject: gnu: irssi: Update to 1.2.3. * gnu/packages/irc.scm (irssi): Update to 1.2.3. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 5fba72b576..3953c55a20 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -144,7 +144,7 @@ irssi, but graphical.") (define-public irssi (package (name "irssi") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/irssi/irssi/" @@ -152,7 +152,7 @@ irssi, but graphical.") version ".tar.xz")) (sha256 (base32 - "0y3mhnyr7x8ir8dlj83vbnchpfld28vdfni9yhpvls45j460c9v7")))) + "17vninwcdfxw39xl2q55qircckckjk2xlvkvlwgj5lhlxppvyix6")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5661cdce257a6c62468f10f4d3166c863916851f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 11 Apr 2021 23:59:37 +0200 Subject: gnu: lagrange: Update to 1.3.2. * gnu/packages/web-browsers.scm (lagrange): Update to 1.3.2. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 8f0a3a97e0..cff761a344 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -725,7 +725,7 @@ key-bindings and is fully configurable and extensible in Common Lisp.") (define-public lagrange (package (name "lagrange") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) @@ -733,7 +733,7 @@ key-bindings and is fully configurable and extensible in Common Lisp.") (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" "download/v" version "/lagrange-" version ".tar.gz")) (sha256 - (base32 "1i05irmsvgrskhia71nl7vc9rbwmh2ylpbrm4pis85lrs4p7m3r0")))) + (base32 "14yj3l3h6i6ygdhyiwdg2cg6y5imlkql09r7dm5v7xm1ja0sr9lp")))) (build-system cmake-build-system) (arguments `(#:tests? #false)) ;no tests -- cgit v1.2.3 From 1135b347db1ee64fda4cad618dd51baddb621f9e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Apr 2021 00:03:15 +0200 Subject: gnu: ghq: Update to 1.1.7. * gnu/packages/version-control.scm (ghq): Update to 1.1.7. --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e7fa6e6777..ebddd9522a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3024,7 +3024,7 @@ If several repos are related, it helps to see their status together.") (define-public ghq (package (name "ghq") - (version "1.1.5") + (version "1.1.7") (home-page "https://github.com/x-motemen/ghq") (source (origin (method git-fetch) @@ -3034,7 +3034,7 @@ If several repos are related, it helps to see their status together.") (file-name (git-file-name name version)) (sha256 (base32 - "098fik155viylq07az7crzbgswcvhpx0hr68xpvyx0rpri792jbq")))) + "155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh")))) (build-system go-build-system) (arguments '(#:install-source? #f -- cgit v1.2.3 From e737e74ec0d739f16d41343c4f787d0b9155955b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Apr 2021 00:24:00 +0200 Subject: gnu: minetest: Update to 5.4.1. * gnu/packages/games.scm (minetest, minetest-data): Update to 5.4.1. --- gnu/packages/games.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 150792bca5..dbc72446b2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3454,7 +3454,7 @@ match, cannon keep, and grave-itation pit.") (define-public minetest (package (name "minetest") - (version "5.4.0") + (version "5.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -3463,7 +3463,7 @@ match, cannon keep, and grave-itation pit.") (file-name (git-file-name name version)) (sha256 (base32 - "1a17g6cmxrscnqwpwrd4w2ck3dgvplyfq4kzyimilfpqar1q69j9")) + "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8")) (modules '((guix build utils))) (snippet '(begin @@ -3551,7 +3551,7 @@ in different ways.") (file-name (git-file-name name version)) (sha256 (base32 - "11dz36z0pj2r7i8xm8v5lskzws81ckj6sc0avlmvdl8qdc9x83w5")))) + "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) -- cgit v1.2.3 From 9b34c9167b4df1beee0e38138da1004b75803d65 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Apr 2021 00:51:49 +0200 Subject: gnu: python-fastimport: Update to 0.9.9. * gnu/packages/python-xyz.scm (python-fastimport): Update to 0.9.9. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 582d1b678e..7a3e30371f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13289,13 +13289,13 @@ graphviz.") (define-public python-fastimport (package (name "python-fastimport") - (version "0.9.8") + (version "0.9.9") (source (origin (method url-fetch) (uri (pypi-uri "fastimport" version)) (sha256 - (base32 "1fb3b7y3sw55f6wykxx478ybkirz0l52lgdqmbhmc0h0jzmyiwmj")))) + (base32 "06gk14qgm9dxx3pzjn0ckdbywc8ial2bjfzddqwlr4bn1nnqkbll")))) (build-system python-build-system) (home-page "https://github.com/jelmer/python-fastimport") (synopsis "VCS fastimport parser and generator in Python") -- cgit v1.2.3 From f5898781e24c86aa6fcf6eb81db813f4cdb060f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Apr 2021 01:24:46 +0200 Subject: gnu: python-cython: Update to 0.29.22. * gnu/packages/python-xyz.scm (python-cython): Update to 0.29.22. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7a3e30371f..bdb127935a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4481,14 +4481,13 @@ provides additional functionality on the produced Mallard documents.") (define-public python-cython (package (name "python-cython") - (version "0.29.21") + (version "0.29.22") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 - (base32 - "1bcwpra7c6k30yvic3sw2v3rq2dr40ypc4zqif6kr52mpn4wnyp5")))) + (base32 "01jl3544qwsi8lp6anbl55566xqkjd53x452i7m6gnfilv3q6syz")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so -- cgit v1.2.3 From ed3ef756f521a0df8596a88b66f65b7a1ad99252 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 10 Dec 2020 14:47:10 -0500 Subject: gnu: Syncthing: Update to 1.15.1 [fixes CVE-2021-21404]. * gnu/packages/syncthing.scm (syncthing): Update to 1.15.1. [source]: Use bundled dependencies. [inputs]: Remove field. [arguments]: Adjust the custom 'build' and 'install' phases for 1.15.1. Signed-off-by: Leo Famulari --- gnu/packages/syncthing.scm | 74 +++++++--------------------------------------- 1 file changed, 10 insertions(+), 64 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index eb6cb7b4e3..e800aebda7 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Petter -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Giacomo Leidi @@ -44,7 +44,9 @@ (define-public syncthing (package (name "syncthing") - (version "1.5.0") + (version "1.15.1") + ; XXX After the go-build-system can use "Go modules", stop using bundled + ; dependenices for Syncthing. (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -52,68 +54,12 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "1394b8y4nllihnjngc0kjpdy7pvyh6v1h09hkn8rdmwxpsdkqkjb")) - (modules '((guix build utils))) - ;; Delete bundled ("vendored") free software source code. - (snippet '(begin - (delete-file-recursively "vendor") - #t)))) + "04b90zwinl7frxrpjliq41mkbhpnkszmhdc5j2vbqwyhd82warxq")))) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size ;; of "out" by ~80 MiB. (outputs '("out" "utils")) - ;; When updating Syncthing, check 'go.mod' in the source distribution to - ;; ensure we are using the correct versions of these dependencies. - (inputs - `(("go-github-com-jackpal-go-nat-pmp" - ,go-github-com-jackpal-go-nat-pmp) - ("go-github-com-bkaradzic-go-lz4" ,go-github-com-bkaradzic-go-lz4) - ("go-github-com-calmh-xdr" ,go-github-com-calmh-xdr) - ("go-github-com-chmduquesne-rollinghash" - ,go-github-com-chmduquesne-rollinghash) - ("go-github-com-gobwas-glob" ,go-github-com-gobwas-glob) - ("go-github-com-golang-groupcache-lru" - ,go-github-com-golang-groupcache-lru) - ("go-github-com-jackpal-gateway" ,go-github-com-jackpal-gateway) - ("go-github-com-kballard-go-shellquote" - ,go-github-com-kballard-go-shellquote) - ("go-github-com-lib-pq" ,go-github-com-lib-pq) - ("go-github-com-minio-sha256-simd" ,go-github-com-minio-sha256-simd) - ("go-github-com-oschwald-geoip2-golang" - ,go-github-com-oschwald-geoip2-golang) - ("go-github-com-pkg-errors" ,go-github-com-pkg-errors) - ("go-github-com-rcrowley-go-metrics" ,go-github-com-rcrowley-go-metrics) - ("go-github-com-sasha-s-go-deadlock" ,go-github-com-sasha-s-go-deadlock) - ("go-github-com-syncthing-notify" ,go-github-com-syncthing-notify) - ("go-github-com-syndtr-goleveldb" ,go-github-com-syndtr-goleveldb) - ("go-github-com-thejerf-suture" ,go-github-com-thejerf-suture) - ("go-golang-org-x-time" ,go-golang-org-x-time) - ("go-github-com-go-ldap-ldap" ,go-github-com-go-ldap-ldap) - ("go-github-com-gogo-protobuf" ,go-github-com-gogo-protobuf) - ("go-github-com-shirou-gopsutil" ,go-github-com-shirou-gopsutil) - ("go-github-com-prometheus-client-golang" - ,go-github-com-prometheus-client-golang) - ("go-golang-org-x-net" ,go-golang-org-x-net) - ("go-golang-org-x-text" ,go-golang-org-x-text) - ("go-github-com-audriusbutkevicius-recli" - ,go-github-com-audriusbutkevicius-recli) - ("go-github-com-urfave-cli" ,go-github-com-urfave-cli) - ("go-github-com-vitrun-qart" ,go-github-com-vitrun-qart) - ("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty) - ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) - ("go-github-com-flynn-archive-go-shlex" - ,go-github-com-flynn-archive-go-shlex) - ("go-github-com-getsentry-raven-go" ,go-github-com-getsentry-raven-go) - ("go-github-com-maruel-panicparse" ,go-github-com-maruel-panicparse) - ("go-github-com-ccding-go-stun" ,go-github-com-ccding-go-stun) - ("go-github-com-audriusbutkevicius-pfilter" ,go-github-com-audriusbutkevicius-pfilter) - ("go-github-com-lucas-clemente-quic-go" ,go-github-com-lucas-clemente-quic-go) - ("go-github-com-willf-bloom" ,go-github-com-willf-bloom) - - ;; For tests. - ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) - (arguments `(#:modules ((srfi srfi-26) ; for cut (guix build utils) @@ -136,8 +82,8 @@ ;; updater and to build the utilities is to "build all" and then ;; "build syncthing" again with -no-upgrade. ;; https://github.com/syncthing/syncthing/issues/6118 - (invoke "go" "run" "build.go" "build" "all") - (delete-file "syncthing") + (invoke "go" "run" "build.go") + (delete-file "bin/syncthing") (invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing")))) (replace 'check @@ -149,10 +95,10 @@ (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (utils (assoc-ref outputs "utils"))) - (with-directory-excursion "src/github.com/syncthing/syncthing" - (install-file "syncthing" (string-append out "/bin")) + (with-directory-excursion "src/github.com/syncthing/syncthing/bin" + (install-file "../syncthing" (string-append out "/bin")) (for-each (cut install-file <> (string-append utils "/bin/")) - '("stcli" "stcompdirs" "stcrashreceiver" + '("stcompdirs" "stcrashreceiver" "stdisco" "stdiscosrv" "stevents" "stfileinfo" "stfinddevice" "stfindignored" "stgenfiles" "stindex" "strelaypoolsrv" "strelaysrv" "stsigtool" -- cgit v1.2.3 From bceca1ff58cbf8d26b701b70c3e129f727d81b8e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 12 Apr 2021 09:50:54 +0200 Subject: gnu: Add python-allpairspy. * gnu/packages/python-check.scm (python-allpairspy): New variable. --- gnu/packages/python-check.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 961d245630..bde836a931 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Brendan Tildesley +;;; Copyright © 2021 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -1310,3 +1311,26 @@ help in debugging failures and optimizing the scheduler to improve speed.") (description "A pytest plugin for Sanic. It helps you to test your code asynchronously.") (license license:expat))) + +(define-public python-allpairspy + (package + (name "python-allpairspy") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "allpairspy" version)) + (sha256 + (base32 "1c987h13dly9919d15w3h747rgn50ilnv7dginhlprxbj564hn4k")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://github.com/thombashi/allpairspy") + (synopsis "Pairwise test combinations generator") + (description + "This is a Python library for test combinations generator. The generator +allows one to create a set of tests using @emph{pairwise combinations} method, +reducing a number of combinations of variables into a lesser set that covers +most situations.") + (license license:expat))) -- cgit v1.2.3 From 5c1f6735544fd049fee7ddd6002a546574fe3d09 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 12 Apr 2021 10:12:09 +0200 Subject: gnu: Add python-pathvalidate. * gnu/packages/python-xyz.scm (python-pathvalidate): New variable. --- gnu/packages/python-xyz.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bdb127935a..4754db6e6f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -60,7 +60,7 @@ ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019 Sam ;;; Copyright © 2019 Jack Hill -;;; Copyright © 2019, 2020 Guillaume Le Vaillant +;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald @@ -24484,3 +24484,31 @@ apply various transformations to plain text in order to yield typographically-improved HTML. While often used in conjunction with Jinja and Django template systems, the filters can be used in any environment.") (license license:bsd-3))) + +(define-public python-pathvalidate + (package + (name "python-pathvalidate") + (version "2.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pathvalidate" version)) + (sha256 + (base32 "0s14ycjgb44lxr2wg8lrq3b7kybmmrbf7yqz47xrqgn2gr6dk6rw")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) + ;; Tests disabled because of circular dependencies. + ;; pathvalidate tests depend on pytest-md-report, which + ;; depends on pathvalidate. + (native-inputs + `(("python-allpairspy" ,python-allpairspy) + ("python-click" ,python-click) + ("python-faker" ,python-faker) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/thombashi/pathvalidate") + (synopsis "Sanitize strings representing paths") + (description + "@code{pathvalidate} is a Python library to sanitize/validate strings +representing paths or filenames.") + (license license:expat))) -- cgit v1.2.3 From c901ec27d7e437c200f04263c1cdccdcd864956c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 12 Apr 2021 10:16:07 +0200 Subject: gnu: electron-cash: Add missing input. Fixes . * gnu/packages/finance.scm (electron-cash)[inputs]: Add python-pathvalidate. --- gnu/packages/finance.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f18438bc88..2d5c1c737e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -601,6 +601,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ("python-hidapi" ,python-hidapi) ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix) ("python-keepkey" ,python-keepkey) + ("python-pathvalidate" ,python-pathvalidate) ("python-protobuf" ,python-protobuf) ("python-pyaes" ,python-pyaes) ("python-pyqt" ,python-pyqt) -- cgit v1.2.3 From 8799369983315d799501b4f45a3954195b630ebb Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 8 Apr 2021 09:02:20 -0400 Subject: gnu: newlib-nano: Fix nano lib and header paths. * gnu/packages/embedded.scm (newlib-nano-arm-none-eabi)[arguments]: Hard link library files from *.a to *_nano.a. Hard link newlib.h to a common location. Signed-off-by: Efraim Flashner --- gnu/packages/embedded.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index a3f1d85580..480bbf7835 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2021 Julien Lepiller +;;; Copyright © 2021 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -229,7 +230,41 @@ usable on embedded products.") "--enable-lite-exit" "--enable-newlib-global-atexit" "--enable-newlib-nano-formatted-io" - "--disable-nls")))) + "--disable-nls")) + ((#:phases phases) + `(modify-phases ,phases + ;; XXX: Most arm toolchains offer both *.a and *_nano.a as newlib + ;; and newlib-nano respectively. The headers are usually + ;; arm-none-eabi/include/newlib.h for newlib and + ;; arm-none-eabi/include/newlib-nano/newlib.h for newlib-nano. We + ;; have two different toolchain packages for each which works but + ;; is a little strange. + (add-after 'install 'hardlink-newlib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The nano.specs file says that newlib-nano files should end + ;; in "_nano.a" instead of just ".a". Note that this applies + ;; to all the multilib folders too. + (for-each + (lambda (file) + (link file + (string-append + ;; Strip ".a" off the end + (substring file 0 (- (string-length file) 2)) + ;; Add "_nano.a" onto the end + "_nano.a"))) + (find-files + out + "^(libc.a|libg.a|librdimon.a|libstdc\\+\\+.a|libsupc\\+\\+.a)$")) + + ;; newlib.h is usually in this location instead so both + ;; newlib and newlib-nano can be in the toolchain at the same + ;; time + (mkdir (string-append out "/arm-none-eabi/include/newlib-nano")) + (symlink + "../newlib.h" + (string-append out "/arm-none-eabi/include/newlib-nano/newlib.h")) + #t))))))) (synopsis "Newlib variant for small systems with limited memory"))) -- cgit v1.2.3 From 3c1cfd7d320dfe1af147044c88e2554356bc1257 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 12 Apr 2021 10:46:22 +0200 Subject: gnu: monero: Update to 0.17.2.0. * gnu/packages/finance.scm (monero): Update to 0.17.2.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 2d5c1c737e..613d0633e1 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -652,7 +652,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ;; the system's dynamically linked library. (package (name "monero") - (version "0.17.1.9") + (version "0.17.2.0") (source (origin (method git-fetch) @@ -672,7 +672,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch "external/unbound")) #t)) (sha256 - (base32 "0jqss4csvkcrhrmaa3vrnyv6yiwqpbfw7037clx9xcfm4qrrfiwy")))) + (base32 "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 05aa5f9f39d86f2e322246b33fa9542c97814af2 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 12 Apr 2021 11:16:43 +0200 Subject: gnu: monero-gui: Update to 0.17.2.0. * gnu/packages/finance.scm (monero-gui): Update to 0.17.2.0. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 613d0633e1..f8d15b8856 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -762,7 +762,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.17.1.9") + (version "0.17.2.0") (source (origin (method git-fetch) @@ -779,7 +779,7 @@ the Monero command line client and daemon.") (delete-file-recursively "monero") #t)) (sha256 - (base32 "0vpvpvsbbj547yir15g84qy9l9lwbip795zlliz79i7d66l23b1w")))) + (base32 "17il26gh0g69x7lqkyb461x1712959wajg3iadx0p08djr3m13mf")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) -- cgit v1.2.3 From fc37346ff493de7781107c7c3e75863ca7419e2b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 12 Apr 2021 10:26:37 +0200 Subject: ci: Fix system-tests subset. * gnu/ci.scm (system-test-jobs): Make sure that "all-system-tests" is also covered by the "current-guix-package" parameter. --- gnu/ci.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index ff76ffde57..5ab1b51d82 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -317,25 +317,25 @@ SYSTEM." #:key source commit) "Return a list of jobs for the system tests." (define (->job test) - (parameterize ((current-guix-package - (channel-source->package source #:commit commit))) - (let ((name (string-append "test." (system-test-name test) - "." system)) - (drv (run-with-store store - (mbegin %store-monad - (set-current-system system) - (set-grafting #f) - (set-guile-for-build (default-guile)) - (system-test-value test))))) + (let ((name (string-append "test." (system-test-name test) + "." system)) + (drv (run-with-store store + (mbegin %store-monad + (set-current-system system) + (set-grafting #f) + (set-guile-for-build (default-guile)) + (system-test-value test))))) - (derivation->job name drv)))) + (derivation->job name drv))) (if (member system %guix-system-supported-systems) ;; Override the value of 'current-guix' used by system tests. Using a ;; channel instance makes tests that rely on 'current-guix' less ;; expensive. It also makes sure we get a valid Guix package when this ;; code is not running from a checkout. - (map ->job (all-system-tests)) + (parameterize ((current-guix-package + (channel-source->package source #:commit commit))) + (map ->job (all-system-tests))) '())) (define (tarball-jobs store system) -- cgit v1.2.3 From 969adb235ee34decb65255e1ea821ff0e221ed3d Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Wed, 7 Apr 2021 18:51:23 -0400 Subject: gnu: blis: Update to 0.8.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (make-blis): Remove internal function. Inline into ... (bliss): ... this variable. Update to 0.8.1. [native-inputs]: Add "python" and "perl". [arguments]: Adjust 'configure' phase to take advantage of new support for "configuration families" with runtime hardware detection. Select configuration automatically based on target systems, and allow "--blis-config=" in #:configure-flags to override the default. When building for x86_64, include all supported microarchetecture specializations. Add "--enable-verbose-make" configure flag for better build logs. Stop ignoring other flags from #:configure-flags. Remove explicit #:substitutable? argument: the package is now always substitutable. Add (srfi srfi-1) to #:modules. (blis/x86_64): Remove internal macro. (blis-sandybridge): Remove package: included in 'blis'. (blis-haswell): Remove package: included in 'blis'. (blis-knl): Remove package: included in 'blis'. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 142 +++++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 63 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c1c29bc1d3..15eb0d9ee1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Gerd Heber ;;; Copyright © 2021 Franck Pérignon +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -3825,52 +3826,94 @@ parts of it.") (synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)") (license license:bsd-3))) -(define* (make-blis implementation #:optional substitutable?) - "Return a BLIS package with the given IMPLEMENTATION (see config/ in the -source tree for a list of implementations.) - -SUBSTITUTABLE? determines whether the package is made available as a -substitute. - -Currently the specialization must be selected at configure-time, but work is -underway to allow BLIS to select the right optimized kernels at run time: -." +(define-public blis (package - (name (if (string=? implementation "reference") - "blis" - (string-append "blis-" implementation))) - (version "0.2.2") + (name "blis") + (version "0.8.1") (home-page "https://github.com/flame/blis") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) (sha256 (base32 - "1wr79a50nm4abhw8w3sn96nmwp5mrzifcigk7khw9qcgyyyqayfh")) + "05ifil6jj9424sr8kmircl8k4bmxnl3y12a79vwj1kxxva5gz50g")) (file-name (git-file-name "blis" version)))) + (native-inputs + `(("python" ,python) + ("perl" ,perl))) (build-system gnu-build-system) (arguments - `(#:test-target "test" - - #:substitutable? ,substitutable? - - #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This is a home-made 'configure' script. - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" "-p" out - "-d" "opt" - "--disable-static" - "--enable-shared" - "--enable-threading=openmp" - - ,implementation)))) - (add-before 'check 'show-test-output - (lambda _ - ;; By default "make check" is silent. Make it verbose. - (system "tail -F output.testsuite &") - #t))))) + `(#:modules + ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs + target + system + (configure-flags '()) + #:allow-other-keys) + ;; This is a home-made 'configure' script. + (let* ((out (assoc-ref outputs "out")) + ;; Guix-specific support for choosing the configuration + ;; via #:configure-flags: see below for details. + (config-flag-prefix "--blis-config=") + (maybe-config-flag (find + (lambda (s) + (string-prefix? config-flag-prefix s)) + configure-flags)) + (configure-flags (if maybe-config-flag + (delete maybe-config-flag + configure-flags) + configure-flags)) + ;; Select the "configuration" to build. + ;; The "generic" configuration is non-optimized but + ;; portable (no assembly). + ;; The "x86_64" configuration family includes + ;; sub-configurations for all supported + ;; x86_64 microarchitectures. + ;; BLIS currently lacks runtime hardware detection + ;; for other architectures: see + ;; . + ;; Conservatively, we stick to "generic" on armhf, + ;; aarch64, and ppc64le for now. (But perhaps + ;; "power9", "cortexa9", and "cortexa57" might be + ;; general enough to use?) + ;; Another approach would be to use the "auto" + ;; configuration and make this package + ;; non-substitutable. + ;; The build is fairly intensive, though. + (blis-config + (cond + (maybe-config-flag + (substring maybe-config-flag + (string-length config-flag-prefix))) + ((string-prefix? "x86_64" (or target system)) + "x86_64") + (else + "generic"))) + (configure-args + `("-p" ,out + "-d" "opt" + "--disable-static" + "--enable-shared" + "--enable-threading=openmp" + "--enable-verbose-make" + ,@configure-flags + ,blis-config))) + (format #t "configure args: ~s~%" configure-args) + (apply invoke + "./configure" + configure-args) + #t))) + (add-before 'check 'show-test-output + (lambda _ + ;; By default "make check" is silent. Make it verbose. + (system "tail -F output.testsuite &") + #t))))) (synopsis "High-performance basic linear algebra (BLAS) routines") (description "BLIS is a portable software framework for instantiating high-performance @@ -3882,35 +3925,8 @@ it also includes a BLAS compatibility layer which gives application developers access to BLIS implementations via traditional BLAS routine calls.") (license license:bsd-3))) -(define-public blis - ;; This is the "reference" implementation, which is the non-optimized but - ;; portable variant (no assembly). - (make-blis "reference" #t)) - (define ignorance blis) -(define-syntax-rule (blis/x86_64 processor) - "Expand to a package specialized for PROCESSOR." - (package - (inherit (make-blis processor)) - (supported-systems '("x86_64-linux")))) - -(define-public blis-sandybridge - ;; BLIS specialized for Sandy Bridge processors (launched 2011): - ;; . - (blis/x86_64 "sandybridge")) - -(define-public blis-haswell - ;; BLIS specialized for Haswell processors (launched 2013): - ;; . - (blis/x86_64 "haswell")) - -(define-public blis-knl - ;; BLIS specialized for Knights Landing processor (launched 2016): - ;; . - (blis/x86_64 "knl")) - - (define-public openlibm (package (name "openlibm") -- cgit v1.2.3 From f67663d6694c20eefe006dd8910008defbbcb2d3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 12 Apr 2021 12:37:19 +0200 Subject: gnu: blis: Add deprecated aliases. Add deprecated aliases for packages removed in the parent commit. * gnu/packages/maths.scm (blis-sandybridge, blis-haswell, blis-knl): New variables. --- gnu/packages/maths.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 15eb0d9ee1..758f0a5c32 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3925,6 +3925,10 @@ it also includes a BLAS compatibility layer which gives application developers access to BLIS implementations via traditional BLAS routine calls.") (license license:bsd-3))) +(define-public blis-sandybridge (deprecated-package "blis-sandybridge" blis)) +(define-public blis-haswell (deprecated-package "blis-haswell" blis)) +(define-public blis-knl (deprecated-package "blis-knl" blis)) + (define ignorance blis) (define-public openlibm -- cgit v1.2.3 From b9986cac3ed33cfa9455fc8a27738d2342d3aa45 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Thu, 8 Apr 2021 21:26:23 +0200 Subject: gnu: Add prips. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gnu/packages/admin.scm (prips): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c08f5dad27..512ac320e6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Hyunseok Kim +;;; Copyright © 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -1051,6 +1052,36 @@ recursive runs on the generated subnets. (also IPv6) @end itemize\n") (license license:bsd-3))) +(define-public prips + (package + (name "prips") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://devel.ringlet.net/files/sys/" + name "/" name "-" version ".tar.xz")) + (sha256 + (base32 "1a33vbl4w603mk6mm5r3vhk87fy3dfk5wdpch0yd3ncbkg3fmvqn")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "CC=" ,(cc-for-target))) + #:test-target "test" + #:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "prips" + (string-append out "/bin")))))))) + (native-inputs `(("perl-test-harness" ,perl-test-harness))) + (synopsis "Tool that prints the IP addresses in a given range") + (description "Prips can be used to print all of the IP addresses in + a given range. This allows the enhancement of tools only work + on one host at a time (e.g. whois).") + (home-page "https://devel.ringlet.net/sysutils/prips/") + (license license:gpl2+))) + (define-public alive (package (name "alive") -- cgit v1.2.3 From f890bf63920c2ab810329af40d2c1516cc2a3a7b Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Wed, 31 Mar 2021 11:00:31 +0200 Subject: gnu: nginx: Enable stream module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (nginx)[arguments]: Add --with-stream option in the 'configure phase. Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bb5196b9f2..2331601ce7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -397,6 +397,7 @@ the same, being completely separated from the Internet.") "--with-http_v2_module" "--with-pcre-jit" "--with-debug" + "--with-stream" ;; Even when not cross-building, we pass the ;; --crossbuild option to avoid customizing for the ;; kernel version on the build machine. -- cgit v1.2.3 From 331666862cb56e285562d4e9898088c835b5b508 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 12 Apr 2021 13:11:09 +0200 Subject: gnu: renpy: Update to 7.4.4. * gnu/packages/game-development.scm (python2-renpy): Update to 7.4.4. (python2-pygame-sdl2)[renpy-version]: Likewise. --- gnu/packages/game-development.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 07a17763f8..679da99e63 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1092,7 +1092,7 @@ to create fully featured games and multimedia programs in the python language.") (define-public python2-pygame-sdl2 (let ((real-version "2.1.0") - (renpy-version "7.4.2")) + (renpy-version "7.4.4")) (package (inherit python2-pygame) (name "python2-pygame-sdl2") @@ -1102,7 +1102,7 @@ to create fully featured games and multimedia programs in the python language.") (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" renpy-version "/pygame_sdl2-" version ".tar.gz")) - (sha256 (base32 "1lpk69nh379x5pdlr838x5b49spzksn9hyqiq2g0q28k0xk4lm67")) + (sha256 (base32 "1lj5c3kfnl8s824j3hs47dg3g5rlabscmwrbb0lgpyy4633pv9ka")) (modules '((guix build utils))) (snippet '(begin @@ -1145,13 +1145,13 @@ developed mainly for Ren'py.") (define-public python2-renpy (package (name "python2-renpy") - (version "7.4.2") + (version "7.4.4") (source (origin (method url-fetch) (uri (string-append "https://www.renpy.org/dl/" version "/renpy-" version "-source.tar.bz2")) - (sha256 (base32 "1mlrq9q3r36izyskq674qhp8s32iirvvfb4r8z6hi26189aaydsw")) + (sha256 (base32 "1cbbvsk1snjrsh59blb8q2h86555gi23pylmwlnk9dx0jxckdi21")) (modules '((guix build utils))) (patches (search-patches -- cgit v1.2.3 From 98bf60bf4ffa14a111bce5265a6299c1bcfd8351 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 12 Apr 2021 14:08:29 +0200 Subject: system: vm: Add a memory-size argument to system-docker-image. * gnu/system/vm.scm (system-docker-image): Add a memory-size argument and pass it to expression->derivation-in-linux-vm. --- gnu/system/vm.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 1efae7ff06..97adfa12fa 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -468,6 +468,7 @@ system that is passed to 'populate-root-file-system'." (define* (system-docker-image os #:key (name "guix-docker-image") + (memory-size 256) (register-closures? (has-guix-service-type? os)) shared-network?) "Build a docker image. OS is the desired . NAME is the @@ -561,6 +562,7 @@ the operating system." (expression->derivation-in-linux-vm name build + #:memory-size memory-size #:make-disk-image? #f #:single-file-output? #t #:references-graphs `((,graph ,os))))) -- cgit v1.2.3 From e1a465209925c43871ce581c2752ae620fbedd3a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 12 Apr 2021 14:09:24 +0200 Subject: tests: docker: Increase VM building memory size to 1024MiB. This fixes the following error when running the "docker-system" test: In ice-9/ftw.scm: 553:30 1 (_ #) In unknown file: 0 (readdir #) ERROR: In procedure readdir: In procedure readdir: Cannot allocate memory * gnu/tests/docker.scm (%test-docker-system): Bump image building VM memory size to 1024 MiB. --- gnu/tests/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index cbb856b016..92611b0a8d 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -303,5 +303,6 @@ docker-image} inside Docker.") (inherit (simple-operating-system)) ;; Use locales for a single libc to ;; reduce space requirements. - (locale-libcs (list glibc)))) + (locale-libcs (list glibc))) + #:memory-size 1024) run-docker-system-test))))) -- cgit v1.2.3 From 5414617120f632b94838eb6a27295cd04c065cee Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Mon, 12 Apr 2021 10:22:55 +0000 Subject: gnu: python-mechanicalsoup: Update to 1.0.0. * gnu/packages/python-web.scm (python-mechanicalsoup): Update to 1.0.0. [arguments]: Enable tests. [native-inputs]: Add python-pytest-flake8, python-pytest-httpbin, python-pytest-cov, python-pytest-mock, python-pytest-runner, python-requests-mock. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c79fa1bfc4..4c5a005629 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2021 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -795,29 +796,26 @@ object graph to and from JSON.") (define-public python-mechanicalsoup (package (name "python-mechanicalsoup") - (version "0.11.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "MechanicalSoup" version)) (sha256 - (base32 "0k59wwk75q7nz6i6gynvzhagy02ql0bv7py3qqcwgjw7607yq4i7")))) + (base32 "01sddjxy3rznh63hnl5lbv1hhk6xyiviwmkiw4x7v4ap35fb3lrp")))) (build-system python-build-system) - (arguments - ;; TODO: Enable tests when python-flake8@3.5 hits master. - `(#:tests? #f)) (propagated-inputs `(("python-beautifulsoup4" ,python-beautifulsoup4) ("python-lxml" ,python-lxml) ("python-requests" ,python-requests) ("python-six" ,python-six))) - ;; (native-inputs - ;; ;; For tests. - ;; `(("python-pytest-flake8" ,python-pytest-flake8) - ;; ("python-pytest-httpbin" ,python-pytest-httpbin) - ;; ("python-pytest-mock" ,python-pytest-mock) - ;; ("python-pytest-runner" ,python-pytest-runner) - ;; ("python-requests-mock" ,python-requests-mock))) + (native-inputs + `(("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-flake8" ,python-pytest-flake8) + ("python-pytest-httpbin" ,python-pytest-httpbin) + ("python-pytest-mock" ,python-pytest-mock) + ("python-pytest-runner" ,python-pytest-runner) + ("python-requests-mock" ,python-requests-mock))) (home-page "https://mechanicalsoup.readthedocs.io/") (synopsis "Python library for automating website interaction") (description -- cgit v1.2.3 From 2323a38b0170453f1942372f8bbae58c5660d20f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Apr 2021 15:07:37 +0300 Subject: gnu: hangups: Loosen version restrictions further. * gnu/packages/messaging.scm (hangups)[arguments]: Adjust custom 'relax-dependencies phase to allow more dependency versions. --- gnu/packages/messaging.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 64aada69f5..fa08a33d8f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2015, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur @@ -2428,7 +2428,8 @@ QMatrixClient project.") ;; Relax overly strict package version specifications. (lambda _ (substitute* "setup.py" - (("==") ">=")) + (("==") ">=") + ((",<.*'") "'")) #t))))) (propagated-inputs `(("python-aiohttp" ,python-aiohttp) -- cgit v1.2.3 From 29f205f7e060c70895f34521995c147f77bba9eb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 12 Apr 2021 15:14:12 +0300 Subject: gnu: hangups: Run test suite. * gnu/packages/messaging.scm (hangups)[arguments]: Use custom 'check phase. --- gnu/packages/messaging.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fa08a33d8f..1cb78aa9b3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2430,6 +2430,11 @@ QMatrixClient project.") (substitute* "setup.py" (("==") ">=") ((",<.*'") "'")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "hangups")) #t))))) (propagated-inputs `(("python-aiohttp" ,python-aiohttp) -- cgit v1.2.3 From ac3bf4e4da58e985f012d216b2faf36434cdf967 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 2 Apr 2021 12:55:16 +0200 Subject: gnu: java-eclipse-jetty-util: Update to 9.4.39 [security fixes]. Fixes CVE-2021-28165 - jetty server high CPU when client send data length > 17408, CVE-2021-28164 - Normalize ambiguous URIs and CVE-2021-28163 - Exclude webapps directory from deployment scan. * gnu/packages/java.scm (java-eclipse-jetty-util): Update to 9.4.39. (java-eclipse-jetty-util-ajax): New variable. (java-eclipse-jetty-util, java-eclipse-jetty-io, java-eclipse-jetty-http) (java-eclipse-jetty-jmx, java-eclipse-jetty-server) (java-eclipse-jetty-security, java-eclipse-jetty-servlet) (java-eclipse-jetty-xml, java-eclipse-jetty-webapp): Disable tests. [native-inputs]: Remove test dependencies. --- gnu/packages/web.scm | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 2331601ce7..060056ebfd 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6851,18 +6851,19 @@ Web Server.") (define-public java-eclipse-jetty-util (package (name "java-eclipse-jetty-util") - (version "9.4.6") + (version "9.4.39") (source (origin (method url-fetch) (uri (string-append "https://github.com/eclipse/jetty.project/" - "archive/jetty-" version ".v20170531.tar.gz")) + "archive/jetty-" version ".v20210325.tar.gz")) (sha256 (base32 - "0x7kbdvkmgr6kbsmbwiiyv3bb0d6wk25frgvld9cf8540136z9p1")))) + "0b4hy4zmdmfbqk9bzmxk7v75y2ysqiappkip4z3hb9lxjvjh0b19")))) (build-system ant-build-system) (arguments `(#:jar-name "eclipse-jetty-util.jar" #:source-dir "src/main/java" + #:tests? #f; require junit 5 #:test-exclude (list "**/Abstract*.java" ;; requires network @@ -6881,11 +6882,6 @@ Web Server.") (inputs `(("slf4j" ,java-slf4j-api) ("servlet" ,java-javaee-servletapi))) - (native-inputs - `(("junit" ,java-junit) - ("hamcrest" ,java-hamcrest-all) - ("perf-helper" ,java-eclipse-jetty-perf-helper) - ("test-helper" ,java-eclipse-jetty-test-helper))) (home-page "https://www.eclipse.org/jetty/") (synopsis "Utility classes for Jetty") (description "The Jetty Web Server provides an HTTP server and Servlet @@ -6946,6 +6942,7 @@ or embedded instantiation. This package provides utility classes.") `(#:jar-name "eclipse-jetty-io.jar" #:source-dir "src/main/java" #:jdk ,icedtea-8 + #:tests? #f; require junit 5 #:test-exclude (list "**/Abstract*.java" ;; Abstract class "**/EndPointTest.java") @@ -6987,6 +6984,7 @@ or embedded instantiation. This package provides IO-related utility classes.")) `(#:jar-name "eclipse-jetty-http.jar" #:source-dir "src/main/java" #:jdk ,icedtea-8 + #:tests? #f; require junit 5 #:phases (modify-phases %standard-phases (add-before 'configure 'chdir @@ -7122,9 +7120,6 @@ or embedded instantiation. This package provides the JMX management."))) ("io" ,java-eclipse-jetty-io) ("jmx" ,java-eclipse-jetty-jmx) ("util" ,java-eclipse-jetty-util))) - (native-inputs - `(("test-classes" ,java-eclipse-jetty-http-test-classes) - ,@(package-native-inputs java-eclipse-jetty-util))) (synopsis "Core jetty server artifact") (description "The Jetty Web Server provides an HTTP server and Servlet container capable of serving static and dynamic content either from a standalone @@ -7154,6 +7149,7 @@ artifact."))) `(#:jar-name "eclipse-jetty-security.jar" #:source-dir "src/main/java" #:jdk ,icedtea-8 + #:tests? #f; require junit 5 #:test-exclude (list "**/ConstraintTest.*") ; This test fails #:phases (modify-phases %standard-phases @@ -7167,9 +7163,6 @@ artifact."))) ("http" ,java-eclipse-jetty-http) ("server" ,java-eclipse-jetty-server) ("util" ,java-eclipse-jetty-util))) - (native-inputs - `(("io" ,java-eclipse-jetty-io) - ,@(package-native-inputs java-eclipse-jetty-util))) (synopsis "Jetty security infrastructure") (description "The Jetty Web Server provides an HTTP server and Servlet container capable of serving static and dynamic content either from a standalone @@ -7190,6 +7183,18 @@ infrastructure"))) `(("io" ,java-eclipse-jetty-io-9.2) ,@(package-native-inputs java-eclipse-jetty-util-9.2))))) +(define-public java-eclipse-jetty-util-ajax + (package + (inherit java-eclipse-jetty-util) + (name "java-eclipse-jetty-util-ajax") + (arguments + `(#:jar-name "eclipse-jetty-util-ajax.jar" + #:source-dir "jetty-util-ajax/src/main/java" + #:tests? #f)); require junit 5 + (inputs + `(("java-eclipse-jetty-util" ,java-eclipse-jetty-util) + ("java-javaee-servletapi" ,java-javaee-servletapi))))) + (define-public java-eclipse-jetty-servlet (package (inherit java-eclipse-jetty-util) @@ -7198,6 +7203,7 @@ infrastructure"))) `(#:jar-name "eclipse-jetty-servlet.jar" #:source-dir "src/main/java" #:jdk ,icedtea-8 + #:tests? #f; require junit 5 #:phases (modify-phases %standard-phases (add-before 'configure 'chdir @@ -7207,8 +7213,8 @@ infrastructure"))) (inputs `(("slf4j" ,java-slf4j-api) ("java-javaee-servletapi" ,java-javaee-servletapi) + ("java-eclipse-jetty-util-ajax" ,java-eclipse-jetty-util-ajax) ("http" ,java-eclipse-jetty-http) - ("http-test" ,java-eclipse-jetty-http-test-classes) ("io" ,java-eclipse-jetty-io) ("jmx" ,java-eclipse-jetty-jmx) ("security" ,java-eclipse-jetty-security) @@ -7298,6 +7304,7 @@ container."))) `(#:jar-name "eclipse-jetty-webapp.jar" #:source-dir "src/main/java" #:jdk ,icedtea-8 + #:tests? #f; require junit 5 ;; One test fails #:test-exclude (list "**/WebAppContextTest.java") #:phases @@ -7309,14 +7316,12 @@ container."))) (inputs `(("java-eclipse-jetty-util" ,java-eclipse-jetty-util) ("java-eclipse-jetty-http" ,java-eclipse-jetty-http) + ("java-eclipse-jetty-io" ,java-eclipse-jetty-io) ("java-eclipse-jetty-server" ,java-eclipse-jetty-server) ("java-eclipse-jetty-servlet" ,java-eclipse-jetty-servlet) ("java-eclipse-jetty-security" ,java-eclipse-jetty-security) ("java-eclipse-jetty-xml" ,java-eclipse-jetty-xml) - ("java-javaee-servletapi" ,java-javaee-servletapi))) - (native-inputs - `(("java-eclipse-jetty-io" ,java-eclipse-jetty-io) - ,@(package-native-inputs java-eclipse-jetty-util))))) + ("java-javaee-servletapi" ,java-javaee-servletapi))))) (define-public java-eclipse-jetty-webapp-9.2 (package -- cgit v1.2.3 From e698843442b34185864f9bed6dc7b75b7254f29e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 12 Apr 2021 14:17:18 +0100 Subject: gnu: Add texlive-newtx. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index dfc92c3174..47bfde55b4 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7978,3 +7978,31 @@ as the default text font. The @code{fontaxes} package is required for use with [pdf]LaTeX.") (license (list license:silofl1.1 ;for Cabin license:lppl)))) ;for support files + +(define-public texlive-newtx + (package + (inherit (simple-texlive-package + "texlive-newtx" + (list "/doc/fonts/newtx/" + "/fonts/afm/public/newtx/" + "/fonts/enc/dvips/newtx/" + "/fonts/map/dvips/newtx/" + "/fonts/opentype/public/newtx/" + "/fonts/tfm/public/newtx/" + "/fonts/type1/public/newtx/" + "/fonts/vf/public/newtx/" + "/tex/latex/newtx/") + (base32 + "0rqjj33m6xkhrjzjhf24kxdg61az5sqsbcl0m7xqkf4akqybn22d") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/newtx") + (synopsis "Repackaging of the TX fonts with improved metrics") + (description "The @code{newtx} bundle splits +@code{txfonts.sty} (from the TX fonts distribution) into two +independent packages, @code{newtxtext.sty} and @code{newtxmath.sty}, +each with fixes and enhancements. @code{newtxmath}'s metrics have +been re-evaluated to provide a less tight appearance and to provide a +@code{libertine} option that substitutes Libertine italic and Greek +letters for the existing math italic and Greek glyphs, making a +mathematics package that matches Libertine text quite well.") + (license license:lppl1.3))) -- cgit v1.2.3 From f53ec9d99b035afba6db042949bff71f2d0fdb7b Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Mon, 29 Mar 2021 16:04:23 +0200 Subject: gnu: Add openvdb. * gnu/packages/graphics.scm (openvdb): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/graphics.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 3c9cf18bbc..f9f19cc28d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2021 Antoine Côté ;;; Copyright © 2021 Andy Tai +;;; Copyright © 2021 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -463,6 +464,42 @@ Embree is meant to increase performance of photo-realistic rendering applications.") (license license:asl2.0))) +(define-public openvdb + (package + (name "openvdb") + (version "8.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AcademySoftwareFoundation/openvdb/") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qzx6l5c183k6j9zki31gg9aixf5s1j46wdi7wr1h3bz7k53syg9")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib")))) + (inputs + `(("boost" ,boost) + ("c-blosc" ,c-blosc) + ("ilmbase" ,ilmbase) + ("tbb" ,tbb) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://www.openvdb.org/") + (synopsis "Sparse volume data structure and tools") + (description "OpenVDB is a C++ library comprising a hierarchical data +structure and a large suite of tools for the efficient storage and +manipulation of sparse volumetric data discretized on three-dimensional grids. +It was developed by DreamWorks Animation for use in volumetric applications +typically encountered in feature film production.") + (license license:mpl2.0))) + (define-public blender (package (name "blender") -- cgit v1.2.3 From 7b04bdaba8edc5faefb5902b55979698282ee1e9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 12 Apr 2021 16:06:51 +0200 Subject: gnu: hydrogen: Update to 1.0.2. * gnu/packages/music.scm (hydrogen): Update to 1.0.2. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 89a8a56965..2b5f43cb14 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -716,7 +716,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (define-public hydrogen (package (name "hydrogen") - (version "1.0.1") + (version "1.0.2") (source (origin (method git-fetch) @@ -725,7 +725,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0snljpvbcgikhz610c325dgvayi0k512p3bglck9vvi90wsqx7l1")))) + (base32 "0nhn2njs8yyxcijxv5zgymf3211y6anzm0v9kn4vnd8kai7zwxxp")))) (build-system cmake-build-system) (arguments `(#:test-target "tests" -- cgit v1.2.3 From c1ed3b048d6644b70221eac2dc9b67420a999462 Mon Sep 17 00:00:00 2001 From: Adam Kandur Date: Mon, 12 Apr 2021 16:37:56 +0200 Subject: gnu: Add cl-bodge-queue. * gnu/packages/lisp-xyz.scm (sbcl-bodge-queue, cl-bodge-queue, ecl-bodge-queue): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1d8e0b42bb..f340360dba 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -161,6 +161,36 @@ collection.") (define-public cl-bodge-utilities (sbcl-package->cl-source-package sbcl-bodge-utilities)) +(define-public sbcl-bodge-queue + (let ((commit "948c9a501dcd412689952d09eb7453ec2722336a") + (revision "0")) + (package + (name "sbcl-bodge-queue") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borodust/bodge-queue") + (commit commit))) + (file-name (git-file-name "bodge-queue" version)) + (sha256 + (base32 "148hjikqk8v2m30mj15xh89zni6szf9z3prav580qk9dqr8djjdr")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (home-page "https://github.com/borodust/bodge-queue") + (synopsis "Simple queue for Common Lisp") + (description "This Common Lisp library provides a simple FIFO +implementation with no external dependencies.") + (license license:expat)))) + +(define-public cl-bodge-queue + (sbcl-package->cl-source-package sbcl-bodge-queue)) + +(define-public ecl-bodge-queue + (sbcl-package->ecl-package sbcl-bodge-queue)) + (define-public sbcl-golden-utils (let ((commit "62a5cb948a011eb26e7a89f56d5839a3334b4100") (revision "2")) -- cgit v1.2.3 From a247f5c7537df7e0c09051ba22d5c95eb08f48b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 10 May 2020 23:29:38 +0200 Subject: services: Support DELETE in MODIFY-SERVICES macro. * gnu/services.scm (%modify-service): Add clause for DELETE syntax. (modify-services): Use FILTER-MAP; adjust docstring. * doc/guix.texi (System Services): Mention alternative syntax. (X Window): Use MODIFY-SERVICES syntax. --- doc/guix.texi | 13 ++++++++++--- gnu/services.scm | 27 +++++++++++++++++++-------- 2 files changed, 29 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index bb86195a25..22b4c6a6b7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13518,6 +13518,14 @@ following expression returns a list that contains all the services in %desktop-services) @end lisp +Alternatively, the @code{modify-services} macro can be used: + +@lisp +(modify-services %desktop-services + (delete avahi-service-type)) +@end lisp + + @unnumberedsubsec Instantiating the System Assuming the @code{operating-system} declaration @@ -17787,9 +17795,8 @@ and tty8. (service slim-service-type (slim-configuration (display ":1") (vt "vt8"))) - (remove (lambda (service) - (eq? (service-kind service) gdm-service-type)) - %desktop-services)))) + (modify-services %desktop-services + (delete gdm-service-type))))) @end lisp @end defvr diff --git a/gnu/services.scm b/gnu/services.scm index ddd1bac30c..e7da0a026d 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -109,7 +110,11 @@ %boot-service %activation-service - etc-service)) + etc-service) + #:re-export (;; Note: Re-export 'delete' to allow for proper syntax matching + ;; in 'modify-services' forms. See + ;; . + delete)) ;;; Comment: ;;; @@ -279,7 +284,11 @@ singleton service type NAME, of which the returned service is an instance." (service type value))) (define-syntax %modify-service - (syntax-rules (=>) + (syntax-rules (=> delete) + ((_ svc (delete kind) clauses ...) + (if (eq? (service-kind svc) kind) + #f + (%modify-service svc clauses ...))) ((_ service) service) ((_ svc (kind param => exp ...) clauses ...) @@ -309,16 +318,18 @@ TYPE. Consider this example: (mingetty-service-type config => (mingetty-configuration (inherit config) - (motd (plain-file \"motd\" \"Hi there!\"))))) + (motd (plain-file \"motd\" \"Hi there!\")))) + (delete udev-service-type)) It changes the configuration of the GUIX-SERVICE-TYPE instance, and that of -all the MINGETTY-SERVICE-TYPE instances. +all the MINGETTY-SERVICE-TYPE instances, and it deletes instances of the +UDEV-SERVICE-TYPE. -This is a shorthand for (map (lambda (svc) ...) %base-services)." +This is a shorthand for (filter-map (lambda (svc) ...) %base-services)." ((_ services clauses ...) - (map (lambda (service) - (%modify-service service clauses ...)) - services)))) + (filter-map (lambda (service) + (%modify-service service clauses ...)) + services)))) ;;; -- cgit v1.2.3 From eb8da54170919bc31946f492da1071dd491e942a Mon Sep 17 00:00:00 2001 From: hli Date: Tue, 30 Mar 2021 00:53:51 +0200 Subject: gnu: Add r-txdb-dmelanogaster-ucsc-dm6-ensgene. * gnu/packages/bioconductor.scm (r-txdb-dmelanogaster-ucsc-dm6-ensgene): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6b5c0a0391..171736064c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -619,6 +619,32 @@ as provided by UCSC (hg38, Dec. 2013) and stored in Biostrings objects.") "This package exposes an annotation database generated from Ensembl.") (license license:artistic2.0))) +(define-public r-txdb-dmelanogaster-ucsc-dm6-ensgene + (package + (name "r-txdb-dmelanogaster-ucsc-dm6-ensgene") + (version "3.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "TxDb.Dmelanogaster.UCSC.dm6.ensGene" + version 'annotation)) + (sha256 + (base32 + "0yij7zyqkmmr13389rs2gfa5anvvw648nnl1kjbsgvyxkggif8q4")))) + (properties + `((upstream-name . "TxDb.Dmelanogaster.UCSC.dm6.ensGene"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-genomicfeatures" ,r-genomicfeatures))) + (home-page + "https://bioconductor.org/packages/TxDb.Dmelanogaster.UCSC.dm6.ensGene") + (synopsis "Annotation package for TxDb object(s)") + (description + "This package exposes an annotation databases generated from UCSC by +exposing these as TxDb objects.") + (license license:artistic2.0))) + (define-public r-txdb-hsapiens-ucsc-hg19-knowngene (package (name "r-txdb-hsapiens-ucsc-hg19-knowngene") -- cgit v1.2.3 From 834aa48504a24f0c79e858fc295edbf63815a408 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Thu, 18 Mar 2021 22:34:51 -0400 Subject: gnu: racket: Don't inject store paths into Racket files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently, during grafting, Guix can somehow mangle compiled Racket CS files (.zo) such that Racket will refuse to load them. (Maybe it has something to do with compression?) So, we stop patching Racket sources with absolute paths to store files (i.e. for foreign libraries to dlopen). Instead, we put them in a data file that doesn't get compiled or, in one case, embed it in C. Fixes https://issues.guix.gnu.org/47064 * gnu/packages/patches/racket-sh-via-rktio.patch: New file. Adds a special case at the C level, controlled by a preprocessor macro, to handle attempts to execute "/bin/sh". * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/scheme.scm (racket)[source](patches): Apply it. (racket)[arguments](#:configure-flags): Add the CPP flag to enable it. (racket)[arguments](#:modules): Use srfi-1. (racket)[arguments](#:phases): Remove 'patch-/bin/sh and 'pre-configure. Change 'pre-configure-minimal to just change directory. Add 'patch-config.rktd-lib-search-dirs after 'build and before 'install to configure Racket's "lib-search-dirs". (racket, racket-minimal)[inputs]: Add bash-minimal as an explicit input. (racket-minimal)[source]: Adjust to inherit patches from racket. (racket-minimal)[arguments]: Inherit from racket: changes no longer needed. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 + gnu/packages/patches/racket-sh-via-rktio.patch | 87 +++++++++++ gnu/packages/scheme.scm | 191 +++++++++++-------------- 3 files changed, 176 insertions(+), 104 deletions(-) create mode 100644 gnu/packages/patches/racket-sh-via-rktio.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 5c1ce07013..50b11a8ca2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -40,6 +40,7 @@ # Copyright © 2020 Malte Frank Gerdes # Copyright © 2020 Vinicius Monego # Copyright © 2021 Björn Höfling +# Copyright © 2021 Philip McGrath # # This file is part of GNU Guix. # @@ -1639,6 +1640,7 @@ dist_patch_DATA = \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ + %D%/packages/patches/racket-sh-via-rktio.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch \ diff --git a/gnu/packages/patches/racket-sh-via-rktio.patch b/gnu/packages/patches/racket-sh-via-rktio.patch new file mode 100644 index 0000000000..b4fefd1514 --- /dev/null +++ b/gnu/packages/patches/racket-sh-via-rktio.patch @@ -0,0 +1,87 @@ +From 3574b567c486d264d680a37586436c3b5a8cb978 Mon Sep 17 00:00:00 2001 +From: Philip McGrath +Date: Thu, 4 Mar 2021 04:11:50 -0500 +Subject: [PATCH] patch rktio_process for "/bin/sh" on Guix + +Racket provides the functions `system` and `process`, +which execute shell commands using `sh` (or `cmd` on Windows). +Racket assumes that `sh` can be found at "/bin/sh", +which is not necessarily true on Guix. + +This patch adds a special case for "/bin/sh" to `rktio_process`, +the C function that implements the core of `system`, `process`, +and related Racket functions. + +Guix should enable the special case by defining the C preprocessor +macro `GUIX_RKTIO_PATCH_BIN_SH` with the path to `sh` in the store. +If: + + 1. The `GUIX_RKTIO_PATCH_BIN_SH` macro is defined; and + + 2. `rktio_process` is called with the exact path "/bin/sh"; and + + 3. The path specified by `GUIX_RKTIO_PATCH_BIN_SH` does exists; + +then `rktio_process` will execute the file specified +by `GUIX_RKTIO_PATCH_BIN_SH` instead of "/bin/sh". + +Compared to previous attempts to patch the Racket sources, +making this change at the C level is both: + + - More comprehensive: it catches all attempts to execute "/bin/sh", + without having to track down the source of every occurance; and + + - Less intrusive: by guarding the special case with a C preprocessor + conditional and a runtime check that the file in the store exists, + we make it much less likely that it will "leak" out of Guix. +--- + src/rktio/rktio_process.c | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +diff --git a/src/rktio/rktio_process.c b/src/rktio/rktio_process.c +index 89202436c0..465ebdd5c5 100644 +--- a/src/rktio/rktio_process.c ++++ b/src/rktio/rktio_process.c +@@ -1224,12 +1224,14 @@ int rktio_process_allowed_flags(rktio_t *rktio) + /*========================================================================*/ + + rktio_process_result_t *rktio_process(rktio_t *rktio, +- const char *command, int argc, rktio_const_string_t *argv, ++ /* PATCHED for Guix (next line) */ ++ const char *_guix_orig_command, int argc, rktio_const_string_t *argv, + rktio_fd_t *stdout_fd, rktio_fd_t *stdin_fd, rktio_fd_t *stderr_fd, + rktio_process_t *group_proc, + const char *current_directory, rktio_envvars_t *envvars, + int flags) + { ++ const char *command; /* PATCHED for Guix */ + rktio_process_result_t *result; + intptr_t to_subprocess[2], from_subprocess[2], err_subprocess[2]; + int pid; +@@ -1255,6 +1257,23 @@ rktio_process_result_t *rktio_process(rktio_t *rktio, + int i; + #endif + ++/* BEGIN PATCH for Guix */ ++#if defined(GUIX_RKTIO_PATCH_BIN_SH) ++# define GUIX_AS_a_STR_HELPER(x) #x ++# define GUIX_AS_a_STR(x) GUIX_AS_a_STR_HELPER(x) ++ /* A level of indirection makes `#` work as needed: */ ++ command = ++ ((0 == strcmp(_guix_orig_command, "/bin/sh")) ++ && rktio_file_exists(rktio, GUIX_AS_a_STR(GUIX_RKTIO_PATCH_BIN_SH))) ++ ? GUIX_AS_a_STR(GUIX_RKTIO_PATCH_BIN_SH) ++ : _guix_orig_command; ++# undef GUIX_AS_a_STR ++# undef GUIX_AS_a_STR_HELPER ++#else ++ command = _guix_orig_command; ++#endif ++/* END PATCH for Guix */ ++ + /* avoid compiler warnings: */ + to_subprocess[0] = -1; + to_subprocess[1] = -1; +-- +2.21.1 (Apple Git-122.3) + diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 10be0aa28a..b5d526bfc3 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Edouard Klein +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages autotools) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages libevent) @@ -411,94 +413,26 @@ implementation techniques and as an expository tool.") (base32 "047wpjblfzmf1msz7snrp2c2h0zxyzlmbsqr9bwsyvz3frcg0888")) (patches (search-patches + "racket-sh-via-rktio.patch" + ;; TODO: If we're no longer patching Racket source + ;; files with store paths, we may also fix the + ;; issue that necessitated the following patch: "racket-store-checksum-override.patch")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - '("--enable-libz" + `(#:configure-flags + `(,(string-append "CPPFLAGS=-DGUIX_RKTIO_PATCH_BIN_SH=" + (assoc-ref %build-inputs "sh") + "/bin/sh") + "--enable-libz" "--enable-liblz4") + #:modules + ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) #:phases (modify-phases %standard-phases - (add-before 'configure 'pre-configure-minimal - (lambda* (#:key inputs #:allow-other-keys) - ;; Patch dynamically loaded libraries with their absolute paths. - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path - library-path - (format #f "~a.so" soname))))) - (substitute* "collects/db/private/sqlite3/ffi.rkt" - (("ffi-lib sqlite-so") - (format #f "ffi-lib \"~a\"" (find-so "libsqlite3")))) - (substitute* "collects/openssl/libssl.rkt" - (("ffi-lib libssl-so") - (format #f "ffi-lib \"~a\"" (find-so "libssl")))) - (substitute* "collects/openssl/libcrypto.rkt" - (("ffi-lib libcrypto-so") - (format #f "ffi-lib \"~a\"" (find-so "libcrypto"))))) - (chdir "src") - #t)) - (add-before 'pre-configure-minimal 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) - ;; Patch dynamically loaded libraries with their absolute paths. - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path - library-path - (format #f "~a.so" soname)))) - (patch-ffi-libs (lambda (file libs) - (for-each - (lambda (lib) - (substitute* file - (((format #f "\"~a\"" lib)) - (format #f "\"~a\"" (find-so lib))))) - libs)))) - (substitute* "share/pkgs/math-lib/math/private/bigfloat/gmp.rkt" - (("ffi-lib libgmp-so") - (format #f "ffi-lib \"~a\"" (find-so "libgmp")))) - (substitute* "share/pkgs/math-lib/math/private/bigfloat/mpfr.rkt" - (("ffi-lib libmpfr-so") - (format #f "ffi-lib \"~a\"" (find-so "libmpfr")))) - (substitute* "share/pkgs/readline-lib/readline/rktrl.rkt" - (("\\(getenv \"PLT_READLINE_LIB\"\\)") - (format #f "\"~a\"" (find-so "libedit")))) - (for-each - (lambda (x) (apply patch-ffi-libs x)) - '(("share/pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt" - ("libfontconfig" "libcairo")) - ("share/pkgs/draw-lib/racket/draw/unsafe/glib.rkt" - ("libglib-2.0" "libgmodule-2.0" "libgobject-2.0")) - ("share/pkgs/draw-lib/racket/draw/unsafe/jpeg.rkt" - ("libjpeg")) - ("share/pkgs/draw-lib/racket/draw/unsafe/pango.rkt" - ("libpango-1.0" "libpangocairo-1.0")) - ("share/pkgs/draw-lib/racket/draw/unsafe/png.rkt" - ("libpng")) - ("share/pkgs/db-lib/db/private/odbc/ffi.rkt" - ("libodbc")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/x11.rkt" - ("libX11")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/gsettings.rkt" - ("libgio-2.0")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/gtk3.rkt" - ("libgdk-3" "libgtk-3")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/unique.rkt" - ("libunique-1.0")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/utils.rkt" - ("libgdk-x11-2.0" "libgdk_pixbuf-2.0" "libgtk-x11-2.0")) - ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt" - ("libGL")) - ("share/pkgs/sgl/gl.rkt" - ("libGL" "libGLU"))))) - #t)) - (add-after 'unpack 'patch-/bin/sh - (lambda _ - (substitute* "collects/racket/system.rkt" - (("/bin/sh") (which "sh"))) - #t)) - (add-after 'patch-/bin/sh 'patch-chez-configure + (add-after 'unpack 'patch-chez-configure (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "src/cs/c/Makefile.in" (("/bin/sh") (which "sh"))) @@ -526,12 +460,69 @@ implementation techniques and as an expository tool.") (("/bin/cp") (which "cp")) (("/bin/echo") (which "echo"))) (substitute* "makefiles/installsh" - (("/bin/true") (which "true"))))))) + (("/bin/true") (which "true")))) + #t)) + (add-before 'configure 'pre-configure-minimal + (lambda* (#:key inputs #:allow-other-keys) + (chdir "src") + #t)) + (add-after 'build 'patch-config.rktd-lib-search-dirs + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; We do this between the `build` and `install` phases + ;; so that we have racket to read and write the hash table, + ;; but it comes before `raco setup`, when foreign libraries + ;; are needed to build the documentation. + (define out (assoc-ref outputs "out")) + (apply invoke + "./cs/c/racketcs" + "-e" + ,(format #f + "~s" + '(let* ((args + (vector->list + (current-command-line-arguments))) + (file (car args)) + (extra-lib-search-dirs (cdr args))) + (write-to-file + (hash-update + (file->value file) + 'lib-search-dirs + (lambda (dirs) + (append dirs extra-lib-search-dirs)) + null) + #:exists 'truncate/replace + file))) + "--" + "../etc/config.rktd" + (filter-map (lambda (lib) + (cond + ((assoc-ref inputs lib) + => (lambda (pth) + (string-append pth "/lib"))) + (else + #f))) + '("cairo" + "fontconfig" + "glib" + "glu" + "gmp" + "gtk+" + "libjpeg" + "libpng" + "libx11" + "mesa" + "mpfr" + "openssl" + "pango" + "sqlite" + "unixodbc" + "libedit"))) + #t))) ;; XXX: how to run them? #:tests? #f)) (inputs - `(;; Hardcode dynamically loaded libraries for better functionality. - ;; sqlite and libraries for `racket/draw' are needed to build the doc. + `(;; sqlite and libraries for `racket/draw' are needed to build the doc. + ("sh" ,bash-minimal) ("zlib" ,zlib) ("zlib:static" ,zlib "static") ("lz4" ,lz4) @@ -571,29 +562,21 @@ of languages such as Typed Racket, R5RS and R6RS Scheme, and Datalog.") (inherit racket) (name "racket-minimal") (version (package-version racket)) - (source (origin - (method url-fetch) - (uri (list (string-append "https://mirror.racket-lang.org/installers/" - version "/racket-minimal-src.tgz") - ;; this mirror seems to have broken HTTPS: - (string-append - "http://mirror.informatik.uni-tuebingen.de/mirror/racket/" - version "/racket-minimal-src.tgz"))) - (sha256 - (base32 - "0mwyffw4gcci8wmzxa3j28h03h0gsz55aard8qrk3lri8r2xyg21")) - (patches (search-patches - "racket-store-checksum-override.patch")))) + (source + (origin + (inherit (package-source racket)) + (uri (list (string-append "https://mirror.racket-lang.org/installers/" + version "/racket-minimal-src.tgz") + ;; this mirror seems to have broken HTTPS: + (string-append + "http://mirror.informatik.uni-tuebingen.de/mirror/racket/" + version "/racket-minimal-src.tgz"))) + (sha256 "0mwyffw4gcci8wmzxa3j28h03h0gsz55aard8qrk3lri8r2xyg21"))) (synopsis "Racket without bundled packages such as Dr. Racket") - (arguments - (substitute-keyword-arguments (package-arguments racket) - ((#:phases phases) - `(modify-phases ,phases - ;; Delete fix that applies to files not included in the minimal package. - (delete 'pre-configure))))) (inputs `(("openssl" ,openssl) ("sqlite" ,sqlite) + ("sh" ,bash-minimal) ("zlib" ,zlib) ("zlib:static" ,zlib "static") ("lz4" ,lz4) -- cgit v1.2.3 From 2978832b9264b89325605fe2525bc3992d753135 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Fri, 15 Jan 2021 21:46:42 +0100 Subject: services: Add ipfs-service-type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/networking.scm (ipfs-service-type) (%ipfs-home-mapping, %ipfs-environment) (%ipfs-accounts, %ipfs-home): New variables. (ipfs-configuration, ipfs-configuration?) (ipfs-configuration-package, ipfs-configuration-gateway) (ipfs-configuration-api, ipfs-shepherd-service) (ipfs-binary, %ipfs-activation): New procedures. * doc/guix.texi (Networking Services): Document it. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 32 ++++++++++ gnu/services/networking.scm | 141 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 22b4c6a6b7..0b8180e6a7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -87,6 +87,7 @@ Copyright @copyright{} 2020 Daniel Brooks@* Copyright @copyright{} 2020 John Soo@* Copyright @copyright{} 2020 Jonathan Brielmaier@* Copyright @copyright{} 2020 Edgar Vincent@* +Copyright @copyright{} 2021 Maxime Devos@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -17506,6 +17507,37 @@ address, delete everything except these options: @end table @end deftp +@cindex IPFS +@defvr {Scheme Variable} ipfs-service-type +The service type for connecting to the @uref{https://ipfs.io,IPFS network}, +a global, versioned, peer-to-peer file system. Pass it a +@code{ipfs-configuration} to change the ports used for the gateway and API. + +Here's an example configuration, using some non-standard ports: + +@lisp +(service ipfs-service-type + (ipfs-configuration + (gateway "/ip4/127.0.0.1/tcp/8880") + (api "/ip4/127.0.0.1/tcp/8881"))) +@end lisp +@end defvr + +@deftp {Data Type} ipfs-configuration +Data type representing the configuration of IPFS. + +@table @asis +@item @code{package} (default: @code{go-ipfs}) +Package object of IPFS. + +@item @code{gateway} (default: @code{"/ip4/127.0.0.1/tcp/8082"}) +Address of the gateway, in ‘multiaddress’ format. + +@item @code{api} (default: @code{"/ip4/127.0.0.1/tcp/5001"}) +Address of the API endpoint, in ‘multiaddress’ format. +@end table +@end deftp + @cindex keepalived @deffn {Scheme Variable} keepalived-service-type This is the type for the @uref{https://www.keepalived.org/, Keepalived} diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 231a9f66c7..6e93b56717 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 Oleg Pykhalov ;;; Copyright © 2021 Christopher Lemmer Webber +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,8 @@ #:use-module (gnu packages ntp) #:use-module (gnu packages wicd) #:use-module (gnu packages gnome) + #:use-module (gnu packages ipfs) + #:use-module (gnu build linux-container) #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix modules) @@ -197,6 +200,13 @@ yggdrasil-configuration-json-config yggdrasil-configuration-package + ipfs-service-type + ipfs-configuration + ipfs-configuration? + ipfs-configuration-package + ipfs-configuration-gateway + ipfs-configuration-api + keepalived-configuration keepalived-configuration? keepalived-service-type)) @@ -1876,6 +1886,137 @@ See yggdrasil -genconf for config options.") (service-extension profile-service-type (compose list yggdrasil-configuration-package)))))) + +;;; +;;; IPFS +;;; + +(define-record-type* + ipfs-configuration + make-ipfs-configuration + ipfs-configuration? + (package ipfs-configuration-package + (default go-ipfs)) + (gateway ipfs-configuration-gateway + (default "/ip4/127.0.0.1/tcp/8082")) + (api ipfs-configuration-api + (default "/ip4/127.0.0.1/tcp/5001"))) + +(define %ipfs-home "/var/lib/ipfs") + +(define %ipfs-accounts + (list (user-account + (name "ipfs") + (group "ipfs") + (system? #t) + (comment "IPFS daemon user") + (home-directory "/var/lib/ipfs") + (shell (file-append shadow "/sbin/nologin"))) + (user-group + (name "ipfs") + (system? #t)))) + +(define (ipfs-binary config) + (file-append (ipfs-configuration-package config) "/bin/ipfs")) + +(define %ipfs-home-mapping + #~(file-system-mapping + (source #$%ipfs-home) + (target #$%ipfs-home) + (writable? #t))) + +(define %ipfs-environment + #~(list #$(string-append "HOME=" %ipfs-home))) + +(define (ipfs-shepherd-service config) + "Return a for IPFS with CONFIG." + (define ipfs-daemon-command + #~(list #$(ipfs-binary config) "daemon")) + (list + (with-imported-modules (source-module-closure + '((gnu build shepherd) + (gnu system file-systems))) + (shepherd-service + (provision '(ipfs)) + ;; While IPFS is most useful when the machine is connected + ;; to the network, only loopback is required for starting + ;; the service. + (requirement '(loopback)) + (documentation "Connect to the IPFS network") + (modules '((gnu build shepherd) + (gnu system file-systems))) + (start #~(make-forkexec-constructor/container + #$ipfs-daemon-command + #:namespaces '#$(fold delq %namespaces '(user net)) + #:mappings (list #$%ipfs-home-mapping) + #:log-file "/var/log/ipfs.log" + #:user "ipfs" + #:group "ipfs" + #:environment-variables #$%ipfs-environment)) + (stop #~(make-kill-destructor)))))) + +(define (%ipfs-activation config) + "Return an activation gexp for IPFS with CONFIG" + (define (ipfs-config-command setting value) + #~(#$(ipfs-binary config) "config" #$setting #$value)) + (define (set-config!-gexp setting value) + #~(system* #$@(ipfs-config-command setting value))) + (define settings + `(("Addresses.API" ,(ipfs-configuration-api config)) + ("Addresses.Gateway" ,(ipfs-configuration-gateway config)))) + (define inner-gexp + #~(begin + (umask #o077) + ;; Create $HOME/.ipfs structure + (system* #$(ipfs-binary config) "init") + ;; Apply settings + #$@(map (cute apply set-config!-gexp <>) settings))) + (define inner-script + (program-file "ipfs-activation-inner" inner-gexp)) + ;; Run ipfs init and ipfs config from a container, + ;; in case the IPFS daemon was compromised at some point + ;; and ~/.ipfs is now a symlink to somewhere outside + ;; %ipfs-home. + (define container-gexp + (with-extensions (list shepherd) + (with-imported-modules (source-module-closure + '((gnu build shepherd) + (gnu system file-systems))) + #~(begin + (use-modules (gnu build shepherd) + (gnu system file-systems)) + (let* ((constructor + (make-forkexec-constructor/container + (list #$inner-script) + #:namespaces '#$(fold delq %namespaces '(user)) + #:mappings (list #$%ipfs-home-mapping) + #:user "ipfs" + #:group "ipfs" + #:environment-variables #$%ipfs-environment)) + (pid (constructor))) + (waitpid pid)))))) + ;; The activation may happen from the initrd, which uses + ;; a statically-linked guile, while the guix container + ;; procedures require a working dynamic-link. + (define container-script + (program-file "ipfs-activation-container" container-gexp)) + #~(system* #$container-script)) + +(define ipfs-service-type + (service-type + (name 'ipfs) + (extensions + (list (service-extension account-service-type + (const %ipfs-accounts)) + (service-extension activation-service-type + %ipfs-activation) + (service-extension shepherd-root-service-type + ipfs-shepherd-service))) + (default-value (ipfs-configuration)) + (description + "Run @command{ipfs daemon}, the reference implementation +of the IPFS p2p storage network."))) + ;;; ;;; Keepalived -- cgit v1.2.3 From 3332f4365bf329c361d650c70e53b8a74ad923bd Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 30 Mar 2021 12:40:14 +0200 Subject: tests: Support package extensions in the backdoor REPL. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/tests.scm (): Add 'extensions' field. (marionette-shepherd-service): Honour the field. (with-import-modules-and-extensions): Define a combination of 'with-import-modules' and 'with-extensions'. Signed-off-by: Ludovic Courtès --- gnu/tests.scm | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/tests.scm b/gnu/tests.scm index 3b10a6d5ac..eb636873a2 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,13 +75,24 @@ (default "/dev/virtio-ports/org.gnu.guix.port.0")) (imported-modules marionette-configuration-imported-modules (default '())) + (extensions marionette-configuration-extensions + (default '())) ; list of packages (requirements marionette-configuration-requirements ;list of symbols (default '()))) +;; Hack: avoid indenting code beyond column 80 in marionette-shepherd-service. +(define-syntax-rule (with-imported-modules-and-extensions imported-modules + extensions + gexp) + (with-imported-modules imported-modules + (with-extensions extensions + gexp))) + (define (marionette-shepherd-service config) "Return the Shepherd service for the marionette REPL" (match config - (($ device imported-modules requirement) + (($ device imported-modules extensions + requirement) (list (shepherd-service (provision '(marionette)) @@ -90,7 +102,7 @@ (modules '((ice-9 match) (srfi srfi-9 gnu))) (start - (with-imported-modules imported-modules + (with-imported-modules-and-extensions imported-modules extensions #~(lambda () (define (self-quoting? x) (letrec-syntax ((one-of (syntax-rules () @@ -154,11 +166,13 @@ (define* (marionette-operating-system os #:key (imported-modules '()) + (extensions '()) (requirements '())) "Return a marionetteed variant of OS such that OS can be used as a marionette in a virtual machine--i.e., controlled from the host system. The marionette service in the guest is started after the Shepherd services listed -in REQUIREMENTS." +in REQUIREMENTS. The packages in the list EXTENSIONS are made available from +the backdoor REPL." (operating-system (inherit os) ;; Make sure the guest dies on error. @@ -172,6 +186,7 @@ in REQUIREMENTS." (services (cons (service marionette-service-type (marionette-configuration (requirements requirements) + (extensions extensions) (imported-modules imported-modules))) (operating-system-user-services os))))) @@ -281,4 +296,9 @@ result." "Return the list of system tests." (reverse (fold-system-tests cons '()))) + +;; Local Variables: +;; eval: (put 'with-imported-modules-and-extensions 'scheme-indent-function 2) +;; End: + ;;; tests.scm ends here -- cgit v1.2.3 From 68c9e0a56e008f19427bd213cf5b24bdd8fe5922 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Sun, 28 Mar 2021 17:01:49 +0200 Subject: gnu: tests: Test basic funtionality of the IPFS service. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is tested whether the IPFS service listens at the gateway and API ports and whether it is possible to upload and download a bytevector. * gnu/tests/networking.scm (%ipfs-os): New variable. (run-ipfs-test): New procedure. (%test-ipfs): New system test. Signed-off-by: Ludovic Courtès --- gnu/tests/networking.scm | 92 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 022663aa67..453e63f52d 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,12 +30,15 @@ #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) + #:use-module (guix modules) #:use-module (gnu packages bash) #:use-module (gnu packages linux) #:use-module (gnu packages networking) + #:use-module (gnu packages guile) #:use-module (gnu services shepherd) #:use-module (ice-9 match) - #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor %test-iptables)) + #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor %test-iptables + %test-ipfs)) (define %inetd-os ;; Operating system with 2 inetd services. @@ -563,3 +567,89 @@ COMMIT (name "iptables") (description "Test a running iptables daemon.") (value (run-iptables-test)))) + + +;;; +;;; IPFS service +;;; + +(define %ipfs-os + (simple-operating-system + (service ipfs-service-type))) + +(define (run-ipfs-test) + (define os + (marionette-operating-system %ipfs-os + #:imported-modules (source-module-closure + '((gnu services herd) + (guix ipfs))) + #:extensions (list guile-json-4) + #:requirements '(ipfs))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (rnrs bytevectors) + (srfi srfi-64) + (ice-9 binary-ports)) + + (define marionette + (make-marionette (list #$(virtual-machine os)))) + + (define (ipfs-is-alive?) + (marionette-eval + '(begin + (use-modules (gnu services herd) + (srfi srfi-1)) + (live-service-running + (find (lambda (live) + (memq 'ipfs + (live-service-provision live))) + (current-services)))) + marionette)) + + ;; The default API endpoint port 5001 is used, + ;; so there is no need to parameterize %ipfs-base-url. + (define (add-data data) + (marionette-eval `(content-name (add-data ,data)) marionette)) + (define (read-contents object) + (marionette-eval + `(let* ((input (read-contents ,object)) + (all-input (get-bytevector-all input))) + (close-port input) + all-input) + marionette)) + + (marionette-eval '(use-modules (guix ipfs)) marionette) + (mkdir #$output) + (chdir #$output) + + (test-begin "ipfs") + + ;; Test the IPFS service. + + (test-assert "ipfs is alive" (ipfs-is-alive?)) + + (test-assert "ipfs is listening on the gateway" + (let ((default-port 8082)) + (wait-for-tcp-port default-port marionette))) + + (test-assert "ipfs is listening on the API endpoint" + (let ((default-port 5001)) + (wait-for-tcp-port default-port marionette))) + + (define test-bv (string->utf8 "hello ipfs!")) + (test-equal "can upload and download a file to/from ipfs" + test-bv + (read-contents (add-data test-bv))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (gexp->derivation "ipfs-test" test)) + +(define %test-ipfs + (system-test + (name "ipfs") + (description "Test a running IPFS daemon configuration.") + (value (run-ipfs-test)))) -- cgit v1.2.3 From 4d0d6d86263f0701244682e2226c8b539b25f669 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 12 Apr 2021 18:43:39 +0200 Subject: services: ipfs: Tweak description. * gnu/services/networking.scm (ipfs-service-type)[description]: Avoid abbreviation. --- gnu/services/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 6e93b56717..761820ad2e 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -2015,7 +2015,7 @@ See yggdrasil -genconf for config options.") (default-value (ipfs-configuration)) (description "Run @command{ipfs daemon}, the reference implementation -of the IPFS p2p storage network."))) +of the IPFS peer-to-peer storage network."))) ;;; -- cgit v1.2.3 From 1bbed20332746d13b7494177a232120e80d4d5d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Apr 2021 21:51:38 +0200 Subject: gnu: guile-picture-language: Update to 0.0.1-5.a1322bf. * gnu/packages/guile-xyz.scm (guile-picture-language): Update to 0.0.1-5.a1322bf. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b2cbf3e898..21b39abf62 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2649,8 +2649,8 @@ format is also supported.") (deprecated-package "guile3.0-mcron" mcron)) (define-public guile-picture-language - (let ((commit "291a746a1d3b4784d38b05239bdd7b8e796ce761") - (revision "4")) + (let ((commit "a1322bf11945465241ca5b742a70893f24156d12") + (revision "5")) (package (name "guile-picture-language") (version (git-version "0.0.1" revision commit)) @@ -2662,7 +2662,7 @@ format is also supported.") (file-name (git-file-name name version)) (sha256 (base32 - "0rnhf13ds92sbdicshy4sy4kl2kc431fy9vzm1divw974p7v57sd")))) + "03i528z92ainccgm28shg4haxiav5x4cyhyi5dggq1rm027vbm99")))) (build-system gnu-build-system) (inputs `(("guile" ,guile-3.0))) -- cgit v1.2.3 From c311147bd16aa0e5746d9cbf31502f5fd61e470c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 12 Apr 2021 21:41:41 +0100 Subject: services: postgresql: Change service default socket directory. Fixes . PostgreSQL running with a different socket directory to the default one in the package itself breaks some services, this commit restores the previous behaviour where PostgreSQL by default will run with a socket directory that matches the default used by PostgreSQL packaged for Guix. Switching to a different default value can happen, but only alongside changing the PostgreSQL package. * gnu/services/databases.scm ()[socket-directory]: Change default to #false. * doc/guix.texi (Database Services): Update documentation, and specify a different value for disabling connections via sockets. * gnu/tests/guix.scm (%guix-data-service-os): Use default PostgreSQL behaviour. * gnu/tests/monitoring.scm (%zabbix-os): Likewise. * gnu/tests/web.scm (patchwork-os): Likewise. Signed-off-by: Leo Famulari --- doc/guix.texi | 9 ++++++--- gnu/services/databases.scm | 2 +- gnu/tests/guix.scm | 5 +---- gnu/tests/monitoring.scm | 7 +------ gnu/tests/web.scm | 7 +------ 5 files changed, 10 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 456dfb264d..1069a5d296 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19830,12 +19830,15 @@ configuration. @item @code{ident-file} (default: @code{%default-postgres-ident}) Filename or G-expression for the user name mapping configuration. -@item @code{socket-directory} (default: @code{"/var/run/postgresql"}) +@item @code{socket-directory} (default: @code{#false}) Specifies the directory of the Unix-domain socket(s) on which PostgreSQL -is to listen for connections from client applications. If set to -@code{#false} PostgreSQL does not listen on any Unix-domain sockets, in +is to listen for connections from client applications. If set to +@code{""} PostgreSQL does not listen on any Unix-domain sockets, in which case only TCP/IP sockets can be used to connect to the server. +By default, the @code{#false} value means the PostgreSQL default value +will be used, which is currently @samp{/tmp}. + @item @code{extra-config} (default: @code{'()}) List of additional keys and values to include in the PostgreSQL config file. Each entry in the list should be a list where the first element diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index a841e7a50e..6ef3f3383c 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -115,7 +115,7 @@ host all all ::1/128 md5")) (ident-file postgresql-config-file-ident-file (default %default-postgres-ident)) (socket-directory postgresql-config-file-socket-directory - (default "/var/run/postgresql")) + (default #false)) (extra-config postgresql-config-file-extra-config (default '()))) diff --git a/gnu/tests/guix.scm b/gnu/tests/guix.scm index 219b8b482f..af7d8f0b21 100644 --- a/gnu/tests/guix.scm +++ b/gnu/tests/guix.scm @@ -164,10 +164,7 @@ " local all all trust host all all 127.0.0.1/32 trust -host all all ::1/128 trust")) - ;; XXX: Remove when postgresql default socket directory is - ;; changed to /var/run/postgresql. - (socket-directory #f))))) +host all all ::1/128 trust")))))) (service guix-data-service-type (guix-data-service-configuration (host "0.0.0.0"))) diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm index be69e1c259..8630f5818c 100644 --- a/gnu/tests/monitoring.scm +++ b/gnu/tests/monitoring.scm @@ -309,12 +309,7 @@ zabbix||{} (service dhcp-client-service-type) (service postgresql-service-type (postgresql-configuration - (postgresql postgresql) - ;; XXX: Remove when postgresql default socket directory is - ;; changed to /var/run/postgresql. - (config-file - (postgresql-config-file - (socket-directory #f))))) + (postgresql postgresql))) (service zabbix-front-end-service-type (zabbix-front-end-configuration (db-password "zabbix"))) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index cc0e79c8b2..7f4518acd2 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -569,12 +569,7 @@ HTTP-PORT." (listen '("8080")))))) (service postgresql-service-type (postgresql-configuration - (postgresql postgresql-10) - ;; XXX: Remove when postgresql default socket directory is - ;; changed to /var/run/postgresql. - (config-file - (postgresql-config-file - (socket-directory #f))))) + (postgresql postgresql-10))) (service patchwork-service-type (patchwork-configuration (patchwork patchwork) -- cgit v1.2.3 From 822eacc6bb0878323e6687d4460a7c53066545e1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 13 Apr 2021 09:57:56 +0200 Subject: tests: halt: Fix it. This fixes: . The OCR prompt detection is failing, so remove it altogether. It looks like the test doesn't need the prompt detection delay to work properly. * gnu/tests/base.scm (run-halt-test): Remove failing OCR detection. --- gnu/tests/base.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index e5f9b87b1d..9429a10b75 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -555,10 +555,6 @@ functionality tests.") (start-service 'term-tty1)) marionette) (marionette-type "root\n" marionette) - (wait-for-screen-text marionette - (lambda (text) - (string-contains text "root@komputilo")) - #:ocrad ocrad) ;; Start tmux and wait for it to be ready. (marionette-type "tmux new-session 'echo 1 > /ready; bash'\n" -- cgit v1.2.3 From 995f685e4de49683399715932792e730f918d2a2 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 13 Apr 2021 11:30:35 +0100 Subject: gnu: Add texlive-xcharter. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 47bfde55b4..317f1a8416 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8006,3 +8006,30 @@ been re-evaluated to provide a less tight appearance and to provide a letters for the existing math italic and Greek glyphs, making a mathematics package that matches Libertine text quite well.") (license license:lppl1.3))) + +(define-public texlive-xcharter + (package + (inherit (simple-texlive-package + "texlive-xcharter" + (list "/doc/fonts/xcharter/" + "/fonts/afm/public/xcharter/" + "/fonts/enc/dvips/xcharter/" + "/fonts/map/dvips/xcharter/" + "/fonts/opentype/public/xcharter/" + "/fonts/tfm/public/xcharter/" + "/fonts/type1/public/xcharter/" + "/fonts/vf/public/xcharter/" + "/tex/latex/xcharter/") + (base32 + "0krm4h53lw7h9jbmv5nc89fm4x7i8l574aig1l4mw8w3ziknwmi7") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/xcharter") + (synopsis "Extension of the Bitstream Charter fonts") + (description "@code{xcharter} repackages Bitstream Charter with an +extended set of features. The extension provides small caps, oldstyle +figures and superior figures in all four styles, accompanied by LaTeX +font support files. The fonts themselves are provided in both Adobe +Type 1 and OTF formats, with supporting files as necessary.") + (license (list (license:fsf-free + "http://mirrors.ctan.org/fonts/xcharter/README") + license:lppl1.3)))) -- cgit v1.2.3 From bad0654d4fe3cfa19876a1f4b4ef9fe15eeb9288 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 12 Apr 2021 21:59:09 -0400 Subject: gnu: gnu-standards: Update to 2020-11-25. * gnu/packages/gnu-doc.scm (gnu-standards): Update to 2020-11-25. [source]: Make file-name more descriptive. Use version variable for revision. Signed-off-by: Efraim Flashner --- gnu/packages/gnu-doc.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnu-doc.scm b/gnu/packages/gnu-doc.scm index b64d8ac454..9fb746ee97 100644 --- a/gnu/packages/gnu-doc.scm +++ b/gnu/packages/gnu-doc.scm @@ -56,7 +56,7 @@ list.") (define-public gnu-standards (package (name "gnu-standards") - (version "2018-02-18") + (version "2020-11-25") (source (origin (method cvs-fetch) @@ -64,11 +64,11 @@ list.") (root-directory ":pserver:anonymous@cvs.savannah.gnu.org:/sources/gnustandards") (module "gnustandards") - (revision "2018-02-18"))) + (revision version))) (sha256 (base32 - "03yh25fpvfn5pnd0d4x7a2wkh01ffk6vbs1vjnzqicqkgc2g33sd")) - (file-name "gnu-standards-src"))) + "1xlwmgcnvp81ipgfir4ckpgl922mbckvxy1x758r0lksq5vrpglj")) + (file-name (string-append name "-" version "-checkout")))) (build-system trivial-build-system) (native-inputs `(("gzip" ,gzip) ("source" ,source) -- cgit v1.2.3 From 504a525d37d45b39017c32c84ab67d4a31a85b7c Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Tue, 13 Apr 2021 04:29:10 +0000 Subject: gnu: visidata: Update to 2.4. * gnu/packages/visidata.scm (visidata): Update to 2.4. Signed-off-by: Efraim Flashner --- gnu/packages/visidata.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/visidata.scm b/gnu/packages/visidata.scm index 4b18e0f41e..966afea849 100644 --- a/gnu/packages/visidata.scm +++ b/gnu/packages/visidata.scm @@ -31,14 +31,14 @@ (define-public visidata (package (name "visidata") - (version "2.2.1") + (version "2.4") (source (origin (method url-fetch) (uri (pypi-uri "visidata" version)) (sha256 (base32 - "181klx7223q6a600k9iqxrfxpq5w73h1g2ks1cfsnmlv7i6s9v9f")))) + "1g9g4gd3mqi23damxghwj76zxi2ig9vf4jv8dnvl7q7ssb7gz60d")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 85788dd64d5c54ff52f19c8bb6c8c522ed581b2c Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Tue, 13 Apr 2021 04:33:32 +0000 Subject: gnu: esbuild: Update to 0.11.9. * gnu/packages/web.scm (esbuild): Update to 0.11.9. Signed-off-by: Efraim Flashner --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 060056ebfd..165a4fc236 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1554,7 +1554,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.51") + (version "0.11.9") (source (origin (method git-fetch) @@ -1563,7 +1563,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1j4qza2chng3az1h1fh9zbhxh99q7bfrqbgppyyq5947svi8fvaz")) + (base32 "0pi5ydvbcfi8dbq2ryw8z4197pf4jrlz8mj1vzkdff22ga9qcmxy")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 95f25c9b13e22603c35f3acd9048fbd1c8671925 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Apr 2021 16:11:59 +0200 Subject: gnu: python-terminado: Update to 0.9.4. * gnu/packages/python-web.scm (python-terminado): Update to 0.9.4. [propagated-inputs]: Replace python-tornado with python-tornado-6. [native-inputs]: Replace python-nose with python-pytest. [home-page]: Follow redirect. [arguments]: Update check phase. --- gnu/packages/python-web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4c5a005629..c78de311ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016, 2020 Andreas Enge ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2016, 2017, 2020 Julien Lepiller ;;; Copyright © 2016, 2017 Nikita @@ -1749,26 +1749,26 @@ web framework, either via the basic or digest authentication schemes.") (define-public python-terminado (package (name "python-terminado") - (version "0.8.1") + (version "0.9.4") (source (origin (method url-fetch) (uri (pypi-uri "terminado" version)) (sha256 (base32 - "0yh69k6579g848rmjyllb5h75pkvgcy27r1l3yzgkf33wnnzkasm")))) + "1glqyw97rddyzvisz8rihsn3x2nrm5xbyq82nzp3123pqbxvqzcs")))) (build-system python-build-system) (propagated-inputs - `(("python-tornado" ,python-tornado) + `(("python-tornado" ,python-tornado-6) ("python-ptyprocess" ,python-ptyprocess))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "nosetests") #t))))) - (home-page "https://github.com/takluyver/terminado") + (lambda _ (invoke "pytest" "-vv")))))) + (home-page "https://github.com/jupyter/terminado") (synopsis "Terminals served to term.js using Tornado websockets") (description "This package provides a Tornado websocket backend for the term.js Javascript terminal emulator library.") -- cgit v1.2.3 From 2a12cbaaab970bcab09002e952e062da0274f0b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Apr 2021 16:13:37 +0200 Subject: gnu: python-jupyter-core: Update to 4.7.1. * gnu/packages/python-xyz.scm (python-jupyter-core): Update to 4.7.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4754db6e6f..065a400945 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7210,14 +7210,14 @@ without using the configuration machinery.") (define-public python-jupyter-core (package (name "python-jupyter-core") - (version "4.4.0") + (version "4.7.1") (source (origin (method url-fetch) (uri (string-append (pypi-uri "jupyter_core" version))) (sha256 (base32 - "1dy083rarba8prn9f9srxq3c7n7vyql02ycrqq306c40lr57aw5s")))) + "1d12j5hkff0xiax87pnhmzbsph3jqqzhz16h8xld7z2y4armq0kr")))) (build-system python-build-system) ;; FIXME: not sure how to run the tests (arguments `(#:tests? #f)) -- cgit v1.2.3 From b1415bf089991f3eb5dfcaf26b40a0ac40b40ba3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Apr 2021 16:13:57 +0200 Subject: gnu: python-jupyter-client: Update to 6.1.12. * gnu/packages/python-xyz.scm (python-jupyter-client): Update to 6.1.12. [propagated-inputs]: Add python-dateutil and python-tornado-6. [native-inputs]: Add python-pytest. --- gnu/packages/python-xyz.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 065a400945..30ab9f3251 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7235,21 +7235,20 @@ without using the configuration machinery.") (define-public python-jupyter-client (package (name "python-jupyter-client") - (version "5.2.4") + (version "6.1.12") (source (origin (method url-fetch) (uri (pypi-uri "jupyter_client" version)) (sha256 (base32 - "0l9mh7ccrpl3lppym3dnky8n1nk7xarzzdcxf4q2s7aw203cpydm")))) + "10p7fcgvv9hvz9zical9wk68ks5ssak2ykbzx65wm1k1hk8a3g64")))) (build-system python-build-system) ;; Tests fail because of missing native python kernel which I assume is ;; provided by the ipython package, which we cannot use because it would ;; cause a dependency cycle. (arguments `(#:tests? #f - #:phases (modify-phases %standard-phases (add-after 'unpack 'set-tool-file-names (lambda* (#:key inputs #:allow-other-keys) @@ -7261,9 +7260,13 @@ without using the configuration machinery.") (inputs `(("iproute" ,iproute))) (propagated-inputs - `(("python-pyzmq" ,python-pyzmq) - ("python-traitlets" ,python-traitlets) - ("python-jupyter-core" ,python-jupyter-core))) + `(("python-dateutil" ,python-dateutil) + ("python-jupyter-core" ,python-jupyter-core) + ("python-pyzmq" ,python-pyzmq) + ("python-tornado" ,python-tornado-6) + ("python-traitlets" ,python-traitlets))) + (native-inputs + `(("python-pytest" ,python-pytest))) (home-page "https://jupyter.org/") (synopsis "Jupyter protocol implementation and client libraries") (description -- cgit v1.2.3 From 02746ead490ef9bbfd16041bb0d846daa1335c55 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Apr 2021 16:19:12 +0200 Subject: gnu: python-ipykernel: Update to 5.5.3. * gnu/packages/python-xyz.scm (python-ipykernel): Update to 5.5.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 30ab9f3251..49d9da208a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7282,13 +7282,13 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (define-public python-ipykernel (package (name "python-ipykernel") - (version "5.1.3") + (version "5.5.3") (source (origin (method url-fetch) (uri (pypi-uri "ipykernel" version)) (sha256 - (base32 "1a08y677lpn80qzvv7z0smgggmr5m5ayf0bs6vds47xpxl9sss5k")))) + (base32 "02f55cjkp5q64x7ikjxznbxwjpkdmfy237b9kg7dk1pxmzvy90m6")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From a7a92c00f49b36cdbf0aaa9fcfe6ba144f8674b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Apr 2021 16:19:28 +0200 Subject: gnu: python-widgetsnbextension: Add missing inputs. * gnu/packages/python-xyz.scm (python-widgetsnbextension)[propagated-inputs]: Add python-argon2-cffi and python-terminado. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 49d9da208a..42a37abe2d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10491,8 +10491,10 @@ interactive computing.") "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-ipykernel" ,python-ipykernel) - ("python-notebook" ,python-notebook))) + `(("python-argon2-cffi" ,python-argon2-cffi) + ("python-ipykernel" ,python-ipykernel) + ("python-notebook" ,python-notebook) + ("python-terminado" ,python-terminado))) (native-inputs `(("python-certifi" ,python-certifi) ("python-nose" ,python-nose))) -- cgit v1.2.3 From e9008a66eacb48ae9562c0cfbc67f3f7307750b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 9 Apr 2021 16:20:39 +0200 Subject: gnu: python-notebook: Update to 6.3.0. * gnu/packages/python-xyz.scm (python-notebook): Update to 6.3.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 42a37abe2d..23dc03e848 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10416,13 +10416,13 @@ convert an @code{.ipynb} notebook file into various static formats including: (define-public python-notebook (package (name "python-notebook") - (version "5.7.4") + (version "6.3.0") (source (origin (method url-fetch) (uri (pypi-uri "notebook" version)) (sha256 (base32 - "0jm7324mbxljmn9hgapj66q7swyz5ai92blmr0jpcy0h80x6f26r")))) + "0zfwr87ndjzmdp9adpc9lby1hdqdkjp2q7c9vff3wiw1dj6kkjfb")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6d0a3dc4bc98ebcda0f2ef8d426b2d29c3eaa77e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 13:15:13 +0200 Subject: gnu: python-notebook: Update inputs. * gnu/packages/python-xyz.scm (python-notebook)[propagated-inputs]: Add python-argon2-cffi, python-ipykernel, python-ipython-genutils, python-jinja2, python-jupyter-client, python-pyzmq, python-tornado-6, and python-traitlets. [native-inputs]: Remove python-nose and python-sphinx; add python-coverage, python-nbval, python-pytest, python-pytest-cov, and python-requests-unixsocket. [arguments]: Use pytest instead of nosetests. --- gnu/packages/python-xyz.scm | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 23dc03e848..f837bf7429 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10428,28 +10428,40 @@ convert an @code{.ipynb} notebook file into various static formats including: `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ + (lambda* (#:key tests? inputs outputs #:allow-other-keys) ;; These tests require a browser (delete-file-recursively "notebook/tests/selenium") - ;; Some tests need HOME - (setenv "HOME" "/tmp") - ;; This file contains "warningfilters", which are not supported - ;; by this version of nose. - (delete-file "setup.cfg") - (with-directory-excursion "/tmp" - (invoke "nosetests" "-v")) - #t))))) + (when tests? + (add-installed-pythonpath inputs outputs) + ;; Some tests need HOME + (setenv "HOME" "/tmp") + (with-directory-excursion "/tmp" + (invoke "pytest" "-vv" + ;; TODO: This tests fails because nbconvert does not + ;; list "python" as a format. + "-k" "not test_list_formats")))))))) (propagated-inputs - `(("python-jupyter-core" ,python-jupyter-core) - ("python-nbformat" ,python-nbformat) + `(("python-argon2-cffi" ,python-argon2-cffi) + ("python-ipykernel" ,python-ipykernel) + ("python-ipython-genutils" ,python-ipython-genutils) + ("python-jinja2" ,python-jinja2) + ("python-jupyter-client" ,python-jupyter-client) + ("python-jupyter-core" ,python-jupyter-core) ("python-nbconvert" ,python-nbconvert) + ("python-nbformat" ,python-nbformat) ("python-prometheus-client" ,python-prometheus-client) + ("python-pyzmq" ,python-pyzmq) ("python-send2trash" ,python-send2trash) - ("python-terminado" ,python-terminado))) + ("python-terminado" ,python-terminado) + ("python-tornado" ,python-tornado-6) + ("python-traitlets" ,python-traitlets))) (native-inputs - `(("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("python-requests" ,python-requests))) + `(("python-coverage" ,python-coverage) + ("python-nbval" ,python-nbval) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-requests" ,python-requests) + ("python-requests-unixsocket" ,python-requests-unixsocket))) (home-page "https://jupyter.org/") (synopsis "Web-based notebook environment for interactive computing") (description -- cgit v1.2.3 From 2043e7bfc8786a4831247da7095c1e623ad1c4d0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:35:17 +0200 Subject: gnu: Add python-nest-asyncio. * gnu/packages/python-xyz.scm (python-nest-asyncio): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f837bf7429..67b2172e91 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23851,6 +23851,28 @@ be kept in mind when creating it. It is easily created, modified, or viewed wit a text editor and easily understood and used by both programmers and non-programmers.") (license license:expat))) ; MIT license +(define-public python-nest-asyncio + (package + (name "python-nest-asyncio") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nest_asyncio" version)) + (sha256 + (base32 + "1anha29fcijminn5bh2icnx8x7nk39lna9wkc72262i12p2s3idg")))) + (build-system python-build-system) + (home-page "https://github.com/erdewit/nest_asyncio") + (synopsis "Patch asyncio to allow nested event loops") + (description + "By design @code{asyncio} does not allow its event loop to be nested. +This presents a practical problem: when in an environment where the event loop +is already running it's impossible to run tasks and wait for the result. This +module patches @code{asyncio} to allow nested use of @code{asyncio.run} and +@code{loop.run_until_complete}.") + (license license:bsd-3))) + (define-public python-parallel (package (name "python-parallel") -- cgit v1.2.3 From 95456c2fc9440bc7aa7657a0360486d6d74336da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:38:26 +0200 Subject: gnu: Add python-jupyterlab-pygments. * gnu/packages/jupyter.scm (python-jupyterlab-pygments): New variable. --- gnu/packages/jupyter.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index f826ebd171..955273a0c3 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -184,3 +185,25 @@ Several Jupyter kernels are built upon @code{xeus}, such as @code{xeus-cling}, a kernel for the C++ programming language, and @code{xeus-python}, an alternative Python kernel for Jupyter.") (license license:bsd-3))) + +(define-public python-jupyterlab-pygments + (package + (name "python-jupyterlab-pygments") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyterlab_pygments" version)) + (sha256 + (base32 + "0ij14mmnc39nmf84i0av6j9glazjic7wzv1qyhr0j5966s3s1kfg")))) + (build-system python-build-system) + (arguments '(#:tests? #false)) ; there are no tests + (propagated-inputs + `(("python-pygments" ,python-pygments))) + (home-page "https://jupyter.org") + (synopsis "Pygments theme using JupyterLab CSS variables") + (description + "This package contains a syntax coloring theme for pygments making use of +the JupyterLab CSS variables.") + (license license:bsd-3))) -- cgit v1.2.3 From 74d2d7a322ecf0013005491a77d91ebb21d11767 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:38:47 +0200 Subject: gnu: Add python-nbclient. * gnu/packages/jupyter.scm (python-nbclient): New variable. --- gnu/packages/jupyter.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 955273a0c3..6db61f398b 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -30,9 +30,12 @@ #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time) - #:use-module (gnu packages tls)) + #:use-module (gnu packages tls) + #:use-module (gnu packages xml)) (define-public python-jupyter-protocol (package @@ -207,3 +210,51 @@ alternative Python kernel for Jupyter.") "This package contains a syntax coloring theme for pygments making use of the JupyterLab CSS variables.") (license license:bsd-3))) + +(define-public python-nbclient + (package + (name "python-nbclient") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nbclient" version)) + (sha256 + (base32 + "172q4r6mq0lg394di0pc6ipvniy14jg38wkdsj48r366609jf5yv")))) + (build-system python-build-system) + ;; Tests require a kernel via python-ipykernel, and also tools from + ;; nbconvert. + (arguments '(#:tests? #false)) + (propagated-inputs + `(("python-async-generator" ,python-async-generator) + ("python-jupyter-client" ,python-jupyter-client) + ("python-nbformat" ,python-nbformat) + ("python-nest-asyncio" ,python-nest-asyncio) + ("python-traitlets" ,python-traitlets))) + (native-inputs + `(("python-black" ,python-black) + ("python-bumpversion" ,python-bumpversion) + ("python-check-manifest" ,python-check-manifest) + ("python-codecov" ,python-codecov) + ("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ;; ("python-ipykernel" ,python-ipykernel) + ;; ("python-ipython" ,python-ipython) + ;; ("python-ipywidgets" ,python-ipywidgets) + ("python-mypy" ,python-mypy) + ("python-pip" ,python-pip) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-setuptools" ,python-setuptools) + ("python-testpath" ,python-testpath) + ("python-tox" ,python-tox) + ("python-twine" ,python-twine) + ("python-wheel" ,python-wheel) + ("python-xmltodict" ,python-xmltodict))) + (home-page "https://jupyter.org") + (synopsis "Client library for executing notebooks") + (description + "This package provides a client library for executing notebooks. Formerly +nbconvert's @code{ExecutePreprocessor.}") + (license license:bsd-3))) -- cgit v1.2.3 From f4af353cb2d3d98fe2c581fa95815b0c4e4a9cbc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:35:46 +0200 Subject: gnu: python-nbconvert: Update to 6.0.7. * gnu/packages/python-xyz.scm (python-nbconvert): Update to 6.0.7. [arguments]: Remove configure flags, enable tests, override check phase. [propagated-inputs]: Add python-defusedxml, python-nbclient, python-pandocfilters, python-jupyterlab-pygments, and python-testpath. [properties]: Add python2-variant. (python2-nbconvert): Override version, source, arguments, and propagated-inputs. --- gnu/packages/python-xyz.scm | 78 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 67b2172e91..b8344dc695 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -151,6 +151,7 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages jupyter) #:use-module (gnu packages kerberos) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) @@ -10362,36 +10363,57 @@ time.") (define-public python-nbconvert (package (name "python-nbconvert") - (version "5.0.0b1") + (version "6.0.7") (source (origin (method url-fetch) (uri (pypi-uri "nbconvert" version)) (sha256 (base32 - "0brclbb18l4nmd5qy3dl9wn05rjdh1fz4rmzdlfqacj12rcdvdgp")))) + "00lhqaxn481qvk2w5568asqlsnvrw2fm61p1vssx3m7vdnl17g6b")))) (build-system python-build-system) (arguments - `(;; The "bdist_egg" target is disabled by default, causing the installation - ;; to fail. - #:configure-flags (list "bdist_egg") - ;; FIXME: 5 failures, 40 errors. - #:tests? #f)) - ;; #:phases - ;; (modify-phases %standard-phases - ;; (replace 'check - ;; (lambda _ - ;; (zero? (system* "py.test" "-v"))))) + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + + ;; This seems to require Chromium. + (delete-file "nbconvert/exporters/tests/test_webpdf.py") + + ;; This depends on the python3 kernel, which is provided by a + ;; package that depends on nbconvert. + (delete-file "nbconvert/preprocessors/tests/test_execute.py") + + ;; Most of these tests fail because nbconvert fails to execute + ;; itself. + (delete-file "nbconvert/tests/test_nbconvertapp.py") + + ;; One test here fails with an unclear error. It looks like + ;; "%%pylabprint" is supposed to be expanded to some other + ;; code, but isn't. + (delete-file "nbconvert/filters/tests/test_strings.py") + + ;; Some tests need HOME + (setenv "HOME" "/tmp") + (invoke "pytest"))))))) (native-inputs `(("python-pytest" ,python-pytest))) (propagated-inputs `(("python-bleach" ,python-bleach) + ("python-defusedxml" ,python-defusedxml) ("python-entrypoints" ,python-entrypoints) ("python-jinja2" ,python-jinja2) ("python-jupyter-core" ,python-jupyter-core) ("python-mistune" ,python-mistune) + ("python-nbclient" ,python-nbclient) ("python-nbformat" ,python-nbformat) + ("python-pandocfilters" ,python-pandocfilters) ("python-pygments" ,python-pygments) + ("python-jupyterlab-pygments" ,python-jupyterlab-pygments) + ("python-testpath" ,python-testpath) ("python-traitlets" ,python-traitlets))) (home-page "https://jupyter.org") (synopsis "Converting Jupyter Notebooks") @@ -10408,10 +10430,38 @@ convert an @code{.ipynb} notebook file into various static formats including: @item ReStructured Text (rst) @item executable script @end enumerate\n") - (license license:bsd-3))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-nbconvert)))))) (define-public python2-nbconvert - (package-with-python2 python-nbconvert)) + (let ((parent + (package-with-python2 + (strip-python2-variant python-nbconvert)))) + (package + (inherit parent) + (version "5.0.0b1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nbconvert" version)) + (sha256 + (base32 + "0brclbb18l4nmd5qy3dl9wn05rjdh1fz4rmzdlfqacj12rcdvdgp")))) + (arguments + `(;; The "bdist_egg" target is disabled by default, causing the installation + ;; to fail. + #:configure-flags (list "bdist_egg") + ;; FIXME: 5 failures, 40 errors. + #:tests? #f)) + (propagated-inputs + `(("python-bleach" ,python-bleach) + ("python-entrypoints" ,python-entrypoints) + ("python-jinja2" ,python-jinja2) + ("python-jupyter-core" ,python-jupyter-core) + ("python-mistune" ,python-mistune) + ("python-nbformat" ,python-nbformat) + ("python-pygments" ,python-pygments) + ("python-traitlets" ,python-traitlets)))))) (define-public python-notebook (package -- cgit v1.2.3 From 6b3872e871a4fbfd263a925e1546b02aa6dd5d5a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:41:25 +0200 Subject: gnu: python-nbformat: Update to 5.1.3. * gnu/packages/python-xyz.scm (python-nbformat): Update to 5.1.3. [arguments]: Remove to enable tests. [native-inputs]: Add python-pytest. [properties]: Add python2-variant. (python2-nbformat): Keep at version 4.4.0; override version and source field. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b8344dc695..0285a89bca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10190,29 +10190,42 @@ Debian-related files, such as: (define-public python-nbformat (package (name "python-nbformat") - (version "4.4.0") + (version "5.1.3") (source (origin (method url-fetch) (uri (pypi-uri "nbformat" version)) (sha256 (base32 - "00nlf08h8yc4q73nphfvfhxrcnilaqanb8z0mdy6nxk0vzq4wjgp")))) + "1j6idwsw59cslsssvlkg2bkfpvd6ri7kghbp14jwcw87sy57h5mm")))) (build-system python-build-system) - (arguments `(#:tests? #f)) ; no test target (propagated-inputs `(("python-ipython-genutils" ,python-ipython-genutils) ("python-jsonschema" ,python-jsonschema) ("python-jupyter-core" ,python-jupyter-core) ("python-traitlets" ,python-traitlets))) + (native-inputs + `(("python-pytest" ,python-pytest))) (home-page "https://jupyter.org") (synopsis "Jupyter Notebook format") (description "This package provides the reference implementation of the Jupyter Notebook format and Python APIs for working with notebooks.") + (properties `((python2-variant . ,(delay python2-nbformat)))) (license license:bsd-3))) (define-public python2-nbformat - (package-with-python2 python-nbformat)) + (let ((parent (package-with-python2 + (strip-python2-variant python-nbformat)))) + (package + (inherit parent) + (version "4.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nbformat" version)) + (sha256 + (base32 + "00nlf08h8yc4q73nphfvfhxrcnilaqanb8z0mdy6nxk0vzq4wjgp"))))))) (define-public python-bleach (package -- cgit v1.2.3 From 1388c166e770f4ba4a24f0b45bf50d507b97cbe3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:40:13 +0200 Subject: gnu: Remove python2-matplotlib-documentation. * gnu/packages/python-xyz.scm (python2-matplotlib-documentation): Remove variable. --- gnu/packages/python-xyz.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0285a89bca..1f76cfdce9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5432,14 +5432,6 @@ toolkits.") (description (package-description python-matplotlib)) (license (package-license python-matplotlib)))) -(define-public python2-matplotlib-documentation - (let ((parent (package-with-python2 python-matplotlib-documentation))) - (package - (inherit parent) - (native-inputs - (alist-delete "python-sphinx-copybutton" - (package-native-inputs parent)))))) - (define-public python-matplotlib-venn (package (name "python-matplotlib-venn") -- cgit v1.2.3 From 3a62614f322f403568aa0e0d110a256387c5a012 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:43:28 +0200 Subject: gnu: Remove python2-ipyparallel. * gnu/packages/python-xyz.scm (python2-ipyparallel): Remove variable. --- gnu/packages/python-xyz.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f76cfdce9..f454a0a018 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7105,13 +7105,6 @@ CLI scripts: @end enumerate") (license license:bsd-3))) -(define-public python2-ipyparallel - (let ((ipyparallel (package-with-python2 python-ipyparallel))) - (package/inherit ipyparallel - (propagated-inputs - `(("python2-futures" ,python2-futures) - ,@(package-propagated-inputs ipyparallel)))))) - (define-public python-ipython-cluster-helper (package (name "python-ipython-cluster-helper") -- cgit v1.2.3 From a0a8fdeaf2db2695dd7944ee7d2e5eeade9e600b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:44:07 +0200 Subject: gnu: Remove python2-jupyter-core. * gnu/packages/python-xyz.scm (python2-jupyter-core): Remove variable. --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f454a0a018..c3966c8016 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7215,9 +7215,6 @@ without using the configuration machinery.") "Jupyter core is the base package on which Jupyter projects rely.") (license license:bsd-3))) -(define-public python2-jupyter-core - (package-with-python2 python-jupyter-core)) - (define-public python-jupyter-client (package (name "python-jupyter-client") -- cgit v1.2.3 From 89f1a4a415fb00723522e786edf519deb6dd40e7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:44:34 +0200 Subject: gnu: Remove python2-jupyter-console. * gnu/packages/python-xyz.scm (python2-jupyter-console): Remove variable. (python-jupyter-console)[properties]: Remove python2-variant. --- gnu/packages/python-xyz.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c3966c8016..828a3561fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10611,36 +10611,6 @@ in the data.") (synopsis "Jupyter terminal console") (description "This package provides a terminal-based console frontend for Jupyter kernels. It also allows for console-based interaction with non-Python -Jupyter kernels such as IJulia and IRKernel.") - (properties `((python2-variant . ,(delay python2-jupyter-console)))) - (license license:bsd-3))) - -(define-public python2-jupyter-console - (package - (name "python2-jupyter-console") - (version "5.2.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "jupyter_console" version)) - (sha256 - (base32 - "1kam1qzgwr7srhm5r6aj90di5sws4bq0jmiw15452ddamb9yspal")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:tests? #f)) ; Tests only run in a TTY. - (propagated-inputs - `(("python2-ipykernel" ,python2-ipykernel) - ("python2-jupyter-client" ,python2-jupyter-client) - ("python2-prompt-toolkit" ,python2-prompt-toolkit-1) - ("python2-pygments" ,python2-pygments))) - (native-inputs - `(("python2-nose" ,python2-nose))) - (home-page "https://jupyter.org") - (synopsis "Jupyter terminal console") - (description "This package provides a terminal-based console frontend for -Jupyter kernels. It also allows for console-based interaction with non-Python Jupyter kernels such as IJulia and IRKernel.") (license license:bsd-3))) -- cgit v1.2.3 From 5ce53a4d1c6e88f3ac072ce86ef4746912399298 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 08:45:04 +0200 Subject: gnu: Remove python2-ipykernel. * gnu/packages/python-xyz.scm (python2-ipykernel): Remove variable. (python-ipykernel)[properties]: Remove python2-variant. --- gnu/packages/python-xyz.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 828a3561fc..5a311d409c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7301,38 +7301,6 @@ installing @code{kernelspec}s for use with Jupyter frontends.") ("python-pytest" ,python-pytest))) (home-page "https://ipython.org") (synopsis "IPython Kernel for Jupyter") - (description - "This package provides the IPython kernel for Jupyter.") - (properties `((python2-variant . ,(delay python2-ipykernel)))) - (license license:bsd-3))) - -;; Version 5.x and above no longer support Python 2. -(define-public python2-ipykernel - (package - (name "python2-ipykernel") - (version "4.10.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ipykernel" version)) - (sha256 - (base32 "1yzmdiy1djsszqp54jzd8ym8h4hpl67zjq83j2kxbkp0rwmlpdzf")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (propagated-inputs - `(("python2-ipython" ,python2-ipython) - ;; imported at runtime during connect - ("python2-jupyter-client" ,python2-jupyter-client) - ("python2-tornado" ,python2-tornado) - ("python2-traitlets" ,python2-traitlets))) - (native-inputs - `(("python2-mock" ,python2-mock) - ("python2-nose" ,python2-nose) - ("python2-pytest" ,python2-pytest) - ("python2-pytest-cov" ,python2-pytest-cov))) - (home-page "https://ipython.org") - (synopsis "IPython Kernel for Jupyter") (description "This package provides the IPython kernel for Jupyter.") (license license:bsd-3))) -- cgit v1.2.3 From 3bd962bc3c03d859ef8eacf52113d594d83a0815 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 11:33:06 +0200 Subject: gnu: Add python-pytoml. * gnu/packages/python-build.scm (python-pytoml): New variable. --- gnu/packages/python-build.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 15e671b2c2..13acbca355 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2018, 2021 Maxim Cournoyer ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +90,23 @@ installed with a newer @code{pip} or with wheel's own command line utility.") Language (TOML) configuration files.") (license license:expat))) +(define-public python-pytoml + (package + (name "python-pytoml") + (version "0.1.21") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytoml" version)) + (sha256 + (base32 + "1rv1byiw82k7mj6aprcrqi2vdabs801y97xhfnrz7kxds34ggv4f")))) + (build-system python-build-system) + (home-page "https://github.com/avakar/pytoml") + (synopsis "Parser for TOML") + (description "This package provides a Python parser for TOML-0.4.0.") + (license license:expat))) + (define-public python-pep517-bootstrap (hidden-package (package -- cgit v1.2.3 From 2572bc812550eb6b881cddeeef3249fb6889cab6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 12:10:02 +0200 Subject: gnu: Add python-pygments-github-lexers. * gnu/packages/python-xyz.scm (python-pygments-github-lexers): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5a311d409c..3bfbe8373d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3735,6 +3735,25 @@ text styles of documentation.") (base32 "1zmhnswy0wxfn0xprs9aqsvx2c3kmzfn2wx14q8cv3vpkxdamj4q"))))))) +(define-public python-pygments-github-lexers + (package + (name "python-pygments-github-lexers") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pygments-github-lexers" version)) + (sha256 + (base32 + "0cz14clcc9z4pn79ll8hp3xzgsrfjscak5zfsvlgrz6ngkkmgjma")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pygments" ,python-pygments))) + (home-page "https://github.com/liluo/pygments-github-lexers") + (synopsis "Pygments Github custom lexers") + (description "This package installs Github custom lexers to Pygments.") + (license license:bsd-3))) + (define-public python-bump2version (package (name "python-bump2version") -- cgit v1.2.3 From f5acecdd46cb010dde119ba75e7e36fc3323e39f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 12:11:38 +0200 Subject: gnu: Add python-requests-unixsocket. * gnu/packages/python-web.scm (python-requests-unixsocket): New variable. --- gnu/packages/python-web.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c78de311ab..6ae377a55d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2523,6 +2523,53 @@ than Python’s urllib2 library.") (define-public python2-requests (package-with-python2 python-requests)) +(define-public python-requests-unixsocket + (package + (name "python-requests-unixsocket") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "requests-unixsocket" version)) + (sha256 + (base32 + "1sn12y4fw1qki5gxy9wg45gmdrxhrndwfndfjxhpiky3mwh1lp4y")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "test-requirements.txt" + (("(.*)==(.*)" _ name) (string-append name "\n"))))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv")))))) + (propagated-inputs + `(("python-pbr" ,python-pbr) + ("python-requests" ,python-requests) + ("python-urllib3" ,python-urllib3))) + (native-inputs + `(("python-apipkg" ,python-apipkg) + ("python-appdirs" ,python-appdirs) + ("python-execnet" ,python-execnet) + ("python-packaging" ,python-packaging) + ("python-pep8" ,python-pep8) + ("python-py" ,python-py) + ("python-pyparsing" ,python-pyparsing) + ("python-pytest" ,python-pytest) + ("python-pytest-cache" ,python-pytest-cache) + ("python-pytest-pep8" ,python-pytest-pep8) + ("python-six" ,python-six) + ("python-waitress" ,python-waitress))) + (home-page "https://github.com/msabramo/requests-unixsocket") + (synopsis "Talk HTTP via a UNIX domain socket") + (description + "This Python package lets you use the @code{requests} library to talk +HTTP via a UNIX domain socket.") + (license license:asl2.0))) + (define-public python-requests_ntlm (package (name "python-requests_ntlm") -- cgit v1.2.3 From a818a34f88f3054b9993bb77246d587d3255a5f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 12:35:09 +0200 Subject: gnu: Add python-sphinxcontrib-github-alt. * gnu/packages/sphinx.scm (python-sphinxcontrib-github-alt): New variable. --- gnu/packages/sphinx.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index e85e4a0f7e..4aeed10f30 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson -;;; Copyright © 2015, 2017, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke @@ -216,6 +216,28 @@ to code blocks.") @url{Devhelp,https://wiki.gnome.org/Apps/Devhelp} documents.") (license license:bsd-2))) +(define-public python-sphinxcontrib-github-alt + (package + (name "python-sphinxcontrib-github-alt") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib_github_alt" version)) + (sha256 + (base32 + "1x9af78vamjjcdrrhiah3wg613jv7gm8yh9vvqfrmf4vam6mimyg")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docutils" ,python-docutils) + ("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/jupyter/sphinxcontrib_github_alt") + (synopsis "Link to GitHub pages from Sphinx docs") + (description + "This package lets you link to GitHub issues, pull requests, commits and +users from Sphinx docs.") + (license license:bsd-2))) + (define-public python-sphinxcontrib-htmlhelp (package (name "python-sphinxcontrib-htmlhelp") -- cgit v1.2.3 From 636f4d505157a2fb262255a45bd47a835e2aacbc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 12:31:46 +0200 Subject: gnu: python-flit: Update to 3.2.0. * gnu/packages/python-xyz.scm (python-flit): Update to 3.2.0. [source]: Fetch from git repository to include flit_core. [arguments]: Add phases to bootstrap the build. [propagated-inputs]: Add python-pytoml and python-toml. [native-inputs]: Add python-docutils, python-responses, python-pygments-github-lexers, python-pytest, python-pytest-cov, python-sphinx, python-sphinxcontrib-github-alt, and python-testpath. --- gnu/packages/python-xyz.scm | 86 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 77 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3bfbe8373d..003c72f1a4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21733,17 +21733,85 @@ the syntactic logic to configure and launch jobs in an execution environment.") (define-public python-flit (package (name "python-flit") - (version "3.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "flit" version)) - (sha256 - (base32 - "14q8qa48bli2mniznc8b54qkwvhbik4kw99y01fi5gzzl620zzml")))) + (version "3.2.0") + ;; We fetch the sources via git because on pypi the package is split into + ;; two parts: flit and flit_core; flit_core cannot be built without flit. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/takluyver/flit") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fpqxpz5bv2xpv1akmc0c8yfss6sj09wdzxrlf3qw1lp1jhbzpyc")))) (build-system python-build-system) (arguments - `(#:tests? #f)) ; XXX: Check requires network access. + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'bootstrap + (lambda* (#:key inputs #:allow-other-keys) + (let ((home (string-append (getcwd) "/home"))) + (mkdir-p home) + (setenv "HOME" home)) + (for-each make-file-writable (find-files ".")) + (copy-recursively (assoc-ref inputs "python-testpath") + (string-append (getcwd) "/testpath")) + (substitute* "pyproject.toml" + (("\"testpath\",") "")) + (invoke "python" "bootstrap_dev.py"))) + (replace 'build + (lambda _ + ;; A ZIP archive should be generated, but it fails with "ZIP does + ;; not support timestamps before 1980". Luckily, + ;; SOURCE_DATE_EPOCH is respected, which we set to some time in + ;; 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (for-each (lambda (toml) + (invoke "python3" "-m" "flit" + "--debug" "--ini-file" toml + "build")) + '("testpath/pyproject.toml" + "pyproject.toml")) + (with-directory-excursion "flit_core" + (invoke "python" "build_dists.py")))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (let ((out (assoc-ref outputs "out"))) + (delete-file-recursively "./home") + (for-each (lambda (wheel) + (format #true wheel) + (invoke "python" "-m" "pip" "install" + wheel (string-append "--prefix=" out))) + (append + (find-files "flit_core/dist" "\\.whl$") + (find-files "dist" "\\.whl$"))))))) + #:tests? #f)) ; XXX: Check requires network access. + (propagated-inputs + `(("python-pytoml" ,python-pytoml) + ("python-toml" ,python-toml))) + (native-inputs + `(("python-docutils" ,python-docutils) + ("python-responses" ,python-responses) + ("python-pygments-github-lexers" ,python-pygments-github-lexers) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-sphinx" ,python-sphinx) + ("python-sphinxcontrib-github-alt" ,python-sphinxcontrib-github-alt) + ;; This package needs testpath, but testpath also needs flit... + ("python-testpath" + ,(let ((name "python-testpath") + (version "0.4.4")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jupyter/testpath") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fwv4d3p54xx1x942s104irr35lszvv6jnr4nn1scsfvc0m1qmbk"))))))) (home-page "https://flit.readthedocs.io/") (synopsis "Simple packaging tool for simple packages") -- cgit v1.2.3 From 5c89e2ac6f337c4ca5af2091345d2927f6224116 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 12:33:50 +0200 Subject: gnu: python-testpath: Update to 0.4.4. * gnu/packages/check.scm (python-testpath): Update to 0.4.4. [arguments]: Build the package as intended with flit. [native-inputs]: Add python-flit. --- gnu/packages/check.scm | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 025e6df4f6..2ad4de55f8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2017, 2019 Kei Kebreau ;;; Copyright © 2017 Nikita -;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2017, 2018, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2020 Ludovic Courtès ;;; Copyright © 2018 Fis Trivial @@ -1769,7 +1769,7 @@ C/C++, R, and more, and uploads it to the @code{codecov.io} service.") (define-public python-testpath (package (name "python-testpath") - (version "0.2") + (version "0.4.4") (source (origin (method git-fetch) @@ -1779,7 +1779,7 @@ C/C++, R, and more, and uploads it to the @code{codecov.io} service.") (file-name (git-file-name name version)) (sha256 (base32 - "0r4iiizjql6ny1ln7ciw7rrbjadz1s9zrf2hl0xkgnh3ypd8936f")))) + "1fwv4d3p54xx1x942s104irr35lszvv6jnr4nn1scsfvc0m1qmbk")))) (build-system python-build-system) (arguments `(#:tests? #f ; this package does not even have a setup.py @@ -1788,19 +1788,25 @@ C/C++, R, and more, and uploads it to the @code{codecov.io} service.") (srfi srfi-1)) #:phases (modify-phases %standard-phases - (delete 'install) (replace 'build + (lambda _ + ;; A ZIP archive should be generated, but it fails with "ZIP does + ;; not support timestamps before 1980". Luckily, + ;; SOURCE_DATE_EPOCH is respected, which we set to some time in + ;; 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "flit" "build"))) + (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((version (last - (string-split (assoc-ref inputs "python") #\-))) - (x.y (string-join (take (string-split version #\.) 2) - ".")) - (dir (string-append - (assoc-ref outputs "out") - "/lib/python" x.y "/site-packages/testpath"))) - (mkdir-p dir) - (copy-recursively "testpath" dir)) - #t))))) + (add-installed-pythonpath inputs outputs) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (wheel) + (format #true wheel) + (invoke "python" "-m" "pip" "install" + wheel (string-append "--prefix=" out))) + (find-files "dist" "\\.whl$")))))))) + (native-inputs + `(("python-flit" ,python-flit))) (home-page "https://github.com/takluyver/testpath") (synopsis "Test utilities for code working with files and commands") (description -- cgit v1.2.3 From c00996fdbe39d5b3ac4dc63eda45e7eb5b13e0f4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 12:34:52 +0200 Subject: gnu: Add python-deprecation. * gnu/packages/python-xyz.scm (python-deprecation): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 003c72f1a4..f529be29d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11656,6 +11656,32 @@ Pytest but stripped of Pytest specific details.") code.") (license license:expat))) +(define-public python-deprecation + (package + (name "python-deprecation") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "deprecation" version)) + (sha256 + (base32 + "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj")))) + (build-system python-build-system) + (propagated-inputs + `(("python-packaging" ,python-packaging))) + (native-inputs + `(("python-unittest2" ,python-unittest2))) + (home-page "https://deprecation.readthedocs.io/") + (synopsis "Python library to handle automated deprecations") + (description + "This is a library that enables automated deprecations. It offers the +@code{deprecated()} decorator to wrap functions, providing proper warnings +both in documentation and via Python’s warnings system, as well as the +@code{deprecation.fail_if_not_removed()} decorator for test methods to ensure +that deprecated code is eventually removed.") + (license license:asl2.0))) + (define-public python-tox (package (name "python-tox") -- cgit v1.2.3 From a26dd2e282c10224e6512fa09f8badb205c2ad82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 13:14:37 +0200 Subject: gnu: Add python-jupyter-packaging. * gnu/packages/jupyter.scm (python-jupyter-packaging): New variable. --- gnu/packages/jupyter.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 6db61f398b..796a8dc912 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -211,6 +211,37 @@ alternative Python kernel for Jupyter.") the JupyterLab CSS variables.") (license license:bsd-3))) +(define-public python-jupyter-packaging + (package + (name "python-jupyter-packaging") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyter_packaging" version)) + (sha256 + (base32 + "0r015c0m713d19asmpimsw6bk2sqv2lpd2nccgjzjdj5h1crg0bg")))) + (build-system python-build-system) + (propagated-inputs + `(("python-deprecation" ,python-deprecation) + ("python-packaging" ,python-packaging) + ("python-setuptools" ,python-setuptools) + ("python-tomlkit" ,python-tomlkit) + ("python-wheel" ,python-wheel))) + (native-inputs + `(("python-pypa-build" ,python-pypa-build) + ("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-mock" ,python-pytest-mock))) + (home-page "https://jupyter.org") + (synopsis "Jupyter packaging utilities") + (description "This package provides tools to help build and install +Jupyter Python packages that require a pre-build step that may include +JavaScript build steps.") + (license license:bsd-3))) + (define-public python-nbclient (package (name "python-nbclient") -- cgit v1.2.3 From 4cb6120584e6d19ca8ac5756c48ac3cca660145d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 13:14:49 +0200 Subject: gnu: Add python-jupyterlab-widgets. * gnu/packages/jupyter.scm (python-jupyterlab-widgets): New variable. --- gnu/packages/jupyter.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 796a8dc912..52869dbeeb 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -242,6 +242,27 @@ Jupyter Python packages that require a pre-build step that may include JavaScript build steps.") (license license:bsd-3))) +(define-public python-jupyterlab-widgets + (package + (name "python-jupyterlab-widgets") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyterlab_widgets" version)) + (sha256 + (base32 + "0y7vhhas3qndiypcpcfnhrj9n92v2w4hdc86nn620s9h9nl2j6jw")))) + (build-system python-build-system) + (native-inputs + `(("python-jupyter-packaging" ,python-jupyter-packaging) + ("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/jupyter-widgets/ipywidgets") + (synopsis "Interactive widgets for Jupyter Notebooks") + (description "ipywidgets, also known as jupyter-widgets or simply widgets, +are interactive HTML widgets for Jupyter notebooks and the IPython kernel.") + (license license:bsd-3))) + (define-public python-nbclient (package (name "python-nbclient") -- cgit v1.2.3 From 7c4f9c17dee9aa62f9ad050c829c0b79b1e36cec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 13:17:24 +0200 Subject: gnu: python-widgetsnbextension: Remove unnecessary inputs. * gnu/packages/python-xyz.scm (python-widgetsnbextension)[propagated-inputs]: Remove python-argon2-cffi, python-ipykernel, and python-terminado. [native-inputs]: Remove python-certifi and python-nose. --- gnu/packages/python-xyz.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f529be29d8..e3aa20dc5d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10535,13 +10535,7 @@ interactive computing.") "1ismyaxbv9d56yqqqb8xl58hg0iq0bbyy014a53y1g3hfbc8g7q7")))) (build-system python-build-system) (propagated-inputs - `(("python-argon2-cffi" ,python-argon2-cffi) - ("python-ipykernel" ,python-ipykernel) - ("python-notebook" ,python-notebook) - ("python-terminado" ,python-terminado))) - (native-inputs - `(("python-certifi" ,python-certifi) - ("python-nose" ,python-nose))) + `(("python-notebook" ,python-notebook))) (home-page "https://ipython.org") (synopsis "IPython HTML widgets for Jupyter") (description "This package provides interactive HTML widgets for Jupyter -- cgit v1.2.3 From cf1517a1b76b37c96eb4892ecfb6f2fabf0fde49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 13:19:37 +0200 Subject: gnu: python-ipywidgets: Update to 7.6.3. * gnu/packages/python-xyz.scm (python-ipywidgets): Update to 7.6.3. [propagated-inputs]: Add python-ipython, python-jupyterlab-widgets, and python-nbformat. [native-inputs]: Remove python-nose; add python-mock and ptyhon-pytest-cov. --- gnu/packages/python-xyz.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3aa20dc5d..9660f6ffd2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10545,22 +10545,26 @@ notebooks.") (define-public python-ipywidgets (package (name "python-ipywidgets") - (version "7.5.1") + (version "7.6.3") (source (origin (method url-fetch) (uri (pypi-uri "ipywidgets" version)) (sha256 (base32 - "15sww2mvnkqlvx55gwa82v05062a8j1xpncnqna4k9sl53hgcig9")))) + "1w217j8i53x14l7b05fk300k222zs9vkcjaa1rbrw3sk43k466lz")))) (build-system python-build-system) (propagated-inputs - `(("python-ipython" ,python-ipython) + `(("python-ipykernel" ,python-ipykernel) + ("python-ipython" ,python-ipython) + ("python-jupyterlab-widgets" ,python-jupyterlab-widgets) + ("python-nbformat" ,python-nbformat) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) (native-inputs - `(("python-nose" ,python-nose) - ("python-pytest" ,python-pytest))) + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) (home-page "https://ipython.org") (synopsis "IPython HTML widgets for Jupyter") (description "Ipywidgets are interactive HTML widgets for Jupyter -- cgit v1.2.3 From 9e7f09cbec40257619e57edfdd700c775e96833d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Apr 2021 13:39:33 +0200 Subject: gnu: python-tinycss2: Enable tests. * gnu/packages/python-web.scm (python-tinycss2)[source]: Fetch from git repository to include tests. [arguments]: Build from source with flit. [native-inputs]: Add python-flit, python-pytest, python-pytest-cov, python-pytest-flake8, and python-pytest-isort. --- gnu/packages/python-web.scm | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6ae377a55d..1e57165509 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4563,18 +4563,47 @@ library to create slugs from unicode strings while keeping it DRY.") (version "1.1.0") (source (origin - (method url-fetch) - (uri (pypi-uri "tinycss2" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kozea/tinycss2") + (commit (string-append "v" version)) + (recursive? #true))) + (file-name (git-file-name name version)) (sha256 - (base32 "12p16k8x8ig51gpfcwz3k3kxpxrwwkn41a1avdgvh3nn8hqarp7v")))) + (base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq")))) (build-system python-build-system) (arguments - ;; Test data is missing from the PyPI archive, and the build system is - ;; based on Flit, which wants an unmaintained and unpackaged - ;; python-pytoml dependency. - `(#:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + ;; A ZIP archive should be generated, but it fails with "ZIP does + ;; not support timestamps before 1980". Luckily, + ;; SOURCE_DATE_EPOCH is respected, which we set to some time in + ;; 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "flit" "build"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (wheel) + (format #true wheel) + (invoke "python" "-m" "pip" "install" + wheel (string-append "--prefix=" out))) + (find-files "dist" "\\.whl$"))))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv")))))) (propagated-inputs `(("python-webencodings" ,python-webencodings))) + (native-inputs + `(("python-flit" ,python-flit) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-flake8" ,python-pytest-flake8) + ("python-pytest-isort" ,python-pytest-isort))) (home-page "https://tinycss2.readthedocs.io/") (synopsis "Low-level CSS parser for Python") (description "@code{tinycss2} can parse strings, return Python objects -- cgit v1.2.3 From f0741f3efe924c39bbced763326fa5bd90dc478e Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Wed, 7 Apr 2021 10:14:35 +0200 Subject: gnu: Add r-hmm. * gnu/packages/cran.scm (r-hmm): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0917c0bcaf..1e2aac8049 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016 Pjotr Prins ;;; Copyright © 2016, 2017 Ben Woodcroft -;;; Copyright © 2016, 2017, 2018, 2020 Roel Janssen +;;; Copyright © 2016, 2017, 2018, 2020, 2021 Roel Janssen ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Raoul Bonnal ;;; Copyright © 2018 Vijayalakshmi Vedantham @@ -1059,6 +1059,25 @@ the embedded @code{RapidXML} C++ library.") into a pipeline of data manipulation and visualisation.") (license license:gpl3))) +(define-public r-hmm + (package + (name "r-hmm") + (version "1.0") + (source (origin + (method url-fetch) + (uri (cran-uri "HMM" version)) + (sha256 + (base32 + "0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw")))) + (properties `((upstream-name . "HMM"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/HMM/") + (synopsis "Hidden Markov Models") + (description "This package provides an easy to use library to setup, apply +and make inference with discrete time and discrete space hidden Markov +models.") + (license license:gpl2+))) + (define-public r-httpuv (package (name "r-httpuv") -- cgit v1.2.3 From 516a101dd4993116c59ed83d8baa546960d0061e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 13 Apr 2021 15:21:13 +0300 Subject: gnu: openconnect-sso: Update to 0.7.2. * gnu/packages/vpn.scm (openconnect-sso): Update to 0.7.2. [arguments]: Remove 'adjust-package-version-requirements phase. --- gnu/packages/vpn.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 4eccd2c64f..adb48b1b97 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -293,24 +293,19 @@ and probably others.") (define-public openconnect-sso (package (name "openconnect-sso") - (version "0.6.2") + (version "0.7.2") (source (origin (method url-fetch) (uri (pypi-uri "openconnect-sso" version)) (sha256 (base32 - "1yybmscka3m5yxfkp1m5pqz2m8jlwdq9b0hx2w5l1jj6bzpl9fsf")))) + "0nb40zfpp38mz6389y0qvrr4mmak53swpg7578cldnhnk0g15qni")))) (build-system python-build-system) (arguments `(#:tests? #f ; Tests not included, building from git requires poetry. #:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-package-version-requirements - (lambda _ - (substitute* "setup.py" - (("(pyxdg>=0.26),<0.27" _ pyxdg) pyxdg)) - #t)) (add-after 'unpack 'patch-openconnect (lambda _ (substitute* "openconnect_sso/app.py" -- cgit v1.2.3 From b5607d830c917c49ca9a7993962bd2b7c7be953c Mon Sep 17 00:00:00 2001 From: Peter Lo Date: Sun, 28 Jun 2020 16:10:29 +0800 Subject: gnu: Add r-randomforestsrc. * gnu/packages/cran.scm (r-randomforestsrc): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1e2aac8049..6f931f06c2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28336,3 +28336,29 @@ indicator, a quantitative variable or a survival time.") differential expression analysis, RNAseq data and related problems.") ;; Any version of the LGPL (license license:lgpl3+))) + +(define-public r-randomforestsrc + (package + (name "r-randomforestsrc") + (version "2.9.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "randomForestSRC" version)) + (sha256 + (base32 + "05ifvj49jv0n5p6k46milpgj9r10sc5aw23fypyyibdgwpwvwixw")))) + (properties + `((upstream-name . "randomForestSRC"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/randomForestSRC/") + (synopsis "Random forests for survival, regression, and classification") + (description + "This package implements fast OpenMP parallel computing of Breiman's +random forests for survival, competing risks, regression and classification +based on Ishwaran and Kogalur's popular random survival forests (RSF) package. +It handles missing data and now includes multivariate, unsupervised forests, +quantile regression and solutions for class imbalanced data. It provides a +fast interface using subsampling and confidence regions for variable +importance.") + (license license:gpl3+))) -- cgit v1.2.3 From f3626119d738f30b5ab59e76c105fd7b4c077ddc Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Sun, 11 Apr 2021 10:30:01 +0200 Subject: services: mysql: Add extra-environment as configuration option. * gnu/services/databases.scm (mysql-configuration): Add extra-environment (mysql-service): Use #:log-file and #:environment-variables * doc/guix.texi: Document it. Signed-off-by: Leo Prikler --- doc/guix.texi | 3 +++ gnu/services/databases.scm | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 1069a5d296..fa14b35e2a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19947,6 +19947,9 @@ Socket file to use for local (non-network) connections. @item @code{extra-content} (default: @code{""}) Additional settings for the @file{my.cnf} configuration file. +@item @code{extra-environment} (default: @code{#~'()}) +List of environment variables passed to the @command{mysqld} process. + @item @code{auto-upgrade?} (default: @code{#t}) Whether to automatically run @command{mysql_upgrade} after starting the service. This is necessary to upgrade the @dfn{system schema} after diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 6ef3f3383c..956993de7a 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -527,6 +528,7 @@ created after the PostgreSQL database is started."))) (port mysql-configuration-port (default 3306)) (socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock")) (extra-content mysql-configuration-extra-content (default "")) + (extra-environment mysql-configuration-extra-environment (default #~'())) (auto-upgrade? mysql-configuration-auto-upgrade? (default #t))) (define %mysql-accounts @@ -611,11 +613,14 @@ FLUSH PRIVILEGES; (provision '(mysql)) (documentation "Run the MySQL server.") (start (let ((mysql (mysql-configuration-mysql config)) + (extra-env (mysql-configuration-extra-environment config)) (my.cnf (mysql-configuration-file config))) #~(make-forkexec-constructor (list (string-append #$mysql "/bin/mysqld") (string-append "--defaults-file=" #$my.cnf)) - #:user "mysql" #:group "mysql"))) + #:user "mysql" #:group "mysql" + #:log-file "/var/log/mysqld.log" + #:environment-variables #$extra-env))) (stop #~(make-kill-destructor))))) (define (mysql-upgrade-wrapper mysql socket-file) -- cgit v1.2.3 From ea89fcb0da2d8dac954c612daa9db9e7ceb3a069 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 13 Apr 2021 19:30:02 +0200 Subject: services: postgresql: Use "/tmp" host directory. This is a follow-up of c311147bd16aa0e5746d9cbf31502f5fd61e470c. * gnu/services/databases.scm ()[host]: Set to "/tmp" which the default Postgresql socket directory. --- gnu/services/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 956993de7a..eba88cdb68 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -364,7 +364,7 @@ and stores the database cluster in @var{data-directory}." postgresql-role-configuration make-postgresql-role-configuration postgresql-role-configuration? (host postgresql-role-configuration-host ;string - (default "/var/run/postgresql")) + (default "/tmp")) (log postgresql-role-configuration-log ;string (default "/var/log/postgresql_roles.log")) (roles postgresql-role-configuration-roles -- cgit v1.2.3 From c51ffa784e06f1541ee4e6a2378122e51f390e54 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 13 Apr 2021 19:26:39 +0200 Subject: tests: postgresql: Fix it. This is a follow-up of c311147bd16aa0e5746d9cbf31502f5fd61e470c. * gnu/tests/databases.scm (run-postgresql-test): Use "/tmp" as database host. --- gnu/tests/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm index 4bfe4ee282..c8d11e10c0 100644 --- a/gnu/tests/databases.scm +++ b/gnu/tests/databases.scm @@ -233,7 +233,7 @@ (let* ((port (open-pipe* OPEN_READ #$(file-append postgresql "/bin/psql") - "-tAh" "/var/run/postgresql" + "-tAh" "/tmp" "-c" "SELECT 1 FROM pg_database WHERE datname='root'")) (output (get-string-all port))) -- cgit v1.2.3 From 15de49e60b255b98a53c6de4780e1ae95a8beada Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 12 Apr 2021 02:19:33 -0400 Subject: gnu: le-certs: Update to new Let's Encrypt certificates. * gnu/packages/certs.scm (le-certs): Update the certificate store. [inputs]: Add isrgrootx2.pem, letsencryptauthorityr3.pem, letsencryptauthorityr4.pem, letsencryptauthoritye1.pem, and letsencryptauthoritye2.pem. Remove letsencryptauthorityx3.pem and letsencryptauthorityx4.pem. [arguments]: Adjust the builder accordingly. --- gnu/packages/certs.scm | 76 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index b72d927c0d..9dcd733ffe 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -147,7 +147,7 @@ taken from the NSS package and thus ultimately from the Mozilla project.") (define-public le-certs (package (name "le-certs") - (version "0") + (version "1") (source #f) (build-system trivial-build-system) (arguments @@ -155,9 +155,12 @@ taken from the NSS package and thus ultimately from the Mozilla project.") #:builder (begin (use-modules (guix build utils)) - (let ((root (assoc-ref %build-inputs "isrgrootx1.pem")) - (intermediate (assoc-ref %build-inputs "letsencryptauthorityx3.pem")) - (backup (assoc-ref %build-inputs "letsencryptauthorityx4.pem")) + (let ((root-rsa (assoc-ref %build-inputs "isrgrootx1.pem")) + (root-ecdsa (assoc-ref %build-inputs "isrgrootx2.pem")) + (intermediate-rsa (assoc-ref %build-inputs "letsencryptauthorityr3.pem")) + (intermediate-ecdsa (assoc-ref %build-inputs "letsencryptauthoritye1.pem")) + (backup-rsa (assoc-ref %build-inputs "letsencryptauthorityr4.pem")) + (backup-ecdsa (assoc-ref %build-inputs "letsencryptauthoritye2.pem")) (out (string-append (assoc-ref %outputs "out") "/etc/ssl/certs")) (openssl (assoc-ref %build-inputs "openssl")) (perl (assoc-ref %build-inputs "perl"))) @@ -166,7 +169,9 @@ taken from the NSS package and thus ultimately from the Mozilla project.") (lambda (cert) (copy-file cert (string-append out "/" (strip-store-file-name cert)))) - (list root intermediate backup)) + (list root-rsa root-ecdsa + intermediate-rsa intermediate-ecdsa + backup-rsa backup-ecdsa)) ;; Create hash symlinks suitable for OpenSSL ('SSL_CERT_DIR' and ;; similar.) @@ -186,26 +191,55 @@ taken from the NSS package and thus ultimately from the Mozilla project.") (sha256 (base32 "1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92")))) - ;; "Let’s Encrypt Authority X3", the active Let's Encrypt intermediate - ;; certificate. - ("letsencryptauthorityx3.pem" + ; Upcoming ECDSA Let's Encrypt root certificate, "ISRG Root X2" + ; Let's Encrypt describes it as "Active, limited availability" + ("isrgrootx2.pem" ,(origin (method url-fetch) - (uri "https://letsencrypt.org/certs/letsencryptauthorityx3.pem") + (uri "https://letsencrypt.org/certs/isrg-root-x2.pem") (sha256 (base32 - "100lxxvqv4fj563bm03zzk5r36hq5jx9nnrajzs38g825c5k0cg2")))) - ;; "Let’s Encrypt Authority X4", the backup Let's Encrypt intermediate - ;; certificate. This will be used for disaster recovery and will only be - ;; used should Let's Encrypt lose the ability to issue with "Let’s - ;; Encrypt Authority X3". - ("letsencryptauthorityx4.pem" - ,(origin - (method url-fetch) - (uri "https://letsencrypt.org/certs/letsencryptauthorityx4.pem") - (sha256 - (base32 - "0d5256gwf73drq6q6jala28rfzhrgbk5pjfq27vc40ly91pdyh8m")))))) + "04xh8912nwkghqydbqvvmslpqbcafgxgjh9qnn0z2vgy24g8hgd1")))) + ;; "Let’s Encrypt Authority R3", the active Let's Encrypt intermediate + ;; RSA certificate. + ("letsencryptauthorityr3.pem" + ,(origin + (method url-fetch) + (uri "https://letsencrypt.org/certs/lets-encrypt-r3.pem") + (sha256 + (base32 + "0clxry49rx6qd3pgbzknpgzywbg3j96zy0227wwjnwivqj7inzhp")))) + ;; "Let’s Encrypt Authority E1", the active Let's Encrypt intermediate + ;; ECDSA certificate. + ("letsencryptauthoritye1.pem" + ,(origin + (method url-fetch) + (uri "https://letsencrypt.org/certs/lets-encrypt-e1.pem") + (sha256 + (base32 + "1zwrc6dlk1qig0z23x6x7fib14rrw41ccbf2ds0rw75zccc59xx0")))) + ;; "Let’s Encrypt Authority R4", the backup Let's Encrypt intermediate + ;; RSA certificate. This will be used for disaster recovery and will only be + ;; used should Let's Encrypt lose the ability to issue with "Let’s + ;; Encrypt Authority R3". + ("letsencryptauthorityr4.pem" + ,(origin + (method url-fetch) + (uri "https://letsencrypt.org/certs/lets-encrypt-r4.pem") + (sha256 + (base32 + "09bzxzbwb9x2xxan3p1fyj1pi2p5yks0879gwz5f28y9mzq8vmd8")))) + ;; "Let’s Encrypt Authority E2", the backup Let's Encrypt intermediate + ;; ECDSA certificate. This will be used for disaster recovery and will + ;; only be used should Let's Encrypt lose the ability to issue with "Let’s + ;; Encrypt Authority E1". + ("letsencryptauthoritye2.pem" + ,(origin + (method url-fetch) + (uri "https://letsencrypt.org/certs/lets-encrypt-e2.pem") + (sha256 + (base32 + "1wfmsa29lyi9dkh6xdcamb2rhkp5yl2ppnsgrzcrjl5c7gbqh9ml")))))) (home-page "https://letsencrypt.org/certificates/") (synopsis "Let's Encrypt root and intermediate certificates") (description "This package provides a certificate store containing only the -- cgit v1.2.3 From 82543e9649da2da9a5285ede4ec4f718fd740fcb Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Thu, 1 Apr 2021 20:49:25 +0200 Subject: gnu: emacs-git-link: Update to 0.8.3. * gnu/packages/emacs-xyz.scm (emacs-git-link): Update to 0.8.3. Signed-off-by: Leo Famulari --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4def3d802f..dca4509b80 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3653,7 +3653,7 @@ window.") (define-public emacs-git-link (package (name "emacs-git-link") - (version "0.7.5") + (version "0.8.3") (source (origin (method git-fetch) @@ -3662,7 +3662,7 @@ window.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6")))) + (base32 "0l7xmvmj5s93hc39wjjv75f22zbhahnmcxpmvx3dfvsbig9pmk75")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From c2e83b71054f953953711e027f863d6c75c6ddb2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 13 Apr 2021 16:59:57 +0200 Subject: gnu: guile-git: Update to 0.5.0. * gnu/packages/guile.scm (guile-git): Update to 0.5.0. --- gnu/packages/guile.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 0dad390275..813639ef7e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -776,16 +776,16 @@ type system, elevating types to first-class status.") (define-public guile-git (package (name "guile-git") - (version "0.4.0") + (version "0.5.0") (home-page "https://gitlab.com/guile-git/guile-git.git") (source (origin (method url-fetch) (uri (string-append "https://gitlab.com/guile-git/guile-git/uploads/" - "2600bb0dfdfb00bfbe46811dccad51d8/guile-git-" + "30be542d90619ca844dd3a3ed2e13808/guile-git-" version ".tar.gz")) (sha256 (base32 - "1kxyg9x2aa1pg69cl48wysq0pbxvwfahy1xpl5ab6p8babhf7kic")))) + "1j39c1cq9cbwir90mpnbdijpbwh7wkxampgl2r177bv8bfw6y203")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings -- cgit v1.2.3 From 4dff6ecde85eec473ab231cf75f51e98e8aca1e9 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Wed, 14 Apr 2021 00:59:52 +0200 Subject: Revert "services: mysql: Add extra-environment as configuration option." This reverts commit f3626119d738f30b5ab59e76c105fd7b4c077ddc. This commit inadvertently broke a string freeze. Let's be nice to our translators and not do that. --- doc/guix.texi | 3 --- gnu/services/databases.scm | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index fa14b35e2a..1069a5d296 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19947,9 +19947,6 @@ Socket file to use for local (non-network) connections. @item @code{extra-content} (default: @code{""}) Additional settings for the @file{my.cnf} configuration file. -@item @code{extra-environment} (default: @code{#~'()}) -List of environment variables passed to the @command{mysqld} process. - @item @code{auto-upgrade?} (default: @code{#t}) Whether to automatically run @command{mysql_upgrade} after starting the service. This is necessary to upgrade the @dfn{system schema} after diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index eba88cdb68..4a6d36b50b 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -7,7 +7,6 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -528,7 +527,6 @@ created after the PostgreSQL database is started."))) (port mysql-configuration-port (default 3306)) (socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock")) (extra-content mysql-configuration-extra-content (default "")) - (extra-environment mysql-configuration-extra-environment (default #~'())) (auto-upgrade? mysql-configuration-auto-upgrade? (default #t))) (define %mysql-accounts @@ -613,14 +611,11 @@ FLUSH PRIVILEGES; (provision '(mysql)) (documentation "Run the MySQL server.") (start (let ((mysql (mysql-configuration-mysql config)) - (extra-env (mysql-configuration-extra-environment config)) (my.cnf (mysql-configuration-file config))) #~(make-forkexec-constructor (list (string-append #$mysql "/bin/mysqld") (string-append "--defaults-file=" #$my.cnf)) - #:user "mysql" #:group "mysql" - #:log-file "/var/log/mysqld.log" - #:environment-variables #$extra-env))) + #:user "mysql" #:group "mysql"))) (stop #~(make-kill-destructor))))) (define (mysql-upgrade-wrapper mysql socket-file) -- cgit v1.2.3 From a758a8a3c20052c5f1228e1ec80068652bbc3849 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Apr 2021 19:22:48 -0400 Subject: gnu: Guix: Update to 1.2.0-21.4dff6ec. Fixes . * gnu/packages/package-management.scm (guix): Update to 1.2.0-21.4dff6ec. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6df46aa35f..08050e9747 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "2d73086262e1fb33cd0f0f16f74a495fe06b38aa") - (revision 20)) + (commit "4dff6ecde85eec473ab231cf75f51e98e8aca1e9") + (revision 21)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "070frsjcbrdqh68rhrck6w3cprbq1hjpd24z44qd017zaicix1f0")) + "1n16j7rb4n4pjmp8ck5g206rphmzxii2mbyz1nk4qk70zc3mwszq")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From c5e149a9d9cf25c68da817f46ea0cbf5442d39bd Mon Sep 17 00:00:00 2001 From: Trevor Hass Date: Tue, 13 Apr 2021 22:05:08 -0500 Subject: gnu: minetest: Fix absolute path to 'rm' command. * gnu/packages/games.scm (minetest)[patch-sources]: Substitute '/bin/rm' path. [inputs]: Add coreutils. Signed-off-by: Leo Prikler --- gnu/packages/games.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dbc72446b2..91ac839aee 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -52,7 +52,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Michael Rohleder -;;; Copyright © 2020 Trevor Hass +;;; Copyright © 2020, 2021 Trevor Hass ;;; Copyright © 2020, 2021 Leo Prikler ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández @@ -3486,8 +3486,13 @@ match, cannon keep, and grave-itation pit.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-sources - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + ;; Use store-path for "rm" instead of non-existing FHS path. + (("\"/bin/rm\"") + (string-append "\"" (assoc-ref inputs "coreutils") "/bin/rm\""))) (substitute* "src/CMakeLists.txt" + ;; Let minetest binary remain in build directory. (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) (substitute* "src/unittest/test_servermodmanager.cpp" ;; do no override MINETEST_SUBGAME_PATH @@ -3511,7 +3516,8 @@ match, cannon keep, and grave-itation pit.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("curl" ,curl) + `(("coreutils" ,coreutils) + ("curl" ,curl) ("freetype" ,freetype) ("gettext" ,gettext-minimal) ("gmp" ,gmp) -- cgit v1.2.3 From 2aa03a99e7f06db9b732020c30d040dd44892af9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Apr 2021 10:18:39 +0200 Subject: gnu: Add srecord. * gnu/packages/flashing-tools.scm (srecord): New variable. --- gnu/packages/flashing-tools.scm | 49 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 669c45fd68..4b597dca50 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Jonathan Brielmaier ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,18 +33,23 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (gnu packages autotools) + #:use-module (gnu packages admin) + #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) - #:use-module (gnu packages flex) #:use-module (gnu packages elf) + #:use-module (gnu packages flex) + #:use-module (gnu packages ghostscript) + #:use-module (gnu packages gnupg) + #:use-module (gnu packages groff) #:use-module (gnu packages pciutils) #:use-module (gnu packages pkg-config) #:use-module (gnu packages libusb) #:use-module (gnu packages libftdi) #:use-module (gnu packages pciutils) - #:use-module (gnu packages qt) - #:use-module (gnu packages autotools) - #:use-module (gnu packages admin)) + #:use-module (gnu packages qt)) (define-public flashrom (package @@ -476,3 +482,38 @@ ME as far as possible (it only edits ME firmware image files).") (description "@code{uefitool} is a graphical image file editor for Unifinished Extensible Firmware Interface (UEFI) images.") (license license:bsd-2))) + +(define-public srecord + (package + (name "srecord") + (version "1.64") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/srecord/srecord/" + version "/srecord-" version ".tar.gz")) + (sha256 + (base32 + "1qk75q0k5vzmm3932q9hqz2gp8n9rrdfjacsswxc02656f3l3929")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "SH=" + (assoc-ref %build-inputs "bash") + "/bin/bash")))) + (inputs + `(("boost" ,boost) + ("libgcrypt" ,libgcrypt))) + (native-inputs + `(("bison" ,bison) + ("diffutils" ,diffutils) + ("ghostscript" ,ghostscript) + ("groff" ,groff) + ("libtool" ,libtool) + ("which" ,which))) + (home-page "http://srecord.sourceforge.net/") + (synopsis "Tools for EPROM files") + (description "The SRecord package is a collection of powerful tools for +manipulating EPROM load files. It reads and writes numerous EPROM file +formats, and can perform many different manipulations.") + (license license:gpl3+))) -- cgit v1.2.3 From f181ee1f424308618d5d8d2ae9afacc5f8ec7b73 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 14 Apr 2021 10:25:54 +0200 Subject: gnu: emacs-vertico: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-vertico): Update to 0.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dca4509b80..91c6bf8a12 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27619,7 +27619,7 @@ and preferred services can easily be configured.") (define-public emacs-vertico (package (name "emacs-vertico") - (version "0.3") + (version "0.4") (source (origin (method git-fetch) @@ -27628,7 +27628,7 @@ and preferred services can easily be configured.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1r2p09y3ag14dqd46nyy1pa2j2cvn4gn9pji47mzmwydsm2f8hv1")))) + (base32 "0ijahr9dzs7v56w2n74xp0akzbzbxlw5852bywc4h24xdspakj52")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9153e12d737ee04c380809ab0598ad888f291a0b Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 14 Apr 2021 12:01:36 +0100 Subject: gnu: Add texlive-ly1. * gnu/packages/tex.scm: New package. --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 317f1a8416..305d40178a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8033,3 +8033,25 @@ Type 1 and OTF formats, with supporting files as necessary.") (license (list (license:fsf-free "http://mirrors.ctan.org/fonts/xcharter/README") license:lppl1.3)))) + +(define-public texlive-ly1 + (package + (inherit (simple-texlive-package + "texlive-ly1" + (list "/doc/fonts/ly1/" + "/fonts/enc/dvips/ly1/" + "/fonts/map/dvips/ly1/" + "/fonts/tfm/adobe/ly1/" + "/fonts/vf/adobe/ly1/" + "/tex/latex/ly1/") + (base32 + "0wjyw0risgvrq97zfciglwy1f4msvfslln6pz0q8yzzx8wsv3zgq") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/ly1") + (synopsis "Support for LY1 LaTeX encoding") + (description "The legacy @emph{texnansi} (TeX and ANSI) encoding +is known in the LaTeX scheme of things as @emph{LY1} encoding. The +@code{ly1} bundle includes metrics and LaTeX macros to use the three +basic Adobe Type 1 fonts (Times, Helvetica and Courier) in LaTeX using +LY1 encoding.") + (license license:lppl1.0+))) -- cgit v1.2.3 From 5bc5371b347681c13a41fa8d9ed5fbf64354480a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 14 Apr 2021 15:07:25 +0200 Subject: gnu: cuirass: Update to 1.0.0-10.17e8759. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-10.17e8759. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 030fc73ef9..655f5367b5 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -55,8 +55,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "d601fe0e4c85ab7b37f0571e898448c9fadde715") - (revision "9")) + (let ((commit "17e8759efe65c643c3670401216a9b2a3c755057") + (revision "10")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -69,7 +69,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "09d05bqy7wqz9175b4nv3sqasibx4175kmiz75id05ipr0vn0j12")))) + "18783ab1ckvb32xwf5sl16fbka8jwdcnv1zw8zakmgm9z10mqdmf")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 3f3d66377c052d6121b46db53391614329fa4ffb Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 14 Apr 2021 16:09:35 +0200 Subject: services: cuirass: Use "/tmp" database host. This is a follow-up of c311147bd16aa0e5746d9cbf31502f5fd61e470c. * gnu/services/cuirass.scm (%cuirass-default-database): Use "/tmp" database host. --- gnu/services/cuirass.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 9de36eb1c9..5b4e24d794 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -60,7 +60,7 @@ ;;;; Code: (define %cuirass-default-database - "dbname=cuirass host=/var/run/postgresql") + "dbname=cuirass host=/tmp") (define-record-type* cuirass-remote-server-configuration make-cuirass-remote-server-configuration -- cgit v1.2.3 From 9fd8f44bd7524399651ba677e93b5e4d36f8e524 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Apr 2021 17:05:12 +0200 Subject: gnu: Add python-ld. * gnu/packages/python-xyz.scm (python-ld): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9660f6ffd2..c01993ecd7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24618,6 +24618,27 @@ typographically-improved HTML. While often used in conjunction with Jinja and Django template systems, the filters can be used in any environment.") (license license:bsd-3))) +(define-public python-ld + (package + (name "python-ld") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ld" version)) + (sha256 + (base32 + "1k4ydp5rgkv4985v459kcl06i1igjm1ywvh2vkbi9ck1zyyri1z5")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six))) + (home-page "https://github.com/nir0s/ld") + (synopsis "OS platform information API") + (description + "The ld package provides information about the GNU/Linux distribution it +runs on, such as a reliable machine-readable ID, or version information.") + (license license:asl2.0))) + (define-public python-pathvalidate (package (name "python-pathvalidate") -- cgit v1.2.3 From 863bd265e458d2761906770802716555c54e69a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Apr 2021 17:14:16 +0200 Subject: gnu: python-stevedore: Propagate pbr. * gnu/packages/openstack.scm (python-stevedore)[native-inputs]: Move python-pbr from here... [propagated-inputs]: ...to here. [arguments]: Add phase to patch requirements. --- gnu/packages/openstack.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 26b275e0fd..1e3ad1057a 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2019 Clément Lassieur ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke -;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020, 2021 Ricardo Wurmus ;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -307,8 +307,15 @@ to docs.openstack.org and developer.openstack.org.") (arguments ;; The tests are disabled to avoid a circular dependency with ;; python-stestr. - `(#:tests? #f)) - (native-inputs + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-pbr-3 + (lambda _ + (substitute* '("setup.py" + "requirements.txt") + (("pbr!=2.1.0,>=2.0.0") "pbr>=3.0.0"))))))) + (propagated-inputs `(("python-pbr" ,python-pbr))) (home-page "https://github.com/dreamhost/stevedore") (synopsis "Manage dynamic plugins for Python applications") -- cgit v1.2.3 From 3a2747ab74911c0c22f71ae06f72fe0d528d7f25 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 14 Apr 2021 18:05:16 +0200 Subject: gnu: cuirass: Update to 1.0.0-11.922cc66. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-11.922cc66. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 655f5367b5..8d93513332 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -55,8 +55,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "17e8759efe65c643c3670401216a9b2a3c755057") - (revision "10")) + (let ((commit "922cc66089035d4dbc277df06366e41a0806bffb") + (revision "11")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -69,7 +69,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "18783ab1ckvb32xwf5sl16fbka8jwdcnv1zw8zakmgm9z10mqdmf")))) + "1kanag19dvaqpij7j6gznsfzajc5iir9qj6vq016bc4al5x6ggj4")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 12e210d90744948785b6ac007afae88456adc080 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 14 Apr 2021 13:18:01 +0530 Subject: gnu: python-schema-salad: Update to 7.1.20210316164414. * gnu/packages/bioinformatics.scm (python-schema-salad): Update to 7.1.20210316164414. [arguments]: Add skip-failing-tests phase. --- gnu/packages/bioinformatics.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 475aa019d0..54641c6906 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2016, 2018 Raoul Bonnal ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2021 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018, 2019, 2020, 2021 Mădălin Ionel Patrașcu @@ -2596,15 +2596,27 @@ accessing bigWig files.") (define-public python-schema-salad (package (name "python-schema-salad") - (version "7.0.20200811075006") + (version "7.1.20210316164414") (source (origin (method url-fetch) (uri (pypi-uri "schema-salad" version)) (sha256 (base32 - "0wanbwmqb189x1m0vacnhpivfsr8rwbqknngivzxxs8j46yj80bg")))) + "04jaykdpgfnkrghvli5swxzqp7yba842am4bz42hcfljsmkrxvrk")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'skip-failing-tests + (lambda _ + ;; Skip tests that require network access. + (substitute* "schema_salad/tests/test_cwl11.py" + (("^def test_(secondaryFiles|outputBinding)" all) + (string-append "@pytest.mark.skip(reason=" + "\"test requires network access\")\n" + all))) + #t))))) (propagated-inputs `(("python-cachecontrol" ,python-cachecontrol-0.11) ("python-lockfile" ,python-lockfile) -- cgit v1.2.3 From 563e4bd884f59f91d946de175f93fd423186843a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 14 Apr 2021 22:36:58 +0530 Subject: gnu: cwltool: Update to 3.0.20210319143721. * gnu/packages/bioinformatics.scm (cwltool): Update to 3.0.20210319143721. [arguments]: In the loosen-version-restrictions phase, relax pytest version restriction. In the modify-tests phase, delete file tests/test_content_type.py since it contains tests that require network access. --- gnu/packages/bioinformatics.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 54641c6906..41ef4cd513 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2644,7 +2644,7 @@ and record oriented data modeling and the Semantic Web.") (define-public cwltool (package (name "cwltool") - (version "3.0.20201121085451") + (version "3.0.20210319143721") (source (origin (method git-fetch) (uri (git-reference @@ -2653,7 +2653,7 @@ and record oriented data modeling and the Semantic Web.") (file-name (git-file-name name version)) (sha256 (base32 - "1awf99n7aglxc5zszrlrv6jxp355jp45ws7wpsgjlgcdv7advn0w")))) + "1sgs9ckyxb9f9169mc3wm9lnjg4080ai42xqsrwpw9l8apy4c9m5")))) (build-system python-build-system) (arguments `(#:phases @@ -2661,8 +2661,9 @@ and record oriented data modeling and the Semantic Web.") (add-after 'unpack 'loosen-version-restrictions (lambda _ (substitute* "setup.py" - (("== 1.5.1") ">=1.5.1") ; prov - ((", < 3.5") "")) ; shellescape + (("== 1.5.1") ">=1.5.1") ; prov + ((", < 3.5") "") ; shellescape + ((" >= 6.0.2, < 6.2") "")) ; pytest #t)) (add-after 'unpack 'dont-use-git (lambda _ @@ -2674,6 +2675,7 @@ and record oriented data modeling and the Semantic Web.") (add-after 'unpack 'modify-tests (lambda _ ;; Tries to connect to the internet. + (delete-file "tests/test_content_type.py") (delete-file "tests/test_udocker.py") (delete-file "tests/test_http_input.py") (substitute* "tests/test_load_tool.py" -- cgit v1.2.3 From dd9e77f81bce7fd3c869ee68b7ce68153d934460 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Wed, 14 Apr 2021 19:16:39 +0200 Subject: gnu: oil: Update to 0.8.9. * gnu/packages/shells.scm (oil): Update to 0.8.9. [arguments]: Make the 'check' phase return #t. Signed-off-by: Leo Famulari --- gnu/packages/shells.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5ab3642dea..f2356dbdb4 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -825,14 +825,14 @@ Shell (pdksh).") (define-public oil (package (name "oil") - (version "0.8.8") + (version "0.8.9") (source (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "1g3xk160x9k5smfc9k8nnxcj7w1nacmnhnpmm72am9rjp1vpv9h1")))) + (base32 "080lsx7hyjhny3jzscwr152vr0g9s3c2iqg3vrpgsbk8vv7vw5l7")))) (build-system gnu-build-system) (arguments `(#:strip-binaries? #f ; strip breaks the binary @@ -853,7 +853,8 @@ Shell (pdksh).") (lambda _ (let* ((oil "_bin/oil.ovm")) (invoke/quiet oil "osh" "-c" "echo hi") - (invoke/quiet oil "osh" "-n" "configure"))))))) + (invoke/quiet oil "osh" "-n" "configure") + #t)))))) (inputs `(("readline" ,readline))) (home-page "https://www.oilshell.org") -- cgit v1.2.3 From 70c2897ea39b8633f7b71324025954e43b4ed055 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Apr 2021 22:29:14 +0200 Subject: installer: Internationalize comment of the generated config. * gnu/installer/steps.scm (configuration->file): Pass the comment in the generated file through 'G_'. --- gnu/installer/steps.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/steps.scm b/gnu/installer/steps.scm index fdcfb0cb4d..057f2ae163 100644 --- a/gnu/installer/steps.scm +++ b/gnu/installer/steps.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018, 2019 Mathieu Othacehe -;;; Copyright © 2020 Ludovic Courtès +;;; Copyright © 2020, 2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +20,7 @@ (define-module (gnu installer steps) #:use-module (guix records) #:use-module (guix build utils) + #:use-module (guix i18n) #:use-module (gnu installer utils) #:use-module (ice-9 match) #:use-module (ice-9 pretty-print) @@ -245,8 +246,13 @@ found in RESULTS." (mkdir-p (dirname filename)) (call-with-output-file filename (lambda (port) - (format port ";; This is an operating system configuration generated~%") - (format port ";; by the graphical installer.~%") + ;; TRANSLATORS: This is a comment within a Scheme file. Each line must + ;; start with ";; " (two semicolons and a space). Please keep line + ;; length below 60 characters. + (display (G_ "\ +;; This is an operating system configuration generated +;; by the graphical installer.\n") + port) (newline port) (for-each (lambda (part) (if (null? part) -- cgit v1.2.3 From 7b2e4ccce29495a2f1c5bd13b0566fa7e0ef0cf0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Apr 2021 14:54:48 -0400 Subject: gnu: linux-libre: Update to 5.11.14. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.14. (linux-libre-5.11-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bebf92feba..1e0cf04074 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.13") +(define-public linux-libre-5.11-version "5.11.14") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "0yvgkc1fmmd4g06sydn51q4l3g5785q9yaaq04lv3kgj4hyijqgs"))) + (hash (base32 "1ia4wzh44lkvrbvnhdnnjcdyvqx2ihpbwkih7wqm1n5prhq38ql7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit v1.2.3 From ad0caeb9dbe39308a59475a77fe20df733b53d10 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Apr 2021 14:55:09 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.30. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.30. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1e0cf04074..32921256f5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.29") +(define-public linux-libre-5.10-version "5.10.30") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1v79wylb2kd9gadiqf7dr7jcgynr970bbga09mdn940sq536g30m"))) + (hash (base32 "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 3ccc01b410c84b6d7392ba7a49604445240c10f5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Apr 2021 14:55:26 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.112. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.112. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 32921256f5..afc6de6e0e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.111") +(define-public linux-libre-5.4-version "5.4.112") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "00qs4y4d9adffwysdh8sly81hxc3rw7bi9vs3fs4rhwdclr62qi1"))) + (hash (base32 "190cq97pm0r6s115ay66rjra7fnyn7m4rak89inwhm223931sdmq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From afe0142e04c2257a22191ba3210fffc6dc54e28b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Apr 2021 14:55:46 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.187. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.187. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index afc6de6e0e..ce6b17145c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.186") +(define-public linux-libre-4.19-version "4.19.187") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0cg6ja7plry1l2mg6hx16lsw0gzn4xpj7xdrrs2hwl8l8a2dgifq"))) + (hash (base32 "1hx0jw11xmj57v9a8w34729vgrandaing2n9qkhx5dq4mhy04k50"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From ab616d44a1bc04b8b70d4e18ebf44075f040c482 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Mar 2021 17:33:40 -0400 Subject: gnu: wireless-regdb: Update to 2020.11.20. * gnu/packages/linux.scm (wireless-regdb): Update to 2020.11.20. [description]: Correct the description. --- gnu/packages/linux.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ce6b17145c..b1212a3821 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3907,7 +3907,7 @@ compliance.") (define-public wireless-regdb (package (name "wireless-regdb") - (version "2020.04.29") + (version "2020.11.20") (source (origin (method url-fetch) (uri (string-append @@ -3915,7 +3915,7 @@ compliance.") "wireless-regdb-" version ".tar.xz")) (sha256 (base32 - "0yicda474ygahv8da18h1p4yf42s6x2f208mlwcw4xsrxld07zc9")) + "0liagyi6ppf5w474qk9j4jz5gbvvn8mc8al1dq4b1xrgv28485ml")) ;; We're building 'regulatory.bin' by ourselves. (snippet '(begin @@ -3969,8 +3969,8 @@ compliance.") "https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb") (synopsis "Wireless regulatory database") (description - "This package contains the wireless regulatory database Central -Regulatory Database Agent (CRDA) daemon. The database contains information on + "This package contains the wireless regulatory database for the Central +Regulatory Database Agent (CRDA). The database contains information on country-specific regulations for the wireless spectrum.") (license license:isc))) -- cgit v1.2.3 From 050be36cbf3a42199f64f2e44c59f1cb1b3afab5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 14 Apr 2021 20:02:34 -0400 Subject: gnu: btrfs-progs: Update to 5.11.1. * gnu/packages/linux.scm (btrfs-progs): Update to 5.11.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b1212a3821..52579ce1f5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5058,7 +5058,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.11") + (version "5.11.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -5066,7 +5066,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "0dq1ryji9hmq10zbyk083lp9r212524a3naai47whq11m6q626fl")))) + "1zpbpmq8qndwls40yg2c9xj9ca6mcxdziadj5i8fbi3ffp2crap3")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" -- cgit v1.2.3 From abf032c13117bf2074de89082a8ef98b5cc08fad Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 15 Apr 2021 09:15:49 +0200 Subject: gnu: emacs-emms: Update to 7.1. * gnu/packages/emacs-xyz.scm (emacs-emms): Update to 7.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 91c6bf8a12..7548c26eab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1808,14 +1808,14 @@ incrementally confined in Isearch manner.") (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "7.0") + (version "7.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "1hryagy2mkx9zgc33mb773ckp5p9bisnny0r78l0h2vc43wanmhz")))) + (base32 "1dng8dy0w0wsdvvnjnrllwv5a8wq3kj20jik994b7prdx5dn6y52")))) (build-system gnu-build-system) (arguments `(#:make-flags '("emms-print-metadata") -- cgit v1.2.3 From 64fe44fa84fb734d3ab4a36c7fd42dea9ce71338 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Wed, 14 Apr 2021 23:54:57 +0300 Subject: gnu: Add python-roman. * gnu/packages/python-xyz.scm (python-roman): New variable. Co-authored-by: jgart Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c01993ecd7..bc1f4597f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3029,6 +3029,25 @@ cutting and pasting that code over and over.") (define-public python2-kitchen (package-with-python2 python-kitchen)) +(define-public python-roman + (package + (name "python-roman") + (version "3.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "roman" version)) + (sha256 + (base32 + "0gyp2bmw47jgpm8j64gydzqq838bgxz5gh6cm57lxlr7p26sqiic")))) + (build-system python-build-system) + (home-page "https://github.com/zopefoundation/roman") + (synopsis "Integer to Roman numerals converter") + (description + "This package provides a small helper library to convert Arabic Numbers +to Roman Numerals.") + (license license:psfl))) + (define-public python-unidecode (package (name "python-unidecode") -- cgit v1.2.3 From 5c2e4711a7c42310907a0e501c31d9d5b4a835dc Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Wed, 14 Apr 2021 23:54:58 +0300 Subject: gnu: Add python-setuptools-declarative-requirements. * gnu/packages/python-xyz.scm (python-setuptools-declarative-requirements): New variable. Co-authored-by: jgart Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bc1f4597f8..17fdbc4d35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1275,6 +1275,34 @@ Python 3 support.") license:asl2.0 ; packaging is dual ASL2/BSD-2 license:bsd-2)))) +(define-public python-setuptools-declarative-requirements + (package + (name "python-setuptools-declarative-requirements") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri + "setuptools-declarative-requirements" + version)) + (sha256 + (base32 + "1l8zmcnp9h8sp8hsw7b81djaa1a9yig0y7i4phh5pihqz1gdn7yi")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) + (propagated-inputs + `(("python-toml" ,python-toml) + ("python-wheel" ,python-wheel))) + (home-page + "https://github.com/s0undt3ch/setuptools-declarative-requirements") + (synopsis "File support for setuptools declarative setup.cfg") + (description + "This package provides file support for setuptools declarative +@code{setup.cfg}.") + (license license:asl2.0))) + ;; The setuptools provided by Python 3.7.4 is too new for Tensorflow. (define-public python-setuptools-for-tensorflow (hidden-package -- cgit v1.2.3 From 81b361fdd410d9318ab73cfd8e4742f82ad0ab96 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Wed, 14 Apr 2021 23:54:59 +0300 Subject: gnu: Add python-pytest-helpers-namespace. * gnu/packages/python-check.scm (python-pytest-helpers-namespace): New variable. Co-authored-by: jgart Signed-off-by: Efraim Flashner --- gnu/packages/python-check.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index bde836a931..b68f23a220 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; ;;; This file is part of GNU Guix. ;;; @@ -374,6 +375,39 @@ provides a shortcut to testing all code and documentation for a given sub-package.") (license license:bsd-3))) +(define-public python-pytest-helpers-namespace + (package + (name "python-pytest-helpers-namespace") + (version "2021.3.24") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-helpers-namespace" version)) + (sha256 + (base32 + "0pyj2d45zagmzlajzqdnkw5yz8k49pkihbydsqkzm413qnkzb38q")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make the installed plugin discoverable by Pytest. + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv")))))) + (native-inputs + `(("python-pytest" ,python-pytest-6) + ("python-setuptools" ,python-setuptools) ; needs setuptools >= 50.3.2 + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-setuptools-declarative-requirements" + ,python-setuptools-declarative-requirements))) + (home-page "https://github.com/saltstack/pytest-helpers-namespace") + (synopsis "Pytest Helpers Namespace Plugin") + (description "Pytest Helpers Namespace Plugin provides a helpers pytest +namespace which can be used to register helper functions without requiring +someone to import them in their actual tests to use them.") + (license license:asl2.0))) + (define-public python-pytest-openfiles (package (name "python-pytest-openfiles") -- cgit v1.2.3 From c578d7a25af52d2c35ee9baee97b6e4ab3095783 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Wed, 14 Apr 2021 23:55:00 +0300 Subject: gnu: Add python-uqbar. * gnu/packages/graphviz.scm (python-uqbar): New variable. Co-authored-by: jgart Signed-off-by: Efraim Flashner --- gnu/packages/graphviz.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index b5c4774d5c..eb3fd1d583 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Pjotr Prins +;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,7 +49,9 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) #:use-module (gnu packages tex) @@ -242,6 +245,55 @@ structure and layout algorithms.") (define-public python2-pygraphviz (package-with-python2 python-pygraphviz)) +(define-public python-uqbar + (package + (name "python-uqbar") + (version "0.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/josiah-wolf-oberholtzer/uqbar") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0413nyhd8z8v3lvsgaghhafnyxg90fi1q80j1kbl21gpmpnc9a7n")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "setup.py" + ;; Latest versions of sphink-rtd-theme require npm to build. + (("sphinx-rtd-theme >= 0.4.0") "sphinx-rtd-theme >= 0.2.4") + (("black == 19.10b0") "black >= 19.10b0")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" "tests")) + #t))))) + (native-inputs + `(("graphviz" ,graphviz) + ("python-flake8" ,python-flake8) + ("python-isort" ,python-isort) + ("python-mypy" ,python-mypy) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (propagated-inputs + `(("python-black" ,python-black) + ("python-sphinx" ,python-sphinx) + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) + ("python-unidecode" ,python-unidecode))) + (home-page "https://github.com/josiah-wolf-oberholtzer/uqbar") + (synopsis "Tools for building documentation with Sphinx, Graphviz and LaTeX") + (description + "This package contains tools for building documentation with Sphinx, +Graphviz and LaTeX.") + (license license:expat))) + (define-public gts (package (name "gts") -- cgit v1.2.3 From 565ecf84575b10c0e70a7e5628bbde87baf1bc95 Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Wed, 14 Apr 2021 23:55:01 +0300 Subject: gnu: Add python-quicktions. * gnu/packages/python-xyz.scm (python-quicktions): New variable. Co-authored-by: jgart Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 17fdbc4d35..9d115790e1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24686,6 +24686,46 @@ Django template systems, the filters can be used in any environment.") runs on, such as a reliable machine-readable ID, or version information.") (license license:asl2.0))) +(define-public python-quicktions + (package + (name "python-quicktions") + (version "1.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "quicktions" version)) + (sha256 + (base32 + "1px21a6x527i1bsr2p6bbf3jziqpvd1vjkvvzh13gsy4iip0yvzn")) + (modules '((guix build utils))) + (snippet + '(begin + ;; This file is generated by Cython. + (delete-file "src/quicktions.c") #t)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'cythonize-sources + (lambda _ + (with-directory-excursion "src" + (invoke "cython" "quicktions.pyx")))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest")) + #t))))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/scoder/quicktions") + (synopsis "Fast fractions data type for rational numbers") + (description + "This package provides fast fractions data type for rational numbers. It +is the cythonized version of @code{fractions.Fraction}.") + (license license:psfl))) + (define-public python-pathvalidate (package (name "python-pathvalidate") -- cgit v1.2.3 From 27396a13c848629366fdcc5b17ea22c43d6589fe Mon Sep 17 00:00:00 2001 From: BonfaceKilz Date: Wed, 14 Apr 2021 23:55:02 +0300 Subject: gnu: Add python-abjad. * gnu/packages/music.scm (python-abjad): New variable. Co-authored-by: jgart Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2b5f43cb14..265b8fdccf 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2021 Leo Prikler ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 Brendan Tildesley +;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; ;;; This file is part of GNU Guix. ;;; @@ -136,6 +137,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) ;libsndfile #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -143,6 +145,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages rsync) #:use-module (gnu packages sdl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages stb) #:use-module (gnu packages tcl) @@ -1499,6 +1502,57 @@ Guile.") ;; more than an hour of silence, so double the max silent time. (properties `((max-silent-time . 7200))))) +(define-public python-abjad + (package + (name "python-abjad") + (version "3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Abjad/abjad") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dzf5v7pawbzkb4qxp4s5z4r3gibkk705pag83yvgzkx6fd6jf2g")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "setup.py" + (("uqbar>=0.5.1, <0.5.0") "uqbar>=0.5.0")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; See: https://stackoverflow.com/a/34140498 + (invoke "python" "-m" "pytest" "tests") + #t)))))) + (native-inputs + `(("lilypond" ,lilypond) + ("python-black" ,python-black) + ("python-flake8" ,python-flake8) + ("python-iniconfig" ,python-iniconfig) + ("python-isort" ,python-isort) + ("python-mypy" ,python-mypy) + ("python-ply" ,python-ply) + ("python-pytest" ,python-pytest-6) + ("python-pytest-cov" ,python-pytest-cov) + ("python-sphinx-autodoc-typehints" ,python-sphinx-autodoc-typehints))) + (propagated-inputs + `(("python-quicktions" ,python-quicktions) + ("python-roman" ,python-roman) + ("python-six" ,python-six) + ("python-uqbar" ,python-uqbar))) + (home-page "https://abjad.github.io") + (synopsis "Python API for building LilyPond files") + (description + "This package provides a Python API for building LilyPond files.") + (license license:expat))) + (define-public non-sequencer ;; The latest tagged release is three years old and uses a custom build ;; system, so we take the last commit. -- cgit v1.2.3 From a5bbd38fd131282e928144e869dcdf1e09259085 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 15 Apr 2021 14:09:26 +0100 Subject: gnu: Add texlive-kastrup. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 305d40178a..bcb7f168fb 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8055,3 +8055,34 @@ is known in the LaTeX scheme of things as @emph{LY1} encoding. The basic Adobe Type 1 fonts (Times, Helvetica and Courier) in LaTeX using LY1 encoding.") (license license:lppl1.0+))) + +(define-public texlive-kastrup + (package + (name "texlive-kastrup") + (version (number->string %texlive-revision)) + (source + (origin + (method svn-fetch) + (uri (texlive-ref "generic" "kastrup")) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1kkshc48brkq2nx3rlbv78a2130izykbf33ri1q2shqr8pjfmmq8")))) + (build-system texlive-build-system) + (arguments + '(#:tex-directory "generic/kastrup" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-generated-file + (lambda _ + (delete-file "binhex.drv") + #t))))) + (home-page "http://www.ctan.org/pkg/binhex") + (synopsis "Convert numbers into binary, octal and hexadecimal") + (description "The @code{kastrup} package provides the +@emph{binhex.tex} file. This file provides expandable macros for both +fixed-width and minimum-width numbers to bases 2, 4, 8 and 16. All +constructs TeX accepts as arguments to its @code{\\number} primitive +are valid as arguments for the macros. The package may be used under +LaTeX and plain TeX.") + (license (license:fsf-free "file:/binhex.dtx")))) -- cgit v1.2.3 From e7548afbadbff2ab571cc189eb630e64c4e212da Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 15 Apr 2021 13:16:57 -0400 Subject: gnu: haunt: Update to 0.2.5. --- gnu/packages/guile-xyz.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 21b39abf62..089a9a3b55 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2385,22 +2385,14 @@ inspired by the SCSH regular expression system.") (define-public haunt (package (name "haunt") - (version "0.2.4") + (version "0.2.5") (source (origin (method url-fetch) (uri (string-append "https://files.dthompson.us/haunt/haunt-" version ".tar.gz")) (sha256 (base32 - "056z4znikk83nr5mr0x2ac3iinqbywa2bvb37mhr566a1q50isfc")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure" - (("2\\.2 2\\.0") - "3.0 2.2 2.0")) - #t)))) + "1gy45l6m91b3wpdbpd9bpisp00zl8610zs0a2nwmbjlpd2cbf90k")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 match) (ice-9 ftw) -- cgit v1.2.3 From ebd021f73292bf47b26a799665d6204574bae239 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 15 Apr 2021 21:12:39 +0300 Subject: gnu: mesa: Add powerpc64le-linux support. * gnu/packages/gl.scm (mesa)[inputs]: Add llvm on powerpc64le. [native-inputs]: Add glslang on powerpc64le. [arguments]: Adjust configure-flags for powerpc64le to fix building on powerpc64le and enable features. Add powerpc64le specific phase to skip known failing test. --- gnu/packages/gl.scm | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 0d2e71cc72..7b5a0b43f3 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Nikita ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 David Thompson -;;; Copyright © 2017, 2018, 2019 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -270,7 +270,7 @@ also known as DXTn or DXTC) for Mesa.") ("libxrandr" ,libxrandr) ("libxvmc" ,libxvmc) ,@(match (%current-system) - ((or "x86_64-linux" "i686-linux") + ((or "x86_64-linux" "i686-linux" "powerpc64le-linux") ;; Note: update the 'clang' input of mesa-opencl when bumping this. `(("llvm" ,llvm-11))) (_ @@ -282,7 +282,7 @@ also known as DXTn or DXTC) for Mesa.") ("flex" ,flex) ("gettext" ,gettext-minimal) ,@(match (%current-system) - ((or "x86_64-linux" "i686-linux") + ((or "x86_64-linux" "i686-linux" "powerpc64le-linux") `(("glslang" ,glslang))) (_ `())) @@ -295,8 +295,10 @@ also known as DXTn or DXTC) for Mesa.") `(#:configure-flags '(,@(match (%current-system) ((or "armhf-linux" "aarch64-linux") - ;; TODO: Fix svga driver for aarch64 and armhf. + ;; TODO: Fix svga driver for non-Intel architectures. '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) + ("powerpc64le-linux" + '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")) (_ '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, @@ -313,16 +315,18 @@ also known as DXTn or DXTC) for Mesa.") "-Dgbm=true" "-Dshared-glapi=true" - ;; Enable Vulkan on i686-linux and x86-64-linux. + ;; Explicitly enable Vulkan on some architectures. ,@(match (%current-system) ((or "i686-linux" "x86_64-linux") '("-Dvulkan-drivers=intel,amd")) + ("powerpc64le-linux" + '("-Dvulkan-drivers=amd")) (_ '("-Dvulkan-drivers=auto"))) - ;; Enable the Vulkan overlay layer on i686-linux and x86-64-linux. + ;; Enable the Vulkan overlay layer on architectures using llvm. ,@(match (%current-system) - ((or "x86_64-linux" "i686-linux") + ((or "x86_64-linux" "i686-linux" "powerpc64le-linux") '("-Dvulkan-overlay-layer=true")) (_ '())) @@ -336,6 +340,9 @@ also known as DXTn or DXTC) for Mesa.") ((or "x86_64-linux" "i686-linux") '("-Ddri-drivers=i915,i965,nouveau,r200,r100" "-Dllvm=true")) ; default is x86/x86_64 only + ("powerpc64le-linux" + '("-Ddri-drivers=nouveau,r200,r100" + "-Dllvm=true")) (_ '("-Ddri-drivers=nouveau,r200,r100")))) @@ -349,6 +356,15 @@ also known as DXTn or DXTC) for Mesa.") (guix build meson-build-system)) #:phases (modify-phases %standard-phases + ,@(if (string-prefix? "powerpc64le" (or (%current-target-system) + (%current-system))) + ;; Disable some of the llvmpipe tests. + `((add-after 'unpack 'disable-failing-test + (lambda _ + (substitute* "src/gallium/drivers/llvmpipe/lp_test_arit.c" + (("0\\.5, ") "")) + #t))) + '()) ,@(if (string-prefix? "i686" (or (%current-target-system) (%current-system))) ;; Disable new test from Mesa 19 that fails on i686. Upstream @@ -383,7 +399,7 @@ also known as DXTn or DXTC) for Mesa.") (let ((out (assoc-ref outputs "out")) (bin (assoc-ref outputs "bin"))) ,@(match (%current-system) - ((or "i686-linux" "x86_64-linux") + ((or "i686-linux" "x86_64-linux" "powerpc64le-linux") ;; Install the Vulkan overlay control script to a separate ;; output to prevent a reference on Python, saving ~70 MiB ;; on the closure size. -- cgit v1.2.3 From 950475bb963468c92fd7d47300010a584c7daf55 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 14 Apr 2021 15:48:06 +0200 Subject: gnu: Add vtk-8. gnu/packages/image-processing (vtk-8): New variable. --- gnu/packages/image-processing.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index ce2242a658..ed21b26812 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 Oleh Malyi ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Andy Tai +;;; Copyright © 2021 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -349,6 +350,22 @@ a suite of 3D interaction widgets, supports parallel processing, and integrates with various databases on GUI toolkits such as Qt and Tk.") (license license:bsd-3))) +;; freecad needs an old version of VTK, because VTK's API changed from 8 to 9 +(define-public vtk-8 + (package (inherit vtk) + (version "8.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://vtk.org/files/release/" + (version-major+minor version) + "/VTK-" version ".tar.gz")) + (sha256 + (base32 + "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl")))) + (inputs + `(("jsoncpp" ,jsoncpp-for-tensorflow) + ,@(alist-delete "jsoncpp" (package-inputs vtk)))))) + ;; itksnap needs an older variant of VTK. (define-public vtk-6 (package (inherit vtk) -- cgit v1.2.3 From ce2fe8bf34199e2b9788a7f77c0ad0bbdfa713bd Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 14 Apr 2021 15:49:53 +0200 Subject: gnu: freecad: Update to 0.19.1. * gnu/packages/engineering.scm (freecad): Update to 0.19.1 [inputs]: Add double-conversion, gl2ps, jsoncpp, libjpeg-turbo, libtheora, libtiff, libxmlplusplus, lz4, netcdf, proj, python-gitpython, python-pyyaml, sqlite, and vtk-8. Remove vtk. [arguments]: Add "-DBUILD_FLAT_MESH:BOOL=ON" to #:configure-flags. --- gnu/packages/engineering.scm | 213 +++++++++++++++++++++++-------------------- 1 file changed, 113 insertions(+), 100 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b5568b8563..99d497f2e6 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020,2021 Vincent Legoll ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2020, 2021 Ekaitz Zarraga ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020, 2021 Morgan Smith @@ -112,6 +112,8 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) #:use-module (gnu packages tcl) @@ -122,6 +124,7 @@ #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) + #:use-module (gnu packages xiph) #:use-module (gnu packages openkinect) #:use-module (gnu packages xorg)) @@ -2354,110 +2357,120 @@ OpenSCAD code. It supports syntax highlighting, indenting and refilling of comments."))) (define-public freecad - (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858") - (revision "1")) - (package - (name "freecad") - (version (git-version "0.18.5" revision commit-ref)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/FreeCAD/FreeCAD") - (commit commit-ref))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2")))) - (build-system qt-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) - ("qttools" ,qttools) - ("pkg-config" ,pkg-config) - ("python-pyside-2-tools" ,python-pyside-2-tools) - ("swig" ,swig))) - (inputs - `(("boost" ,boost) - ("coin3D" ,coin3D) - ("eigen" ,eigen) - ("freetype" ,freetype) - ("glew" ,glew) - ("hdf5" ,hdf5-1.10) - ("libarea" ,libarea) - ("libmedfile" ,libmedfile) - ("libspnav" ,libspnav) - ("libxi" ,libxi) - ("libxmu" ,libxmu) - ("openmpi" ,openmpi) - ("opencascade-occt" ,opencascade-occt) - ("python-matplotlib" ,python-matplotlib) - ("python-pyside-2" ,python-pyside-2) - ("python-shiboken-2" ,python-shiboken-2) - ("python-pivy" ,python-pivy) - ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg) - ("qtx11extras" ,qtx11extras) - ("qtxmlpatterns" ,qtxmlpatterns) - ("qtwebkit" ,qtwebkit) - ("tbb" ,tbb) - ("vtk" ,vtk) - ("xerces-c" ,xerces-c) - ("zlib" ,zlib))) - (arguments - `(#:tests? #f - #:configure-flags - (list - "-DBUILD_QT5=ON" - (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib") - (string-append "-DPYSIDE2UICBINARY=" - (assoc-ref %build-inputs "python-pyside-2-tools") - "/bin/uic") - (string-append "-DPYSIDE2RCCBINARY=" - (assoc-ref %build-inputs "python-pyside-2-tools") - "/bin/rcc") - "-DPYSIDE_LIBRARY=PySide2::pyside2" - (string-append - "-DPYSIDE_INCLUDE_DIR=" - (assoc-ref %build-inputs "python-pyside-2") "/include;" - (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;" - (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;" - (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;" - (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;") - "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" - (string-append "-DSHIBOKEN_INCLUDE_DIR=" - (assoc-ref %build-inputs "python-shiboken-2") - "/include/shiboken2")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'restore-pythonpath - (lambda _ - (substitute* "src/Main/MainGui.cpp" - (("_?putenv\\(\"PYTHONPATH=\"\\);") "")) - #t)) - (add-after 'install 'wrap-pythonpath - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/FreeCAD") - (list "PYTHONPATH" - 'prefix (list (getenv "PYTHONPATH"))))) - #t))))) - (home-page "https://www.freecadweb.org/") - (synopsis "Your Own 3D Parametric Modeler") - (description - "FreeCAD is a general purpose feature-based, parametric 3D modeler for + (package + (name "freecad") + (version "0.19.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FreeCAD/FreeCAD") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c53q2iawy4yfp11czyc7lbr9ivp3r7v24x4c20myh11wyplffc0")))) + (build-system qt-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) + ("qttools" ,qttools) + ("pkg-config" ,pkg-config) + ("python-pyside-2-tools" ,python-pyside-2-tools) + ("swig" ,swig))) + (inputs + `(("boost" ,boost) + ("coin3D" ,coin3D) + ("double-conversion" ,double-conversion) + ("eigen" ,eigen) + ("freetype" ,freetype) + ("gl2ps" ,gl2ps) + ("glew" ,glew) + ("hdf5" ,hdf5-1.10) + ("jsoncpp" ,jsoncpp) + ("libarea" ,libarea) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libmedfile" ,libmedfile) + ("libspnav" ,libspnav) + ("libtheora" ,libtheora) + ("libtiff" ,libtiff) + ("libxi" ,libxi) + ("libxmlplusplus" ,libxmlplusplus) + ("libxmu" ,libxmu) + ("lz4" ,lz4) + ("netcdf" ,netcdf) + ("opencascade-occt" ,opencascade-occt) + ("openmpi" ,openmpi) + ("proj" ,proj) + ("python-gitpython" ,python-gitpython) + ("python-matplotlib" ,python-matplotlib) + ("python-pivy" ,python-pivy) + ("python-pyside-2" ,python-pyside-2) + ("python-pyyaml" ,python-pyyaml) + ("python-shiboken-2" ,python-shiboken-2) + ("python-wrapper" ,python-wrapper) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtwebkit" ,qtwebkit) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns) + ("sqlite" ,sqlite) + ("tbb" ,tbb) + ("vtk" ,vtk-8) + ("xerces-c" ,xerces-c) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ; Project has no tests + #:configure-flags + (list + "-DBUILD_QT5=ON" + "-DBUILD_FLAT_MESH:BOOL=ON" + (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib") + (string-append "-DPYSIDE2UICBINARY=" + (assoc-ref %build-inputs "python-pyside-2-tools") + "/bin/uic") + (string-append "-DPYSIDE2RCCBINARY=" + (assoc-ref %build-inputs "python-pyside-2-tools") + "/bin/rcc") + "-DPYSIDE_LIBRARY=PySide2::pyside2" + (string-append + "-DPYSIDE_INCLUDE_DIR=" + (assoc-ref %build-inputs "python-pyside-2") "/include;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;") + "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" + (string-append "-DSHIBOKEN_INCLUDE_DIR=" + (assoc-ref %build-inputs "python-shiboken-2") + "/include/shiboken2")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'restore-pythonpath + (lambda _ + (substitute* "src/Main/MainGui.cpp" + (("_?putenv\\(\"PYTHONPATH=\"\\);") "")))) + (add-after 'install 'wrap-pythonpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/FreeCAD") + (list "PYTHONPATH" + 'prefix (list (getenv "PYTHONPATH")))))))))) + (home-page "https://www.freecadweb.org/") + (synopsis "Your Own 3D Parametric Modeler") + (description + "FreeCAD is a general purpose feature-based, parametric 3D modeler for CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and product design but also fits a wider range of uses in engineering, such as architecture or other engineering specialties. It is 100% Open Source (LGPL2+ license) and extremely modular, allowing for very advanced extension and customization.") - (license - (list - license:lgpl2.1+ - license:lgpl2.0+ - license:gpl3+ - license:bsd-3))))) + (license + (list + license:lgpl2.1+ + license:lgpl2.0+ + license:gpl3+ + license:bsd-3)))) (define-public libmedfile (package -- cgit v1.2.3 From 002b611276bac61072354d44cb4343d1b5b5b42a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 16 Apr 2021 11:46:22 +0300 Subject: gnu: debian-archive-keyring: Update to 2021.1.1. * gnu/packages/debian.scm (debian-archive-keyring): Update to 2021.1.1. --- gnu/packages/debian.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 221f23e42b..c78f248d57 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2020 Efraim Flashner +;;; Copyright © 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; @@ -41,7 +41,7 @@ (define-public debian-archive-keyring (package (name "debian-archive-keyring") - (version "2019.1") + (version "2021.1.1") (source (origin (method git-fetch) @@ -51,7 +51,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0bphwji3ywk1zi5bq8bhqk7l51fwjy1idwsw7zfqnxca8m5wvw1g")))) + "0dcmv7y1k6j3a646kr0rkd2a0c4j2wrz868bh8j9zjx1npzns73q")))) (build-system gnu-build-system) (arguments '(#:test-target "verify-results" -- cgit v1.2.3 From 482ff111d21a02f8a0b3a5806c901155b7396304 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 16 Apr 2021 11:46:30 +0300 Subject: gnu: ubuntu-keyring: Update to 2021.03.26. * gnu/packages/debian.scm (ubuntu-keyring): Update to 2021.03.26. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index c78f248d57..f7e15ca0a0 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -84,7 +84,7 @@ contains the archive keys used for that.") (define-public ubuntu-keyring (package (name "ubuntu-keyring") - (version "2018.09.18.1") + (version "2021.03.26") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ contains the archive keys used for that.") "+files/" name "_" version ".tar.gz")) (sha256 (base32 - "0csx2n62rj9rxjv4y8qhby7l9rbybfwrb0406pc2cjr7f2yk91af")))) + "1ccvwh4s51viyhcg8gh189jmvbrhc5wv1bbp4minz3200rffsbj9")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 6c7251f26ef225ffe2fcd24e374aff128d0615e4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 16 Apr 2021 11:46:33 +0300 Subject: gnu: dpkg: Update to 1.20.9. * gnu/packages/debian.scm (dpkg): Update to 1.20.9. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index f7e15ca0a0..26b7f5194e 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -284,7 +284,7 @@ other apt sources typically provided by open source developers.") (define-public dpkg (package (name "dpkg") - (version "1.20.7.1") + (version "1.20.9") (source (origin (method git-fetch) @@ -294,7 +294,7 @@ other apt sources typically provided by open source developers.") (file-name (git-file-name name version)) (sha256 (base32 - "0d1cppigwhpv0z1ac94gjalkzs3n0gjyi383pkhz1h9d4fvmadk9")))) + "16wlb8hwbdvxar187bjd4pzdzj95g3l2ryi2khqqmwbyca4sjm1n")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 44f9432705d04c069a8acf9e37e3ad856ac0bf82 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 15 Apr 2021 15:09:59 +0200 Subject: gnu: Add python-mappy. * gnu/packages/python-xyz.scm (python-mappy): New variable. --- gnu/packages/python-xyz.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d115790e1..5a4220541e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -39,7 +39,7 @@ ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe ;;; Copyright © 2017 José Miguel Sánchez García -;;; Copyright © 2017, 2020 Roel Janssen +;;; Copyright © 2017, 2020, 2021 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Kei Kebreau ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki @@ -2020,6 +2020,28 @@ information created by most SVG editors. Optimization options are typically lossless but can be tweaked for more aggressive cleaning.") (license license:asl2.0))) +(define-public python-mappy + (package + (name "python-mappy") + (version "2.18") + (source (origin + (method url-fetch) + (uri (pypi-uri "mappy" version)) + (sha256 + (base32 + "1a05p7rkmxa6qhm108na8flzj2v45jab06drk59kzk1ip2sgvzqq")))) + (build-system python-build-system) + (native-inputs + `(("python-cython" ,python-cython))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/lh3/minimap2") + (synopsis "Python binding for minimap2") + (description "This package provides a convenient interface to minimap2, +a fast and accurate C program to align genomic and transcribe nucleotide +sequences.") + (license license:expat))) + (define-public python-mechanize (package (name "python-mechanize") -- cgit v1.2.3